Improved performance of the measurement range endpoint

cs-23-sw-7-06 · Dec 4, 2023 · a9d21ed · a9d21ed
1 parent abc12c7
commit a9d21ed
Showing 1 changed file with 23 additions and 19 deletions.
diff --git a/CentralHub.Api/Controllers/MeasurementController.cs b/CentralHub.Api/Controllers/MeasurementController.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using CentralHub.Api.Dtos;
 using CentralHub.Api.Model;
 using CentralHub.Api.Model.Requests.Localization;
 using CentralHub.Api.Model.Responses.AggregatedMeasurements;
@@ -60,12 +61,31 @@ public async Task<GetAggregatedMeasurementsResponse> GetAggregateMeasurements(in
             return GetAggregatedMeasurementsResponse.CreateUnsuccessful();
         }
 
+        return GetAggregatedMeasurementsResponse
+            .CreateSuccessful(CreateMeasurements(aggregatedMeasurements));
+    }
+
+    [HttpGet("range")]
+    public async Task<GetAggregatedMeasurementsResponse> GetAggregateMeasurements(int roomId, DateTime timeStart, DateTime timeEnd, CancellationToken token)
+    {
+        var aggregatedMeasurements = await _aggregatorRepository.GetAggregatedMeasurementsAsync(roomId, timeStart, timeEnd, token);
+
+        if (aggregatedMeasurements == null)
+        {
+            return GetAggregatedMeasurementsResponse.CreateUnsuccessful();
+        }
+
+        return GetAggregatedMeasurementsResponse
+            .CreateSuccessful(CreateMeasurements(aggregatedMeasurements));
+    }
+
+    private static IReadOnlyList<AggregatedMeasurements> CreateMeasurements(IEnumerable<AggregatedMeasurementDto> aggregatedMeasurements)
+    {
         var recentAggregatedMeasurements = aggregatedMeasurements.Where(am => am.EndTime > (DateTime.UtcNow - TimeSpan.FromDays(1)));
         var wifiCalibrationNumber = recentAggregatedMeasurements.Min(am => am.WifiMinDeviceCount);
         var bluetoothCalibrationNumber = recentAggregatedMeasurements.Min(am => am.BluetoothMinDeviceCount);
 
-        return GetAggregatedMeasurementsResponse.CreateSuccessful(
-            aggregatedMeasurements.Select(am => new AggregatedMeasurements(
+        return aggregatedMeasurements.Select(am => new AggregatedMeasurements(
             am.AggregatedMeasurementDtoId,
             am.StartTime,
             am.EndTime,
@@ -80,22 +100,6 @@ public async Task<GetAggregatedMeasurementsResponse> GetAggregateMeasurements(in
             am.WifiMaxDeviceCount - wifiCalibrationNumber,
             am.WifiMinDeviceCount - wifiCalibrationNumber,
             am.TotalWifiDeviceCount - wifiCalibrationNumber)
-            ).ToImmutableArray());
-    }
-
-    [HttpGet("range")]
-    public async Task<GetAggregatedMeasurementsResponse> GetAggregateMeasurements(int roomId, DateTime timeStart, DateTime timeEnd, CancellationToken token)
-    {
-        var aggregatedMeasurements = await GetAggregateMeasurements(roomId, token);
-
-        if (!aggregatedMeasurements.Success)
-        {
-            return GetAggregatedMeasurementsResponse.CreateUnsuccessful();
-        }
-
-        return GetAggregatedMeasurementsResponse
-            .CreateSuccessful(aggregatedMeasurements.AggregatedMeasurements!
-            .Where(am => am.StartTime >= timeStart && am.EndTime <= timeEnd)
-            .ToImmutableArray());
+            ).ToImmutableArray();
     }
 }