Changeset 12962 for stable/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi

Timestamp:

09/21/15 16:28:38 (9 years ago)

Author:

ascheibe

Message:

#2388 merged r12878, r12879, r12883, r12885, r12913, r12914, r12925, r12932, r12961 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Maintenance (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp.Maintenance)
• HeuristicLab.Services.WebApp.Maintenance/3.3 (modified) (1 prop)
• HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactTaskController.cs (modified) (2 diffs)
• HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs (modified) (1 diff)

stable/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactTaskController.cs

@@ -39 +39 @@
       var factTaskDao = pm.FactTaskDao;
       return pm.UseTransaction(() => {
-        var query = dimJobDao.GetAll().Where(x => x.DateCreated >= start && x.DateCreated <= end);
+        var query = dimJobDao.GetAll().Where(x => x.DateCreated >= start && x.DateCreated <= end && x.DateCompleted != null);
         return new DT.JobPage {
           TotalJobs = query.Count(),
@@ -69 +69 @@
       var dimJobDao = pm.DimJobDao;
       var jobIds = pm.UseTransaction(() => dimJobDao.GetAll()
-        .Where(x => x.DateCreated >= start && x.DateCreated <= end)
+        .Where(x => x.DateCreated >= start && x.DateCreated <= end && x.DateCompleted != null)
         .Select(x => x.JobId)
         .ToList()

stable/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs

@@ -39 +39 @@
       var taskDao = pm.TaskDao;
       return pm.UseTransaction(() => {
-        var taskIds = taskDao.GetAll().Select(x => x.TaskId);
-        var usedPluginIds = requiredPluginDao.GetAll()
-          .Where(x => taskIds.Contains(x.TaskId))
+        var usedPluginIds = requiredPluginDao.GetAll()        
           .Select(x => x.PluginId)
-          .Distinct();
-        var query = pluginDao.GetAll().Where(x => !usedPluginIds.Any(y => y == x.PluginId));
+          .Distinct().ToArray();
+        var tmpQuery = pluginDao.GetAll().Select(x=>x.PluginId).ToArray().Where(x => !usedPluginIds.Any(y => y == x)).ToArray();
+        var query = pluginDao.GetAll().Where(x => tmpQuery.Contains(x.PluginId)).ToArray();
         return new DT.PluginPage {
           TotalPlugins = query.Count(),