Changeset 15552 for branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

Timestamp:

12/20/17 11:27:33 (7 years ago)

Author:

jzenisek

Message:

#2839 worked on permission checks in listing methods

File:

• branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (13 diffs)

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

@@ -69 +69 @@
 
     #region Task Methods
+    [Obsolete]
     public Guid AddTask(DT.Task task, DT.TaskData taskData, IEnumerable<Guid> resourceIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
@@ -353 +354 @@
       var pm = PersistenceManager;
       using (new PerformanceLogger("GetJobs")) {
+        // TODO-JAN: optimization potential - avoid using too many joins in linq
         var jobDao = pm.JobDao;
         var jobPermissionDao = pm.JobPermissionDao;
@@ -364 +366 @@
             .Select(x => x.ToDto())
             .ToList();
+          // calculate stats only for owned & permitted jobs; TODO: query only needed ones, not all
           var statistics = taskDao.GetAll()
+              .Where(x => jobs.Select(y => y.Id).Contains(x.JobId))
               .GroupBy(x => x.JobId)
               .Select(x => new {
@@ -393 +397 @@
     }
 
+    [Obsolete]
     public Guid AddJob(DT.Job jobDto) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
@@ -515 +520 @@
         var jobDao = pm.JobDao;
         pm.UseTransaction(() => {
-          // child task will be deleted by db-trigger
+          // child tasks will be deleted by db-trigger
+          // entries in AssignedJobResource will be deleted by foreign key clause CASCADE ON DELETE
           jobDao.Delete(jobId);
           pm.SubmitChanges();
@@ -728 +734 @@
     public void DeleteProject(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator);
-      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("DeleteProject")) {
         var projectDao = pm.ProjectDao;
-        pm.UseTransaction(() => {
+        var assignedJobResourceDao = pm.AssignedJobResourceDao;
+        pm.UseTransaction(() => {
+          assignedJobResourceDao.DeleteByProjectId(projectId);
           projectDao.Delete(projectId);
           pm.SubmitChanges();
@@ -748 +755 @@
     }
 
+    // query granted projects for use (i.e. to calculate on)
     public IEnumerable<DT.Project> GetProjects() {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
@@ -757 +765 @@
         var currentUserId = UserManager.CurrentUserId;
         return pm.UseTransaction(() => {
-          var projectPermissions = projectPermissionDao.GetAll();
-          return projectDao.GetAll().ToList()
-            .Where(x => isAdministrator
-              || x.OwnerUserId == currentUserId
-              || UserManager.VerifyUser(currentUserId, projectPermissions
-                  .Where(y => y.ProjectId == x.ProjectId)
-                  .Select(z => z.GrantedUserId)
-                  .ToList())
-              )
-            .Select(x => x.ToDto())
-            .ToList();
+          var userAndGroupIds = new List<Guid> { currentUserId };
+          userAndGroupIds.AddRange(UserManager.GetUserGroupIdsOfUser(currentUserId));
+          return projectDao.GetGrantedProjectsForUser(userAndGroupIds)
+            .Select(x => x.ToDto());
+          //var projectPermissions = projectPermissionDao.GetAll();
+          //return projectDao.GetAll().ToList()
+          //  .Where(x => isAdministrator
+          //    || x.OwnerUserId == currentUserId
+          //    || UserManager.VerifyUser(currentUserId, projectPermissions
+          //        .Where(y => y.ProjectId == x.ProjectId)
+          //        .Select(z => z.GrantedUserId)
+          //        .ToList())
+          //    )
+          //  .Select(x => x.ToDto())
+          //  .ToList();
         });
       }
@@ -816 +828 @@
         var projectPermissionDao = pm.ProjectPermissionDao;
         var projectDao = pm.ProjectDao;
+        var assignedJobResourceDao = pm.AssignedJobResourceDao;
         pm.UseTransaction(() => {
           if (cascading) {
             var childProjectIds = projectDao.GetChildProjectIdsById(projectId);
             projectPermissionDao.DeleteByProjectIdsAndGrantedUserIds(childProjectIds, grantedUserIds);
+            assignedJobResourceDao.DeleteByProjectIdsAndUserIds(childProjectIds, grantedUserIds);
           }
           projectPermissionDao.DeleteByProjectIdAndGrantedUserIds(projectId, grantedUserIds);
+          assignedJobResourceDao.DeleteByProjectIdAndUserIds(projectId, grantedUserIds);
           pm.SubmitChanges();
         });
@@ -829 +844 @@
     public IEnumerable<DT.ProjectPermission> GetProjectPermissions(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
       var pm = PersistenceManager;
       using (new PerformanceLogger("GetProjectPermissions")) {
@@ -880 +896 @@
       using (new PerformanceLogger("UnassignProjectResources")) {
         var assignedProjectResourceDao = pm.AssignedProjectResourceDao;
+        var assignedJobResourceDao = pm.AssignedJobResourceDao;
         var projectDao = pm.ProjectDao;
         pm.UseTransaction(() => {
@@ -885 +902 @@
             var childProjectIds = projectDao.GetChildProjectIdsById(projectId);
             assignedProjectResourceDao.DeleteByProjectIdsAndResourceIds(childProjectIds, resourceIds);
+            assignedJobResourceDao.DeleteByProjectIdsAndResourceIds(childProjectIds, resourceIds);
           }
           assignedProjectResourceDao.DeleteByProjectIdAndResourceIds(projectId, resourceIds);
-          pm.SubmitChanges();
-        });
-      }
-    }
-
-    public IEnumerable<AssignedProjectResource> GetAssignedResourcesForProject(Guid projectId) {
+          assignedJobResourceDao.DeleteByProjectIdAndResourceIds(projectId, resourceIds);
+          pm.SubmitChanges();
+        });
+      }
+    }
+
+    public IEnumerable<DT.AssignedProjectResource> GetAssignedResourcesForProject(Guid projectId) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       var pm = PersistenceManager;
@@ -903 +922 @@
       }
     }
+
     #endregion