Changeset 15530 for branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedJobResourceDao.cs

Timestamp:

12/15/17 17:51:28 (7 years ago)

Author:

jzenisek

Message:

#2839

• worked on Job operations add&update
• worked on ProjectPermission handling
• worked on Project-Resource assignment

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedJobResourceDao.cs (modified) (5 diffs)

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

@@ -22 +22 @@
     }
 
-    public bool CheckJobGrantedForResources(Guid jobId, Guid[] resourceIds) {
-      return DataContext.ExecuteQuery<int>(CheckJobGrantedForResourcesQueryString).Count() > 0;
+    public bool CheckJobGrantedForResources(Guid jobId, IEnumerable<Guid> resourceIds) {
+      string paramResourceIds = string.Join(",", resourceIds.Select(x => string.Format("'{0}'", x)));
+      if (!string.IsNullOrWhiteSpace(paramResourceIds)) {
+        string queryString = string.Format(CheckJobGrantedForResourcesQueryString, jobId, paramResourceIds);
+        return DataContext.ExecuteQuery<int>(queryString).Count() == 0;
+      }
+      return false;
     }
 
@@ -43 +48 @@
         SELECT ResourceId, ParentResourceId
         FROM [Resource]
-        WHERE ResourceId = {0}
+        WHERE ResourceId = {1}
         UNION ALL
         SELECT r.ResourceId, r.ParentResourceId
@@ -52 +57 @@
       FROM rbranch, AssignedJobResource ajr
       WHERE rbranch.ResourceId = ajr.ResourceId
-      AND ajr.JobId = {1}
+      AND ajr.JobId = {0}
     ";
     private const string CheckTaskGrantedForResourceQueryString = @"
@@ -58 +63 @@
         SELECT ResourceId, ParentResourceId
         FROM [Resource]
-        WHERE ResourceId = {0}
+        WHERE ResourceId = {1}
         UNION ALL
         SELECT r.ResourceId, r.ParentResourceId
@@ -68 +73 @@
       WHERE rbranch.ResourceId = ajr.ResourceId
       AND ajr.JobId = t.JobId
-      AND t.JobId = {1}
+      AND t.JobId = {0}
     ";
     private const string CheckJobGrantedForResourcesQueryString = @"