Changeset 15969 for branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive

Timestamp:

06/21/18 15:27:56 (6 years ago)

Author:

jzenisek

Message:

#2839: finalized ProjectJobsView

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3

Files:

• HiveService.cs (modified) (5 diffs)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -336 +336 @@
             .Select(x => x.ToDto())
             .ToList();
-          var statistics = taskDao.GetAll()
-              .Where(x => jobs.Select(y => y.Id).Contains(x.JobId))
-              .GroupBy(x => x.JobId)
-              .Select(x => new {
-                x.Key,
-                TotalCount = x.Count(),
-                CalculatingCount = x.Count(y => y.State == DA.TaskState.Calculating),
-                FinishedCount = x.Count(y => CompletedStates.Contains(y.State))
-              })
-              .ToList();
-          foreach (var job in jobs) {
-            var statistic = statistics.FirstOrDefault(x => x.Key == job.Id);
-            if (statistic != null) {
-              job.JobCount = statistic.TotalCount;
-              job.CalculatingCount = statistic.CalculatingCount;
-              job.FinishedCount = statistic.FinishedCount;
-            }
-            job.OwnerUsername = UserManager.GetUserNameById(job.OwnerUserId);
-            if (currentUserId == job.OwnerUserId) {
-              job.Permission = Permission.Full;
-            } else {
-              var jobPermission = jobPermissionDao.GetByJobAndUserId(job.Id, currentUserId);
-              job.Permission = jobPermission == null ? Permission.NotAllowed : jobPermission.Permission.ToDto();
-            }
-          }
+
+          EvaluateJobs(pm, jobs);
           return jobs;
         });
@@ -381 +358 @@
 
           if(administrationGrantedProjects.Select(x => x.ProjectId).Contains(projectId)) {
-            return jobDao.GetByProjectId(projectId)
+            var jobs = jobDao.GetByProjectId(projectId)
             .Select(x => x.ToDto())
             .ToList();
+
+            EvaluateJobs(pm, jobs);
+            return jobs;
           } else {
             return Enumerable.Empty<DT.Job>();
@@ -407 +387 @@
 
           if(requestedAndGrantedProjectIds.Any()) {
-            return jobDao.GetByProjectIds(requestedAndGrantedProjectIds)
+            var jobs = jobDao.GetByProjectIds(requestedAndGrantedProjectIds)
               .Select(x => x.ToDto())
               .ToList();
+
+            EvaluateJobs(pm, jobs);
+            return jobs;
           } else {
             return Enumerable.Empty<DT.Job>();
@@ -548 +531 @@
     }
 
+    public void UpdateJobStates(IEnumerable<Guid> jobIds, DT.JobState jobState) {
+      if (jobState != JobState.StatisticsPending) return; // only process requests for "StatisticsPending"
+
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      bool isAdministrator = RoleVerifier.IsInRole(HiveRoles.Administrator);
+      var currentUserId = UserManager.CurrentUserId;
+
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("UpdateJobsState")) {
+        var jobDao = pm.JobDao;
+        var projectDao = pm.ProjectDao;
+        pm.UseTransaction(() => {
+          foreach(var jobId in jobIds) {
+            var job = jobDao.GetById(jobId);
+            if (job != null) {
+
+              var administrationGrantedProjects = projectDao
+                .GetAdministrationGrantedProjectsForUser(currentUserId)
+                .ToList();
+
+              // check if user is granted to administer the job-parenting project
+              if (isAdministrator || administrationGrantedProjects.Contains(job.Project)) {
+                // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator
+                if (job.State == DA.JobState.Online) { 
+                  job.State = DA.JobState.StatisticsPending;
+                  foreach (var task in job.Tasks
+                  .Where(x => x.State == DA.TaskState.Waiting
+                    || x.State == DA.TaskState.Paused
+                    || x.State == DA.TaskState.Offline)) {
+                      task.State = DA.TaskState.Aborted;
+                  }
+                  pm.SubmitChanges();
+                }
+              }
+            }
+          }
+        });
+      }
+    }
+
     public IEnumerable<DT.AssignedJobResource> GetAssignedResourcesForJob(Guid jobId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
@@ -1738 +1761 @@
     }
 
+    private void EvaluateJobs(IPersistenceManager pm, IEnumerable<DT.Job> jobs) {
+      if (jobs == null || !jobs.Any()) return;
+
+      var currentUserId = UserManager.CurrentUserId;      
+      var taskDao = pm.TaskDao;
+      var jobPermissionDao = pm.JobPermissionDao;
+
+      var statistics = taskDao.GetAll()
+        .Where(x => jobs.Select(y => y.Id).Contains(x.JobId))
+        .GroupBy(x => x.JobId)
+        .Select(x => new {
+          x.Key,
+          TotalCount = x.Count(),
+          CalculatingCount = x.Count(y => y.State == DA.TaskState.Calculating),
+          FinishedCount = x.Count(y => CompletedStates.Contains(y.State))
+        })
+        .ToList();
+
+      foreach (var job in jobs) {
+        var statistic = statistics.FirstOrDefault(x => x.Key == job.Id);
+        if (statistic != null) {
+          job.JobCount = statistic.TotalCount;
+          job.CalculatingCount = statistic.CalculatingCount;
+          job.FinishedCount = statistic.FinishedCount;
+        }
+
+        job.OwnerUsername = UserManager.GetUserNameById(job.OwnerUserId);
+
+        if (currentUserId == job.OwnerUserId) {
+          job.Permission = Permission.Full;
+        } else {
+          var jobPermission = jobPermissionDao.GetByJobAndUserId(job.Id, currentUserId);
+          job.Permission = jobPermission == null ? Permission.NotAllowed : jobPermission.Permission.ToDto();
+        }
+      }
+    }
     #endregion
   }

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -94 +94 @@
 
     [OperationContract]
+    void UpdateJobStates(IEnumerable<Guid> jobIds, JobState jobState);
+
+    [OperationContract]
     IEnumerable<AssignedJobResource> GetAssignedResourcesForJob(Guid jobId);
     #endregion