Changeset 15497 for branches

Timestamp:

12/06/17 16:16:01 (6 years ago)

Author:

jzenisek

Message:

#2839 worked on permission check at AddTask

Location:

branches/HiveProjectManagement

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/ResourceDao.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/ResourcePermissionDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IPersistenceManager.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Manager/PersistenceManager.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (3 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Data.Linq;
 using System.Linq;
@@ -40 +41 @@
     }
 
+    public IEnumerable<Guid> GetResourceIdsByParentId(Guid id) {
+      return DataContext.ExecuteQuery<Guid>(GetResourceIdsByParentIdQuery, id);
+    }
+
+    public IEnumerable<Resource> GetResourcesByParentId(Guid id) {
+      return DataContext.ExecuteQuery<Resource>(GetResourcesByParentIdQuery, id);
+    }
+
     #region Compiled queries
     private static readonly Func<DataContext, Guid, Resource> GetByIdQuery =
@@ -53 +62 @@
         select resource).FirstOrDefault());
     #endregion
+
+    #region String queries
+    private const string GetResourcesByParentIdQuery = @"
+      WITH rtree AS
+      (
+        SELECT ResourceId, ParentResourceId
+        FROM [Resource]
+        UNION ALL
+        SELECT rt.ResourceId, r.ParentResourceId
+        FROM [Resource] r
+        JOIN rtree rt ON rt.ParentResourceId = r.ResourceId AND r.ParentResourceId <> r.ResourceId AND rt.ParentResourceId <> rt.ResourceId
+      )
+      SELECT DISTINCT rtree.ResourceId
+      FROM rtree
+      WHERE rtree.ParentResourceId = ({0})
+    ";
+    private const string GetResourceIdsByParentIdQuery = @"
+      WITH rtree AS
+      (
+        SELECT ResourceId, ParentResourceId
+        FROM [Resource]
+        UNION ALL
+        SELECT rt.ResourceId, r.ParentResourceId
+        FROM [Resource] r
+        JOIN rtree rt ON rt.ParentResourceId = r.ResourceId AND r.ParentResourceId <> r.ResourceId AND rt.ParentResourceId <> rt.ResourceId
+      )
+      SELECT DISTINCT res.*
+      FROM rtree, [Resource] res
+      WHERE rtree.ParentResourceId = ({0})
+      AND rtree.ResourceId = res.ResourceId
+    ";
+    #endregion
   }
 }

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

@@ -56 +56 @@
       (
         SELECT ResourceId, ParentResourceId
-        FROM [dbo].Resource
+        FROM [Resource]
         UNION ALL
         SELECT rt.ResourceId, r.ParentResourceId
-        FROM [dbo].Resource r
+        FROM [Resource] r
         JOIN rtree rt ON rt.ParentResourceId = r.ResourceId AND r.ParentResourceId <> r.ResourceId AND rt.ParentResourceId <> rt.ResourceId
       )
-      SELECT DISTINCT rtree.ResourceId FROM rtree, ResourcePermission rp
-      WHERE rtree.ParentResourceId = rp.ResourceId
-      AND rp.GrantedUserId IN ({0})
+      SELECT DISTINCT rtree.ResourceId
+      FROM rtree, [ResourcePermission] rp
+      WHERE rtree.ParentResourceId = rp.ResourceId AND rp.GrantedUserId IN ({0})
       UNION ALL
       SELECT rp.ResourceId
-      FROM ResourcePermission rp
+      FROM [ResourcePermission] rp
       WHERE rp.GrantedUserId IN ({0})
       ;";

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

@@ -106 +106 @@
       )
       SELECT DISTINCT t.TaskId, t.JobId, t.Priority
-      FROM pr JOIN AssignedTaskResources ar ON ar.ResourceId = pr.ResourceId
+      FROM pr JOIN AssignedTaskResource ar ON ar.ResourceId = pr.ResourceId
           JOIN Task t ON t.TaskId = ar.TaskId
       WHERE NOT (t.IsParentTask = 1 AND t.FinishWhenChildJobsFinished = 1)

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

@@ -83 +83 @@
     }
 
-    private ProjectPermissionDao resourcePermissionDao;
+    private ProjectPermissionDao projectPermissionDao;
     public ProjectPermissionDao ProjectPermissionDao {
-      get { return resourcePermissionDao ?? (resourcePermissionDao = new ProjectPermissionDao(dataContext)); }
+      get { return projectPermissionDao ?? (projectPermissionDao = new ProjectPermissionDao(dataContext)); }
     }
 
@@ -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)); }
     }
 

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -72 +72 @@
         var taskDao = pm.TaskDao;
         var stateLogDao = pm.StateLogDao;
+
+        var resourceDao = pm.ResourceDao;
+        var resourcePermissionDao = pm.ResourcePermissionDao;
+
+        var currentUserId = UserManager.CurrentUserId;
+
+        // V1 (without child check; with resourcePermission-oriented check for user grants)
+        // granted (parent) resources
+        var userGrantedResources = resourcePermissionDao.GetAll().ToList()
+          .Where(x => x.GrantedUserId == currentUserId
+          || UserManager.VerifyUser(currentUserId, new List<Guid> { x.GrantedUserId })
+          )
+          .Select(x => x.Resource)
+          .ToList();
+
+        //// children
+        //var userGrantedResourceChildren = userGrantedResources
+        //  .SelectMany(x => resourceDao.GetResourcesByParentId(x.ResourceId));
+        //// join parent and child resources
+        //userGrantedResources.AddRange(userGrantedResourceChildren);
+
+        var userGrantedResourceIds = resourceIds
+          .Where(x => userGrantedResources
+            .Select(y => y.ResourceId)
+            .Contains(x))
+          .Distinct().ToList();
+
         var newTask = task.ToEntity();
         newTask.JobData = taskData.ToEntity();
@@ -830 +857 @@
               || x.OwnerUserId == currentUserId
               || UserManager.VerifyUser(currentUserId, resourcePermissions
-                  .Where(y => y.ResourceId == x.ResourceId)
+                  //.Where(y => y.ResourceId == x.ResourceId)
                   .Select(z => z.GrantedUserId)
                   .ToList())
@@ -855 +882 @@
               || x.OwnerUserId == currentUserId
               || UserManager.VerifyUser(currentUserId, resourcePermissions
-                  .Where(y => y.ResourceId == x.ResourceId)
+                  //.Where(y => y.ResourceId == x.ResourceId)
                   .Select(z => z.GrantedUserId)
                   .ToList())