Changeset 15411 for branches/HiveProjectManagement/HeuristicLab.Services.Hive

Timestamp:

10/07/17 10:21:08 (7 years ago)

Author:

jkarder

Message:

#2839: worked on database model

Location:

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3

Files:

• Converter.cs (modified) (1 diff)
• DataTransfer/AssignedProjectResource.cs (added)
• HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HiveService.cs (modified) (3 diffs)
• Manager/HeartbeatManager.cs (modified) (1 diff)
• ServiceContracts/IHiveService.cs (modified) (1 diff)

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

@@ -389 +389 @@
     #endregion
 
+    #region AssignedProjectResource
+    public static DT.AssignedProjectResource ToDto(this DA.AssignedProjectResource source) {
+      if (source == null) return null;
+      return new DT.AssignedProjectResource {
+        ProjectId = source.ProjectId,
+        ResourceId = source.ResourceId
+      };
+    }
+    public static DA.AssignedProjectResource ToEntity(this DT.AssignedProjectResource source) {
+      if (source == null) return null;
+      var result = new DA.AssignedProjectResource();
+      source.CopyToEntity(result);
+      return result;
+    }
+    public static void CopyToEntity(this DT.AssignedProjectResource source, DA.AssignedProjectResource target) {
+      if ((source == null) || (target == null)) return;
+      target.ProjectId = source.ProjectId;
+      target.ResourceId = source.ResourceId;
+    }
+    #endregion
+
     #region SlaveGroup
     public static DT.SlaveGroup ToDto(this DA.SlaveGroup source) {

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -119 +119 @@
   <ItemGroup>
     <Compile Include="Converter.cs" />
+    <Compile Include="DataTransfer\AssignedProjectResource.cs" />
     <Compile Include="DataTransfer\Command.cs" />
     <Compile Include="DataTransfer\Project.cs" />

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

@@ -75 +75 @@
         newTask.JobData = taskData.ToEntity();
         newTask.JobData.LastUpdate = DateTime.Now;
-        newTask.AssignedResources.AddRange(resourceIds.Select(
-          x => new DA.AssignedResource {
+        newTask.AssignedTaskResources.AddRange(resourceIds.Select(
+          x => new DA.AssignedTaskResource {
             ResourceId = x
           }));
@@ -102 +102 @@
       var pm = PersistenceManager;
       using (new PerformanceLogger("AddChildTask")) {
-        var assignedResourceDao = pm.AssignedResourceDao;
+        var assignedTaskResourceDao = pm.AssignedTaskResourceDao;
         resourceIds = pm.UseTransaction(() => {
-          return assignedResourceDao.GetByTaskId(parentTaskId)
+          return assignedTaskResourceDao.GetByTaskId(parentTaskId)
             .Select(x => x.ResourceId)
             .ToList();
@@ -729 +729 @@
     #endregion
 
+    #region AssignedProjectResource Methods
+    public void AssignProjectResources(Guid projectId, Guid[] resourceIds) {
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("AssignProjectResources")) {
+        pm.UseTransaction(() => {
+          var project = AuthorizeForProject(pm, projectId);
+          var assignedProjectResources = project.AssignedProjectResources.ToList();
+          foreach (var id in resourceIds) {
+            if (assignedProjectResources.All(x => x.ResourceId != id)) {
+              project.AssignedProjectResources.Add(new DA.AssignedProjectResource {
+                ResourceId = id
+              });
+            }
+          }
+          pm.SubmitChanges();
+        });
+      }
+    }
+
+    public void UnassignProjectResources(Guid projectId, Guid[] resourceIds) {
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      AuthorizationManager.AuthorizeForProjectAdministration(projectId);
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("UnassignProjectResources")) {
+        var assignedProjectResourceDao = pm.AssignedProjectResourceDao;
+        pm.UseTransaction(() => {
+          assignedProjectResourceDao.DeleteByProjectAndGrantedUserId(projectId, resourceIds);
+          pm.SubmitChanges();
+        });
+      }
+    }
+
+    public IEnumerable<AssignedProjectResource> GetAssignedResourcesForProject(Guid projectId) {
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("GetAssignedResourcesForProject")) {
+        var assignedProjectResourceDao = pm.AssignedProjectResourceDao;
+        return pm.UseTransaction(() => assignedProjectResourceDao.GetByProjectId(projectId)
+          .Select(x => x.ToDto())
+          .ToList()
+        );
+      }
+    }
+    #endregion
+
     #region Slave Methods
     public Guid AddSlave(DT.Slave slaveDto) {

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -142 +142 @@
     private IEnumerable<MessageContainer> UpdateTasks(IPersistenceManager pm, Heartbeat heartbeat, bool isAllowedToCalculate) {
       var taskDao = pm.TaskDao;
-      var assignedResourceDao = pm.AssignedResourceDao;
+      var assignedResourceDao = pm.AssignedTaskResourceDao;
       var actions = new List<MessageContainer>();
       if (heartbeat.JobProgress == null || !heartbeat.JobProgress.Any())

branches/HiveProjectManagement/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -160 +160 @@
     #endregion
 
+    #region AssignedProjectResource Methods
+    [OperationContract]
+    void AssignProjectResources(Guid projectId, Guid[] resourceIds);
+
+    [OperationContract]
+    void UnassignProjectResources(Guid projectId, Guid[] resourceIds);
+
+    [OperationContract]
+    IEnumerable<AssignedProjectResource> GetAssignedResourcesForProject(Guid projectId);
+    #endregion
+
     #region Slave Methods
     [OperationContract]