Changeset 15411 for branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos

Timestamp:

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

Author:

jkarder

Message:

#2839: worked on database model

Location:

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

Files:

• AssignedProjectResourceDao.cs (added)
• AssignedTaskResourceDao.cs (moved) (moved from branches/HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/AssignedResourceDao.cs) (2 diffs)
• TaskDao.cs (modified) (3 diffs)

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Services.Hive.DataAccess.Daos {
-  public class AssignedResourceDao : GenericDao<Guid, AssignedResource> {
-    public AssignedResourceDao(DataContext dataContext) : base(dataContext) { }
+  public class AssignedTaskResourceDao : GenericDao<Guid, AssignedTaskResource> {
+    public AssignedTaskResourceDao(DataContext dataContext) : base(dataContext) { }
 
-    public override AssignedResource GetById(Guid id) {
+    public override AssignedTaskResource GetById(Guid id) {
       throw new NotImplementedException();
     }
 
-    public IQueryable<AssignedResource> GetByTaskId(Guid taskId) {
+    public IQueryable<AssignedTaskResource> GetByTaskId(Guid taskId) {
       return Table.Where(x => x.TaskId == taskId);
     }
@@ -51 +51 @@
       )
       SELECT COUNT(ar.TaskId)
-      FROM pr JOIN AssignedResources ar ON pr.ResourceId = ar.ResourceId
+      FROM pr JOIN AssignedTaskResources ar ON pr.ResourceId = ar.ResourceId
       WHERE ar.TaskId = {1}
     ";

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

@@ -27 +27 @@
 namespace HeuristicLab.Services.Hive.DataAccess.Daos {
   public class TaskDao : GenericDao<Guid, Task> {
-    private Table<AssignedResource> AssignedResourceTable {
-      get { return DataContext.GetTable<AssignedResource>(); }
+    private Table<AssignedTaskResource> AssignedTaskResourceTable {
+      get { return DataContext.GetTable<AssignedTaskResource>(); }
     }
 
@@ -65 +65 @@
     /// <returns></returns>
     public IEnumerable<Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished) {
-      var query = from ar in AssignedResourceTable
+      var query = from ar in AssignedTaskResourceTable
                   where resourceIds.Contains(ar.ResourceId)
                      && ar.Task.State == TaskState.Waiting
@@ -106 +106 @@
       )
       SELECT DISTINCT t.TaskId, t.JobId, t.Priority
-      FROM pr JOIN AssignedResources ar ON ar.ResourceId = pr.ResourceId
+      FROM pr JOIN AssignedTaskResources ar ON ar.ResourceId = pr.ResourceId
           JOIN Task t ON t.TaskId = ar.TaskId
       WHERE NOT (t.IsParentTask = 1 AND t.FinishWhenChildJobsFinished = 1)