Changeset 15966 for branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3

Timestamp:

06/19/18 15:51:41 (6 years ago)

Author:

jzenisek

Message:

#2839: Fixed several bugs and added project duration handling

• fixed project duration handling (client- & service-side)
• fixed tagging in HiveJobAdmin
• added ProjectJobs view (under construction)
• added necessary service methods

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs (modified) (3 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs

@@ -32 +32 @@
       return GetByIdQuery(DataContext, id);
     }
-    
+
     public void DeleteByState(JobState state) {
       DataContext.ExecuteCommand(DeleteByStateQueryString, Enum.GetName(typeof(JobState), state));
+    }
+
+    public IEnumerable<Job> GetByProjectId(Guid id) {
+      return GetByProjectIdQuery(DataContext, id);
+    }
+
+    public IEnumerable<Job> GetByProjectIds(IEnumerable<Guid> projectIds) {
+      string paramProjectIds = string.Join(",", projectIds.ToList().Select(x => string.Format("'{0}'", x)));
+      if(!string.IsNullOrWhiteSpace(paramProjectIds)) {
+        string queryString = string.Format(GetByProjectIdsQueryString, paramProjectIds);
+        return DataContext.ExecuteQuery<Job>(queryString);
+      }
+      return Enumerable.Empty<Job>();
     }
 
@@ -56 +69 @@
          where job.JobId == jobId
          select job).SingleOrDefault());
+    private static readonly Func<DataContext, Guid, IEnumerable<Job>> GetByProjectIdQuery =
+      CompiledQuery.Compile((DataContext db, Guid projectId) =>
+        (from job in db.GetTable<Job>()
+         where job.ProjectId == projectId
+         select job));
     private static readonly Func<DataContext, JobState, IEnumerable<Job>> GetByStateQuery =
       CompiledQuery.Compile((DataContext db, JobState jobState) =>
@@ -92 +110 @@
         WHERE t.JobId = j.JobId)
     ";
+    private const string GetByProjectIdsQueryString = @"
+      SELECT DISTINCT j.*
+      FROM [Job] j
+      WHERE j.ProjectId IN ({0})
+    ";
     #endregion
   }