fix nullable of samples

OpenCleanEnergy · Oct 2, 2024 · 0f7e3ae · 0f7e3ae
1 parent c271c46
commit 0f7e3ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/server/src/OpenEMS.Analytics/ElectricityMeterSample.cs b/server/src/OpenEMS.Analytics/ElectricityMeterSample.cs
@@ -12,7 +12,7 @@ public class ElectricityMeterSample : IHasOwner
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.CurrentPower"/>.
     /// </summary>
-    public required Watt CurrentPower { get; init; }
+    public required Watt? CurrentPower { get; init; }
 
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.CurrentPowerDirection"/>.
@@ -22,12 +22,12 @@ public class ElectricityMeterSample : IHasOwner
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.TotalEnergyConsumption"/>.
     /// </summary>
-    public required WattHours TotalEnergyConsumption { get; init; }
+    public required WattHours? TotalEnergyConsumption { get; init; }
 
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.TotalEnergyFeedIn"/>.
     /// </summary>
-    public required WattHours TotalEnergyFeedIn { get; init; }
+    public required WattHours? TotalEnergyFeedIn { get; init; }
 
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.OwnedBy"/>.

diff --git a/server/src/OpenEMS.Analytics/ProducerSample.cs b/server/src/OpenEMS.Analytics/ProducerSample.cs
@@ -12,12 +12,12 @@ public class ProducerSample : IHasOwner
     /// <summary>
     /// Gets the <see cref="Producer.CurrentPowerProduction"/>.
     /// </summary>
-    public required Watt CurrentPowerProduction { get; init; }
+    public required Watt? CurrentPowerProduction { get; init; }
 
     /// <summary>
     /// Gets the <see cref="Producer.TotalEnergyProduction"/>.
     /// </summary>
-    public required WattHours TotalEnergyProduction { get; init; }
+    public required WattHours? TotalEnergyProduction { get; init; }
 
     /// <summary>
     /// Gets the <see cref="Producer.OwnedBy"/>.

diff --git a/....Test/Analytics/DbContextDeviceSamplerTest.Creates_Electricity_Meter_Samples.verified.txt b/....Test/Analytics/DbContextDeviceSamplerTest.Creates_Electricity_Meter_Samples.verified.txt
@@ -7,15 +7,13 @@
       CurrentPower: 1200,
       CurrentPowerDirection: Consume,
       TotalEnergyConsumption: 400,
-      TotalEnergyFeedIn: 0,
       OwnedBy: test-user
     },
     {
       ElectricityMeterId: meter-2-id,
       Timestamp: 2024-08-31 13:34:59 +0,
       CurrentPower: 200,
       CurrentPowerDirection: FeedIn,
-      TotalEnergyConsumption: 0,
       TotalEnergyFeedIn: 150,
       OwnedBy: test-user
     }