Changeset 15628 for branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess

Timestamp:

01/17/18 15:24:44 (7 years ago)

Author:

jzenisek

Message:

#2839

• updated TaskDao towards independency of the formerly used Task-Resource assignment entity
• updated several permission/assignment handling service methods for client
• added AssignedJobResource DTO

Location:

branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos

Files:

• AssignedProjectResourceDao.cs (modified) (4 diffs)
• ProjectPermissionDao.cs (modified) (2 diffs)
• TaskDao.cs (modified) (3 diffs)

branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedProjectResourceDao.cs

@@ -107 +107 @@
         WHERE ProjectId IN ({0})
     ";
+    // tested
     private const string CheckProjectGrantedForResourcesQueryString = @"
     WITH rtree AS
@@ -125 +126 @@
       FROM rtree, [AssignedProjectResource] apr
       WHERE rtree.ParentResourceId = apr.ResourceId
-      AND apr.ProjectId = {0}
+      AND apr.ProjectId = '{0}'
       UNION
       SELECT apr.ResourceId
       FROM [AssignedProjectResource] apr
-      WHERE apr.ProjectId = {0}
+      WHERE apr.ProjectId = '{0}'
     )
     ";
@@ -146 +147 @@
       WHERE rtree.ParentResourceId = apr.ResourceId
       AND rtree.ResourceId = res.ResourceId
-      AND apr.ProjectId = {0}
+      AND apr.ProjectId = '{0}'
       UNION
       SELECT res.*
       FROM [AssignedProjectResource] apr, [Resource] res
       WHERE apr.ResourceId = res.ResourceId
-      AND apr.ProjectId = {0}
+      AND apr.ProjectId = '{0}'
     ";
     private const string GetAllGrantedResourceIdsByProjectIdQueryString = @"
@@ -166 +167 @@
     FROM rtree, [AssignedProjectResource] apr
     WHERE rtree.ParentResourceId = apr.ResourceId
-    AND apr.ProjectId = {0}
+    AND apr.ProjectId = '{0}'
     UNION
     SELECT apr.ResourceId
     FROM [AssignedProjectResource] apr
-    WHERE apr.ProjectId = {0}
+    WHERE apr.ProjectId = '{0}'
     ";
     private const string GetAllGrantedResourceIdsOfOwnedParentProjectsQueryString = @"

branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/ProjectPermissionDao.cs

@@ -74 +74 @@
     private const string DeleteByProjectIdAndGrantedUserIdsQueryString = @"
       DELETE FROM [ProjectPermission]
-      WHERE ProjectId = '{0}'
+      WHERE ProjectId = {0}
       AND GrantedUserId IN ({1});
     ";
@@ -85 +85 @@
       SELECT COUNT(pp.ProjectId)
       FROM [ProjectPermission] pp
-      WHERE pp.ProjectId = {0}
+      WHERE pp.ProjectId = '{0}'
       AND pp.GrantedUserId IN ({1})
     ";

branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs

@@ -64 +64 @@
     /// <param name="finished">if true, all parent task which have FinishWhenChildJobsFinished=true are returned, otherwise only FinishWhenChildJobsFinished=false are returned</param>
     /// <returns></returns>
-    public IEnumerable<Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished) {
+    public IEnumerable<Task> GetParentTasks_Old(IEnumerable<Guid> resourceIds, int count, bool finished) {
       var query = from ar in AssignedTaskResourceTable
                   where resourceIds.Contains(ar.ResourceId)
@@ -83 +83 @@
     }
 
+    /// <summary>
+    /// returns all parent tasks which are waiting for their child tasks to finish
+    /// </summary>
+    /// <param name="resourceIds">list of resourceids which for which the task should be valid</param>
+    /// <param name="count">maximum number of task to return</param>
+    /// <param name="finished">if true, all parent task which have FinishWhenChildJobsFinished=true are returned, otherwise only FinishWhenChildJobsFinished=false are returned</param>
+    /// <returns></returns>
+    public IEnumerable<Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished) {
+      var query = from t in Table
+                  where t.State == TaskState.Waiting
+                    && t.IsParentTask
+                    && !t.Job.AssignedJobResources.Select(x => x.ResourceId).Except(resourceIds).Any()
+                    && t.FinishWhenChildJobsFinished == finished
+                    && t.ChildJobs.Any()
+                    && t.ChildJobs.All(x =>
+                      x.State == TaskState.Finished
+                      || x.State == TaskState.Aborted
+                      || x.State == TaskState.Failed)
+                  orderby t.Priority descending
+                  select t;
+      return count == 0 ? query.ToArray() : query.Take(count).ToArray();
+    }
+
     public void UpdateExecutionTime(Guid taskId, double executionTime) {
       DataContext.ExecuteCommand(UpdateExecutionTimeQuery, executionTime, DateTime.Now, taskId);
@@ -96 +119 @@
 
     #region String queries
+    private const string GetParentTasksQueryString = @"
+      SELECT t.* FROM [Task] t, [Job] j, [AssignedJobResource] ajr
+        WHERE t.IsParentTask = 1
+        AND t.TaskState = 'Waiting'
+        AND t.JobId = j.JobId
+        AND j.JobId = ajr.JobId
+        AND t.FinishWhenChildJobsFinished = 1
+        ... TODO (not necessary)
+    ";
     private const string GetWaitingTasksQueryString = @"
       WITH pr AS (