Changeset 16208 for trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

10/03/18 07:18:26 (6 years ago)

Author:

jzenisek

Message:

#2839: updated job execution implementation in ProjectJobsView

File:

• trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (3 diffs)

trunk/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -520 +520 @@
 
     public void UpdateJobState(Guid jobId, DT.JobState jobState) {
-      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
-      AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full);
+      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("UpdateJobState")) {
         var jobDao = pm.JobDao;
+        var projectDao = pm.ProjectDao;
         pm.UseTransaction(() => {
           var job = jobDao.GetById(jobId);
           if (job != null) {
+
+            var administrationGrantedProjects = projectDao
+              .GetAdministrationGrantedProjectsForUser(currentUserId)
+              .ToList();
+
+            // check if user is an admin, or granted to administer a job-parenting project,...
+            if (!isAdministrator && !administrationGrantedProjects.Contains(job.Project))
+              AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full); // ... or job owner
+
+            // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator            
             var jobStateEntity = jobState.ToEntity();
-            // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator
-            // and from "StatisticsPending" to "DeletionPending" = deletion request by HiveStatisticGenerator for EventManager
             if (job.State == DA.JobState.Online && jobStateEntity == DA.JobState.StatisticsPending) {
               job.State = jobStateEntity;
@@ -540 +553 @@
               }
               pm.SubmitChanges();
-            } else if (job.State == DA.JobState.StatisticsPending && jobStateEntity == DA.JobState.DeletionPending) {
-              job.State = jobStateEntity;
-              pm.SubmitChanges();
             }
           }
@@ -561 +571 @@
         var projectDao = pm.ProjectDao;
         pm.UseTransaction(() => {
+          var administrationGrantedProjects = projectDao
+            .GetAdministrationGrantedProjectsForUser(currentUserId)
+            .ToList();
+
           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();
+              // check if user is an admin, or granted to administer a job-parenting project,...
+              if (!isAdministrator && !administrationGrantedProjects.Contains(job.Project))
+                AuthorizationManager.AuthorizeForJob(jobId, DT.Permission.Full); // ... or job owner
+
+              // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator
+              var jobStateEntity = jobState.ToEntity();
+              if (job.State == DA.JobState.Online && jobStateEntity == DA.JobState.StatisticsPending) {
+                job.State = jobStateEntity;
+                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();
+              }              
             }
           }