From 90be855944233ab874a58957faad4de870ae1da8 Mon Sep 17 00:00:00 2001
From: staudtMarius <marius.staudt@tu-dortmund.de>
Date: Wed, 20 Nov 2024 08:57:16 +0100
Subject: [PATCH 1/2] Enhance `TimeSeriesSource` with method to retrieve the
 previous value before a given key.

---
 CHANGELOG.md                                  |  1 +
 .../datamodel/io/source/TimeSeriesSource.java |  4 +-
 .../io/source/csv/CsvTimeSeriesSource.java    |  9 ++++
 .../io/source/sql/SqlTimeSeriesSource.java    | 47 +++++++++++++++----
 .../individual/IndividualTimeSeries.java      |  4 +-
 .../repetitive/LoadProfileInput.java          |  4 +-
 .../source/csv/CsvTimeSeriesSourceIT.groovy   | 20 ++++++++
 .../source/sql/SqlTimeSeriesSourceIT.groovy   | 10 ++++
 .../IndividualTimeSeriesTest.groovy           |  4 +-
 9 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c6c590e8..e53f08eba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Enhance `TimeSeriesSource` with method to retrieve all time keys after a given key [#543](https://github.com/ie3-institute/PowerSystemDataModel/issues/543)
 - Enhance `WeatherSource` with method to retrieve all time keys after a given key [#572](https://github.com/ie3-institute/PowerSystemDataModel/issues/572)
+- Enhance `TimeSeriesSource` with method to retrieve the previous value before a given key [#1182](https://github.com/ie3-institute/PowerSystemDataModel/issues/1182)
 
 ### Fixed
 
diff --git a/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java b/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java
index a9ade054e..2a80e0a78 100644
--- a/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java
+++ b/src/main/java/edu/ie3/datamodel/io/source/TimeSeriesSource.java
@@ -50,7 +50,9 @@ protected Try<TimeBasedValue<V>, FactoryException> createTimeBasedValue(
   public abstract IndividualTimeSeries<V> getTimeSeries(ClosedInterval<ZonedDateTime> timeInterval)
       throws SourceException;
 
-  public abstract Optional<V> getValue(ZonedDateTime time) throws SourceException;
+  public abstract Optional<V> getValue(ZonedDateTime time);
+
+  public abstract Optional<TimeBasedValue<V>> getPreviousTimeBasedValue(ZonedDateTime time);
 
   /**
    * Method to return all time keys after a given timestamp.
diff --git a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java
index 1bbab427a..0210b7dde 100644
--- a/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java
+++ b/src/main/java/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSource.java
@@ -128,6 +128,15 @@ public Optional<V> getValue(ZonedDateTime time) {
     return timeSeries.getValue(time);
   }
 
+  @Override
+  public Optional<TimeBasedValue<V>> getPreviousTimeBasedValue(ZonedDateTime time) {
+    return timeSeries.getPreviousTimeBasedValue(time);
+  }
+
+  public Optional<TimeBasedValue<V>> getNextTimeBasedValue(ZonedDateTime time) {
+    return timeSeries.getNextTimeBasedValue(time);
+  }
+
   @Override
   public List<ZonedDateTime> getTimeKeysAfter(ZonedDateTime time) {
     return timeSeries.getTimeKeysAfter(time);
diff --git a/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java b/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java
index c75e8b949..8743869b2 100644
--- a/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java
+++ b/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java
@@ -48,6 +48,7 @@ public class SqlTimeSeriesSource<V extends Value> extends TimeSeriesSource<V> {
 
   private final String queryTimeInterval;
   private final String queryTimeKeysAfter;
+  private final String queryForValueBefore;
   private final String queryTime;
 
   public SqlTimeSeriesSource(
@@ -63,15 +64,16 @@ public SqlTimeSeriesSource(
     final ColumnScheme columnScheme = ColumnScheme.parse(valueClass).orElseThrow();
     this.tableName = sqlDataSource.databaseNamingStrategy.getTimeSeriesEntityName(columnScheme);
 
+    String schemaName = sqlDataSource.schemaName;
+
     String dbTimeColumnName =
         sqlDataSource.getDbColumnName(factory.getTimeFieldString(), tableName);
 
-    this.queryFull = createQueryFull(sqlDataSource.schemaName, tableName);
-    this.queryTimeInterval =
-        createQueryForTimeInterval(sqlDataSource.schemaName, tableName, dbTimeColumnName);
-    this.queryTimeKeysAfter =
-        createQueryForTimeKeysAfter(sqlDataSource.schemaName, tableName, dbTimeColumnName);
-    this.queryTime = createQueryForTime(sqlDataSource.schemaName, tableName, dbTimeColumnName);
+    this.queryFull = createQueryFull(schemaName, tableName);
+    this.queryTimeInterval = createQueryForTimeInterval(schemaName, tableName, dbTimeColumnName);
+    this.queryTimeKeysAfter = createQueryForTimeKeysAfter(schemaName, tableName, dbTimeColumnName);
+    this.queryForValueBefore = createQueryForValueBefore(schemaName, tableName, dbTimeColumnName);
+    this.queryTime = createQueryForTime(schemaName, tableName, dbTimeColumnName);
   }
 
   /**
@@ -179,6 +181,14 @@ public Optional<V> getValue(ZonedDateTime time) {
     return Optional.of(timeBasedValues.stream().toList().get(0).getValue());
   }
 
+  @Override
+  public Optional<TimeBasedValue<V>> getPreviousTimeBasedValue(ZonedDateTime time) {
+    return getTimeBasedValueSet(
+            queryForValueBefore, ps -> ps.setTimestamp(1, Timestamp.from(time.toInstant())))
+        .stream()
+        .max(TimeBasedValue::compareTo);
+  }
+
   @Override
   public List<ZonedDateTime> getTimeKeysAfter(ZonedDateTime time) {
     return dataSource
@@ -278,8 +288,29 @@ private String createQueryForTimeKeysAfter(
   }
 
   /**
-   * Creates a basic query to retrieve an entry for the given time series uuid and time with the
-   * following pattern: <br>
+   * Creates a base query to retrieve all time keys after a given time for given time series with
+   * the following pattern: <br>
+   * {@code <base query> WHERE time_series = $timeSeriesUuid AND <time column> < ?;}
+   *
+   * @param schemaName the name of the database schema
+   * @param tableName the name of the database table
+   * @param timeColumnName the name of the column holding the timestamp info
+   * @return the query string
+   */
+  private String createQueryForValueBefore(
+      String schemaName, String tableName, String timeColumnName) {
+    return createBaseQueryString(schemaName, tableName)
+        + WHERE
+        + TIME_SERIES
+        + " = '"
+        + timeSeriesUuid.toString()
+        + "' AND "
+        + timeColumnName
+        + " < ?;";
+  }
+  /**
+   * Creates a base query to retrieve all time keys before a given time for given time series with
+   * the following pattern: <br>
    * {@code <base query> WHERE time_series = $timeSeriesUuid AND <time column>=?;}
    *
    * @param schemaName the name of the database schema
diff --git a/src/main/java/edu/ie3/datamodel/models/timeseries/individual/IndividualTimeSeries.java b/src/main/java/edu/ie3/datamodel/models/timeseries/individual/IndividualTimeSeries.java
index 0b26a1090..a89e1a234 100644
--- a/src/main/java/edu/ie3/datamodel/models/timeseries/individual/IndividualTimeSeries.java
+++ b/src/main/java/edu/ie3/datamodel/models/timeseries/individual/IndividualTimeSeries.java
@@ -55,14 +55,14 @@ public Optional<V> getValue(ZonedDateTime time) {
   @Override
   protected Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
     return timeToValue.keySet().stream()
-        .filter(valueTime -> valueTime.compareTo(time) <= 0)
+        .filter(valueTime -> valueTime.compareTo(time) < 0)
         .max(Comparator.naturalOrder());
   }
 
   @Override
   protected Optional<ZonedDateTime> getNextDateTime(ZonedDateTime time) {
     return timeToValue.keySet().stream()
-        .filter(valueTime -> valueTime.compareTo(time) >= 0)
+        .filter(valueTime -> valueTime.compareTo(time) > 0)
         .min(Comparator.naturalOrder());
   }
 
diff --git a/src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileInput.java b/src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileInput.java
index d4450568b..017e28c02 100644
--- a/src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileInput.java
+++ b/src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileInput.java
@@ -42,13 +42,13 @@ public PValue calc(ZonedDateTime time) {
   @Override
   protected Optional<ZonedDateTime> getPreviousDateTime(ZonedDateTime time) {
     // dummy value
-    return Optional.of(time.minusHours(1));
+    return Optional.of(time.minusMinutes(15));
   }
 
   @Override
   protected Optional<ZonedDateTime> getNextDateTime(ZonedDateTime time) {
     // dummy value
-    return Optional.of(time.plusHours(1));
+    return Optional.of(time.plusMinutes(15));
   }
 
   @Override
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
index 78ca34d74..49b1ce59c 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
@@ -85,4 +85,24 @@ class CsvTimeSeriesSourceIT extends Specification implements CsvTestDataMeta {
     actual.present
     actual.get() == PH_VALUE_15MIN
   }
+
+  def "A csv time series source is able to return the previous value for a given time"() {
+    when:
+    def actual = source.getPreviousTimeBasedValue(TIME_15MIN)
+
+    then:
+    actual.isPresent()
+    actual.get().time == TIME_00MIN
+    actual.get().value == PH_VALUE_00MIN
+  }
+
+  def "A csv time series source is able to return the next value for a given time"() {
+    when:
+    def actual = source.getNextTimeBasedValue(TIME_00MIN)
+
+    then:
+    actual.isPresent()
+    actual.get().time == TIME_15MIN
+    actual.get().value == PH_VALUE_15MIN
+  }
 }
\ No newline at end of file
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
index 2b28fbb8c..b7eb03e57 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
@@ -123,6 +123,16 @@ class SqlTimeSeriesSourceIT extends Specification implements TestContainerHelper
     value.get() == P_VALUE_00MIN
   }
 
+  def "A SqlTimeSeriesSource is able to return the previous value for a given time"() {
+    when:
+    def actual = pSource.getPreviousTimeBasedValue(TIME_15MIN)
+
+    then:
+    actual.isPresent()
+    actual.get().time == TIME_00MIN
+    actual.get().value == P_VALUE_00MIN
+  }
+
   def "A SqlTimeSeriesSource can read multiple time series values for a time interval"() {
     given:
     def timeInterval = new ClosedInterval(TIME_00MIN, TIME_15MIN)
diff --git a/src/test/groovy/edu/ie3/datamodel/models/timeseries/IndividualTimeSeriesTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/timeseries/IndividualTimeSeriesTest.groovy
index a8e569ccf..1adb2a40e 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/timeseries/IndividualTimeSeriesTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/timeseries/IndividualTimeSeriesTest.groovy
@@ -72,7 +72,7 @@ class IndividualTimeSeriesTest extends Specification implements TimeSeriesTestDa
     Optional<TimeBasedValue<IntValue>> expected =  Optional.of(new TimeBasedValue<>(ZonedDateTime.of(1990, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")), new IntValue(3)))
 
     when:
-    Optional<TimeBasedValue<IntValue>> actual = individualIntTimeSeries.getPreviousTimeBasedValue(ZonedDateTime.of(1990, 1, 1, 0, 0, 0, 0, ZoneId.of("UTC")))
+    Optional<TimeBasedValue<IntValue>> actual = individualIntTimeSeries.getPreviousTimeBasedValue(ZonedDateTime.of(1990, 1, 1, 0, 5, 0, 0, ZoneId.of("UTC")))
 
     then:
     expected.present
@@ -103,7 +103,7 @@ class IndividualTimeSeriesTest extends Specification implements TimeSeriesTestDa
     Optional<TimeBasedValue<IntValue>> expected =  Optional.of(new TimeBasedValue<>(ZonedDateTime.of(1990, 1, 1, 0, 15, 0, 0, ZoneId.of("UTC")), new IntValue(4)))
 
     when:
-    Optional<TimeBasedValue<IntValue>> actual = individualIntTimeSeries.getNextTimeBasedValue(ZonedDateTime.of(1990, 1, 1, 0, 15, 0, 0, ZoneId.of("UTC")))
+    Optional<TimeBasedValue<IntValue>> actual = individualIntTimeSeries.getNextTimeBasedValue(ZonedDateTime.of(1990, 1, 1, 0, 10, 0, 0, ZoneId.of("UTC")))
 
     then:
     expected.present

From e966d3273544512c46cf118e7bbd76b5d74f8929 Mon Sep 17 00:00:00 2001
From: staudtMarius <marius.staudt@tu-dortmund.de>
Date: Wed, 20 Nov 2024 13:26:31 +0100
Subject: [PATCH 2/2] Improving query for last value before timestamp.

---
 .../io/source/sql/SqlTimeSeriesSource.java         |  3 ++-
 .../io/source/sql/SqlTimeSeriesSourceIT.groovy     | 14 ++++++++++----
 .../test/common/TimeSeriesSourceTestData.groovy    |  1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java b/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java
index 8743869b2..7016feb5d 100644
--- a/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java
+++ b/src/main/java/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSource.java
@@ -306,7 +306,8 @@ private String createQueryForValueBefore(
         + timeSeriesUuid.toString()
         + "' AND "
         + timeColumnName
-        + " < ?;";
+        + " < ?"
+        + "ORDER BY time DESC LIMIT 1;";
   }
   /**
    * Creates a base query to retrieve all time keys before a given time for given time series with
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
index b7eb03e57..0b960aba9 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
@@ -12,6 +12,7 @@ import edu.ie3.datamodel.io.connectors.SqlConnector
 import edu.ie3.datamodel.io.naming.DatabaseNamingStrategy
 import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation
+import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
 import edu.ie3.datamodel.models.value.*
 import edu.ie3.test.helper.TestContainerHelper
 import edu.ie3.util.TimeUtil
@@ -125,12 +126,17 @@ class SqlTimeSeriesSourceIT extends Specification implements TestContainerHelper
 
   def "A SqlTimeSeriesSource is able to return the previous value for a given time"() {
     when:
-    def actual = pSource.getPreviousTimeBasedValue(TIME_15MIN)
+    def actual = pSource.getPreviousTimeBasedValue(time)
 
     then:
-    actual.isPresent()
-    actual.get().time == TIME_00MIN
-    actual.get().value == P_VALUE_00MIN
+    actual.isPresent() == expectedResult.isPresent()
+    actual == expectedResult
+
+    where:
+    time       | expectedResult
+    TIME_00MIN | Optional.empty()
+    TIME_15MIN | Optional.of(new TimeBasedValue<>(TIME_00MIN, P_VALUE_00MIN))
+    TIME_30MIN | Optional.of(new TimeBasedValue<>(TIME_15MIN, P_VALUE_15MIN))
   }
 
   def "A SqlTimeSeriesSource can read multiple time series values for a time interval"() {
diff --git a/src/test/groovy/edu/ie3/test/common/TimeSeriesSourceTestData.groovy b/src/test/groovy/edu/ie3/test/common/TimeSeriesSourceTestData.groovy
index f99a6fdd1..9df990efb 100644
--- a/src/test/groovy/edu/ie3/test/common/TimeSeriesSourceTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/TimeSeriesSourceTestData.groovy
@@ -20,6 +20,7 @@ final class  TimeSeriesSourceTestData {
 
   public static final ZonedDateTime TIME_00MIN = ZonedDateTime.parse("2020-01-01T00:00:00Z")
   public static final ZonedDateTime TIME_15MIN = ZonedDateTime.parse("2020-01-01T00:15:00Z")
+  public static final ZonedDateTime TIME_30MIN = ZonedDateTime.parse("2020-01-01T00:30:00Z")
 
   public static final PValue P_VALUE_00MIN = new PValue(
   Quantities.getQuantity(1000.0d, StandardUnits.ACTIVE_POWER_IN)