Changeset 12777 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3

Timestamp:

07/20/15 13:47:59 (9 years ago)

Author:

dglaser

Message:

#2429: Start and end dates are now considered when aggregating FactClientInfo

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactClientInfoController.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactClientInfoController.cs

@@ -56 +56 @@
         );
         foreach (var id in clientIds) {
-          AggregateClient(pm, id, entries);
+          AggregateClient(pm, id, start, end, entries);
         }
         dimTimeDao.DeleteUnusedTimes();
@@ -62 +62 @@
     }
 
-    private void AggregateClient(IPersistenceManager pm, Guid clientId, int entries) {
+    private void AggregateClient(IPersistenceManager pm, Guid clientId, DateTime start, DateTime end, int entries) {
       var factClientInfoDao = pm.FactClientInfoDao;
-      var clientInfos = pm.UseTransaction(() => factClientInfoDao.GetByClientId(clientId).OrderBy(x => x.Time).ToList());
+      var clientInfos = pm.UseTransaction(() => factClientInfoDao.GetByClientId(clientId)
+        .Where(x => x.Time >= start && x.Time <= end)
+        .OrderBy(x => x.Time)
+        .ToList()
+      );
       var e = clientInfos.GetEnumerator();
       if (!e.MoveNext()) return;