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

Timestamp:

12/19/17 13:22:47 (7 years ago)

Author:

jzenisek

Message:

#2839 worked on ProjectResource assignment: (cascading) assigning & unassigning

Location:

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

Files:

• Daos/AssignedProjectResourceDao.cs (modified) (2 diffs)
• Interfaces/IPersistenceManager.cs (modified) (1 diff)
• Manager/PersistenceManager.cs (modified) (1 diff)

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

@@ -37 +37 @@
     }
 
-    public void DeleteByProjectAndGrantedUserId(Guid projectId, IEnumerable<Guid> resourceIds) {
+    public void DeleteByProjectIdAndResourceIds(Guid projectId, IEnumerable<Guid> resourceIds) {
       string paramIds = string.Join(",", resourceIds.Select(x => string.Format("'{0}'", x)));
       if (!string.IsNullOrWhiteSpace(paramIds)) {
-        string query = string.Format(DeleteByGrantedUserQuery, projectId, paramIds);
+        string query = string.Format(DeleteByProjectIdAndResourceIdsQueryString, projectId, paramIds);
+        DataContext.ExecuteCommand(query);
+      }
+    }
+
+    public void DeleteByProjectIdsAndResourceIds(IEnumerable<Guid> projectIds, IEnumerable<Guid> resourceIds) {
+      string paramProjectIds = string.Join(",", projectIds.Select(x => string.Format("'{0}'", x)));
+      string paramResourceIds = string.Join(",", resourceIds.Select(x => string.Format("'{0}'", x)));
+      if (!string.IsNullOrWhiteSpace(paramResourceIds)) {
+        string query = string.Format(DeleteByProjectIdsAndResourceIdsQueryString, paramProjectIds, paramResourceIds);
         DataContext.ExecuteCommand(query);
       }
@@ -76 +85 @@
 
     #region String queries
-    private const string DeleteByGrantedUserQuery =
+    private const string DeleteByProjectIdAndResourceIdsQueryString =
       @"DELETE FROM [AssignedProjectResource]
          WHERE ProjectId = '{0}'
            AND ResourceId IN ({1});";
+    private const string DeleteByProjectIdsAndResourceIdsQueryString =
+      @"DELETE FROM [AssignedProjectResource]
+             WHERE ProjectId IN ({0})
+               AND ResourceId IN ({1});";
     private const string CheckProjectGrantedForResourcesQueryString = @"
     WITH rtree AS

branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IPersistenceManager.cs

@@ -43 +43 @@
     RequiredPluginDao RequiredPluginDao { get; }
     ResourceDao ResourceDao { get; }
-    ResourcePermissionDao ResourcePermissionDao { get; }
     SlaveDao SlaveDao { get; }
     SlaveGroupDao SlaveGroupDao { get; }

branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Manager/PersistenceManager.cs

@@ -96 +96 @@
     public ResourceDao ResourceDao {
       get { return resourceDao ?? (resourceDao = new ResourceDao(dataContext)); }
-    }
-
-    private ResourcePermissionDao resourcePermissionDao;
-    public ResourcePermissionDao ResourcePermissionDao {
-      get { return resourcePermissionDao ?? (resourcePermissionDao = new ResourcePermissionDao(dataContext)); }
     }