Subtract min from last 24 hours from device counts + other fixes

CentralHub.Api.Tests/MeasurementControllerTests.cs

@@ -15,6 +15,8 @@ public class MeasurementControllerTests
     private ITrackerRepository _trackerRepository;
     private IMeasurementRepository _aggregatedMeasurementRepository;
 
+    private LocalizationService _localizationService;
+
     private int _roomId = 0;
 
     private int _trackerId = 0;
@@ -48,6 +50,12 @@ public void Setup()
             NullLogger<MeasurementController>.Instance,
             _aggregatedMeasurementRepository,
             _trackerRepository);
+
+        _localizationService = new LocalizationService(
+            NullLogger<LocalizationService>.Instance,
+            _aggregatedMeasurementRepository,
+            _roomRepository
+        );
     }
 
     [TearDown]
@@ -70,7 +78,7 @@ public async Task TestAddMeasurements()
 
         var addMeasurementsRequest = new AddMeasurementsRequest(_trackerId, measurements);
         await _measurementController.AddMeasurements(addMeasurementsRequest, default);
-        var addedMeasurements = (await _aggregatedMeasurementRepository.GetRoomMeasurementGroupsAsync(default))[_trackerId][0].Measurements;
+        var addedMeasurements = (await _aggregatedMeasurementRepository.GetRoomMeasurementGroupsAsync(default))[_roomId][0].Measurements;
 
         Assert.That(addedMeasurements, Has.Count.EqualTo(measurements.Length));
         Assert.That(addedMeasurements, Does.Contain(measurements[0]));
@@ -87,8 +95,55 @@ public async Task TrackersFilteredFromMeasurements()
 
         var addMeasurementsRequest = new AddMeasurementsRequest(_trackerId, measurements);
         await _measurementController.AddMeasurements(addMeasurementsRequest, default);
-        var addedMeasurements = (await _aggregatedMeasurementRepository.GetRoomMeasurementGroupsAsync(default))[_trackerId][0].Measurements;
+        var addedMeasurements = (await _aggregatedMeasurementRepository.GetRoomMeasurementGroupsAsync(default))[_roomId][0].Measurements;
 
         Assert.That(addedMeasurements, Has.Count.EqualTo(0));
     }
+
+    [Test]
+    public async Task CalibrateMeasurements()
+    {
+        var measurements = new Measurement[] {
+            new Measurement("12:22:33:44:55:66", Measurement.Protocol.Bluetooth, 10),
+            new Measurement("ab:bb:cc:dd:ee:ff", Measurement.Protocol.Wifi, 20)
+        };
+
+        var addMeasurementsRequest = new AddMeasurementsRequest(_trackerId, measurements);
+        await _measurementController.AddMeasurements(addMeasurementsRequest, default);
+
+        var measurements2 = new Measurement[] {
+            new Measurement("13:22:33:44:55:66", Measurement.Protocol.Bluetooth, 10),
+            new Measurement("ac:bb:cc:dd:ee:ff", Measurement.Protocol.Wifi, 20),
+            new Measurement("14:22:33:44:55:66", Measurement.Protocol.Bluetooth, 10),
+            new Measurement("ab:bb:cc:dd:ee:ff", Measurement.Protocol.Wifi, 20)
+        };
+
+        var addMeasurementsRequest2 = new AddMeasurementsRequest(_trackerId, measurements2);
+        await _measurementController.AddMeasurements(addMeasurementsRequest2, default);
+        await _localizationService.AggregateMeasurementsAsync(default);
+
+        var measurements3 = new Measurement[] {
+            new Measurement("13:22:33:44:55:66", Measurement.Protocol.Bluetooth, 10),
+            new Measurement("ac:bb:cc:dd:ee:ff", Measurement.Protocol.Wifi, 20),
+            new Measurement("14:22:33:44:55:66", Measurement.Protocol.Bluetooth, 10),
+            new Measurement("ab:bb:cc:dd:ee:ff", Measurement.Protocol.Wifi, 20)
+        };
+
+        var addMeasurementsRequest3 = new AddMeasurementsRequest(_trackerId, measurements3);
+        await _measurementController.AddMeasurements(addMeasurementsRequest3, default);
+        await _localizationService.AggregateMeasurementsAsync(default);
+
+        var lastAggregatedMeasurements = (await _measurementController.GetAggregateMeasurements(_roomId, default)).AggregatedMeasurements.Last();
+
+        Assert.That(lastAggregatedMeasurements.BluetoothMedian, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.WifiMedian, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.BluetoothMean, Is.EqualTo(1f));
+        Assert.That(lastAggregatedMeasurements.WifiMean, Is.EqualTo(1f));
+        Assert.That(lastAggregatedMeasurements.BluetoothMax, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.WifiMax, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.BluetoothMin, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.WifiMin, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.TotalBluetoothDeviceCount, Is.EqualTo(1));
+        Assert.That(lastAggregatedMeasurements.TotalWifiDeviceCount, Is.EqualTo(1));
+    }
 }

CentralHub.Api.Tests/MockTrackerRepository.cs

@@ -89,6 +89,6 @@ public Task AddUnregisteredTracker(string wifiMacAddress, string bluetoothMacAdd
 
     public Task<IEnumerable<TrackerDto>> GetRegisteredTrackers(CancellationToken cancellationToken)
     {
-        return Task.FromResult(RoomDto.Trackers.ToList().AsEnumerable());
+        return Task.FromResult(RoomDto.Trackers.ToArray().AsEnumerable());
     }
 }

CentralHub.Api/Controllers/MeasurementController.cs

@@ -60,22 +60,27 @@ public async Task<GetAggregatedMeasurementsResponse> GetAggregateMeasurements(in
             return GetAggregatedMeasurementsResponse.CreateUnsuccessful();
         }
 
+        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(
             am.AggregatedMeasurementDtoId,
             am.StartTime,
             am.EndTime,
             am.MeasurementGroupCount,
-            am.BluetoothMedianDeviceCount,
-            am.BluetoothMeanDeviceCount,
-            am.BluetoothMaxDeviceCount,
-            am.BluetoothMinDeviceCount,
-            am.TotalBluetoothDeviceCount,
-            am.WifiMedianDeviceCount,
-            am.WifiMeanDeviceCount,
-            am.WifiMaxDeviceCount,
-            am.WifiMinDeviceCount,
-            am.TotalWifiDeviceCount)).ToImmutableArray());
+            am.BluetoothMedianDeviceCount - bluetoothCalibrationNumber,
+            am.BluetoothMeanDeviceCount - bluetoothCalibrationNumber,
+            am.BluetoothMaxDeviceCount - bluetoothCalibrationNumber,
+            am.BluetoothMinDeviceCount - bluetoothCalibrationNumber,
+            am.TotalBluetoothDeviceCount - bluetoothCalibrationNumber,
+            am.WifiMedianDeviceCount - wifiCalibrationNumber,
+            am.WifiMeanDeviceCount - wifiCalibrationNumber,
+            am.WifiMaxDeviceCount - wifiCalibrationNumber,
+            am.WifiMinDeviceCount - wifiCalibrationNumber,
+            am.TotalWifiDeviceCount - wifiCalibrationNumber)
+            ).ToImmutableArray());
     }
 
     [HttpGet("range")]

CentralHub.Api/MeasurementGroup.cs

@@ -7,7 +7,7 @@ public class MeasurementGroup
 {
     public MeasurementGroup(IEnumerable<Measurement> measurements)
     {
-        Timestamp = DateTime.Now;
+        Timestamp = DateTime.UtcNow;
         Measurements = measurements.ToImmutableArray();
     }
     public DateTime Timestamp { get; }

CentralHub.Api/Services/LocalizationService.cs

@@ -73,7 +73,7 @@ private static AggregatedMeasurementDto CreateAggregatedMeasurement(RoomDto room
         var measurements = measurementGroups.SelectMany(mg => mg.Measurements);
         var bluetooth = measurements.Where(m => m.Type == Measurement.Protocol.Bluetooth);
         var wifi = measurements.Where(m => m.Type == Measurement.Protocol.Wifi);
-        var now = DateTime.Now;
+        var now = DateTime.UtcNow;
 
         var startMeasurementTime = measurementGroups.Count != 0 ? measurementGroups.Min(mg => mg.Timestamp) : now - _sleepTime;
         var endMeasurementTime = measurementGroups.Count != 0 ? measurementGroups.Max(mg => mg.Timestamp) : now;
@@ -145,7 +145,7 @@ private static IEnumerable<Measurement> FilterMeasurements(IEnumerable<Measureme
             }
         }
 
-        return filteredMeasurements.Values.Where(m => m.Rssi >= -75);
+        return filteredMeasurements.Values;
     }
 
     private static int MaxDevices(IEnumerable<int> numMatchingProtocolPerGroup)