Use parameter for timestamp

OpenCleanEnergy · Sep 23, 2024 · c7eb12b · c7eb12b
1 parent 6b18902
commit c7eb12b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/server/src/OpenEMS.Infrastructure/Analytics/DbContextDeviceSampler.cs b/server/src/OpenEMS.Infrastructure/Analytics/DbContextDeviceSampler.cs
@@ -18,10 +18,10 @@ public async Task<NumberOfSamples> TakeSamples(DateTimeOffset timestamp)
         var sb = new StringBuilder();
         foreach (var factory in _sqlFactories)
         {
-            sb.AppendLine(factory.GetSamplingSql(timestamp, GetTableName));
+            sb.AppendLine(factory.GetSamplingSql(GetTableName, "{0}"));
         }
 
-        var count = await _context.Database.ExecuteSqlRawAsync(sb.ToString());
+        var count = await _context.Database.ExecuteSqlRawAsync(sb.ToString(), timestamp);
 
         return NumberOfSamples.From(count);
     }

diff --git a/server/src/OpenEMS.Infrastructure/Analytics/IDbContextDeviceSamplingSqlFactory.cs b/server/src/OpenEMS.Infrastructure/Analytics/IDbContextDeviceSamplingSqlFactory.cs
@@ -2,5 +2,5 @@ namespace OpenEMS.Infrastructure.Analytics;
 
 public interface IDbContextDeviceSamplingSqlFactory
 {
-    string GetSamplingSql(DateTimeOffset timestamp, Func<Type, string> tableNameProvider);
+    string GetSamplingSql(Func<Type, string> tableNameProvider, string timestampParam);
 }
diff --git a/server/src/OpenEMS.Infrastructure/Analytics/PostgreSqlDeviceSamplingSqlFactory.cs b/server/src/OpenEMS.Infrastructure/Analytics/PostgreSqlDeviceSamplingSqlFactory.cs
diff --git a/...e/Analytics/ProducerSamplingSqlFactory.cs → ...s/PostgreSqlProducerSamplingSqlFactory.cs b/...e/Analytics/ProducerSamplingSqlFactory.cs → ...s/PostgreSqlProducerSamplingSqlFactory.cs
@@ -3,12 +3,9 @@
 
 namespace OpenEMS.Infrastructure.Analytics;
 
-public class ProducerSamplingSqlFactory : PostgreSqlDeviceSamplingSqlFactory
+public class PostgreSqlProducerSamplingSqlFactory : IDbContextDeviceSamplingSqlFactory
 {
-    protected override string GetSamplingSql(
-        string timestampSqlValue,
-        Func<Type, string> tableNameProvider
-    )
+    public string GetSamplingSql(Func<Type, string> tableNameProvider, string timestampParam)
     {
         var sql = $"""
             INSERT INTO "{tableNameProvider(typeof(ProducerSample))}" (
@@ -20,7 +17,7 @@ Func<Type, string> tableNameProvider
             )
             SELECT
                 "{nameof(Producer.Id)}",
-                {timestampSqlValue},
+                {timestampParam},
                 "{nameof(Producer.CurrentPowerProduction)}",
                 "{nameof(Producer.TotalEnergyProduction)}_{nameof(
                 Producer.TotalEnergyProduction.Value