Strict fail-fast on partial results

Author: PhilippSchmelter

src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java

@@ -153,6 +153,14 @@ public Map<Point, IndividualTimeSeries<WeatherValue>> getWeather(
         }
       }
     }
+
+    if (coordinateToTimeSeries.size() < coordinates.size()) {
+      Set<Point> missingCoordinates = new HashSet<>(coordinates);
+      missingCoordinates.removeAll(coordinateToTimeSeries.keySet());
+      throw new NoDataException(
+          "No weather data for coordinates " + missingCoordinates + " in interval " + timeInterval);
+    }
+
     return coordinateToTimeSeries;
   }
 

src/main/java/edu/ie3/datamodel/io/source/csv/CsvWeatherSource.java

@@ -130,6 +130,14 @@ public Map<Point, IndividualTimeSeries<WeatherValue>> getWeather(
       throw new NoDataException(
           "No weather data found for the given time interval: " + timeInterval);
     }
+
+    if (result.size() < coordinates.size()) {
+      Set<Point> missingCoordinates = new HashSet<>(coordinates);
+      missingCoordinates.removeAll(result.keySet());
+      throw new NoDataException(
+          "No weather data for coordinates " + missingCoordinates + " in interval " + timeInterval);
+    }
+
     return result;
   }
 

src/main/java/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSource.java

@@ -122,6 +122,14 @@ public Map<Point, IndividualTimeSeries<WeatherValue>> getWeather(
         }
       }
     }
+
+    if (coordinateToTimeSeries.size() < coordinates.size()) {
+      Set<Point> missingCoordinates = new HashSet<>(coordinates);
+      missingCoordinates.removeAll(coordinateToTimeSeries.keySet());
+      throw new NoDataException(
+          "No weather data for coordinates " + missingCoordinates + " in interval " + timeInterval);
+    }
+
     return coordinateToTimeSeries;
   }
 

src/main/java/edu/ie3/datamodel/io/source/sql/SqlWeatherSource.java

@@ -144,7 +144,17 @@ public Map<Point, IndividualTimeSeries<WeatherValue>> getWeather(
                   ps.setTimestamp(3, Timestamp.from(timeInterval.getUpper().toInstant()));
                 }));
 
-    return mapWeatherValuesToPoints(timeBasedValues);
+    Map<Point, IndividualTimeSeries<WeatherValue>> result =
+        mapWeatherValuesToPoints(timeBasedValues);
+
+    if (result.size() < coordinates.size()) {
+      Set<Point> missingCoordinates = new HashSet<>(coordinates);
+      missingCoordinates.removeAll(result.keySet());
+      throw new NoDataException(
+          "No weather data for coordinates " + missingCoordinates + " in interval " + timeInterval);
+    }
+
+    return result;
   }
 
   @Override

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceIconIT.groovy

@@ -195,6 +195,25 @@ class CouchbaseWeatherSourceIconIT extends Specification implements TestContaine
     ex.message.contains(invalidCoordinate.toString())
   }
 
+  def "A CouchbaseWeatherSource throws NoDataException when some valid coordinates have no data in time interval"() {
+    given:
+    def validCoordinateWithData = IconWeatherTestData.COORDINATE_67775
+    def validCoordinateWithoutData = IconWeatherTestData.COORDINATE_67776
+    def futureTimeInterval = new ClosedInterval(IconWeatherTestData.TIME_17H.plusHours(1), IconWeatherTestData.TIME_17H.plusHours(2))
+
+    when: "requesting weather for valid coordinates but in a future time interval where no data exists"
+    source.getWeather(futureTimeInterval, [
+      validCoordinateWithData,
+      validCoordinateWithoutData
+    ])
+
+    then: "NoDataException is thrown for missing data in interval"
+    def ex = thrown(NoDataException)
+    ex.message.contains("No weather data for coordinates")
+    ex.message.contains("in interval")
+    ex.message.contains(futureTimeInterval.toString())
+  }
+
   def "A CouchbaseWeatherSource throws NoDataException for future date"() {
     given:
     def futureDate = IconWeatherTestData.TIME_17H.plusDays(30)

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy

@@ -340,4 +340,23 @@ class CsvWeatherSourceIconTest extends Specification implements CsvTestDataMeta,
     ex.message.contains("No data for given coordinates")
     ex.message.contains(invalidCoordinate.toString())
   }
+
+  def "A CsvWeatherSource throws NoDataException when some valid coordinates have no data in time interval"() {
+    given:
+    def validCoordinateWithData = IconWeatherTestData.COORDINATE_67775
+    def validCoordinateWithoutData = IconWeatherTestData.COORDINATE_67776
+    def futureTimeInterval = new ClosedInterval(IconWeatherTestData.TIME_17H.plusHours(1), IconWeatherTestData.TIME_17H.plusHours(2))
+
+    when: "requesting weather for valid coordinates but in a future time interval where no data exists"
+    source.getWeather(futureTimeInterval, [
+      validCoordinateWithData,
+      validCoordinateWithoutData
+    ])
+
+    then: "NoDataException is thrown for missing data in interval"
+    def ex = thrown(NoDataException)
+    ex.message.contains("No weather data for coordinates")
+    ex.message.contains("in interval")
+    ex.message.contains(futureTimeInterval.toString())
+  }
 }

src/test/groovy/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSourceIconIT.groovy

@@ -160,6 +160,25 @@ class InfluxDbWeatherSourceIconIT extends Specification implements WeatherSource
     ex3.message.contains(invalidCoordinate.toString())
   }
 
+  def "An InfluxDbWeatherSource throws NoDataException when some valid coordinates have no data in time interval"() {
+    given:
+    def validCoordinateWithData = IconWeatherTestData.COORDINATE_67775
+    def validCoordinateWithoutData = IconWeatherTestData.COORDINATE_67776
+    def futureTimeInterval = new ClosedInterval(IconWeatherTestData.TIME_17H.plusHours(1), IconWeatherTestData.TIME_17H.plusHours(2))
+
+    when: "requesting weather for valid coordinates but in a future time interval where no data exists"
+    source.getWeather(futureTimeInterval, [
+      validCoordinateWithData,
+      validCoordinateWithoutData
+    ])
+
+    then: "NoDataException is thrown for missing data in interval"
+    def ex = thrown(NoDataException)
+    ex.message.contains("No weather data for coordinates")
+    ex.message.contains("in interval")
+    ex.message.contains(futureTimeInterval.toString())
+  }
+
   def "The InfluxDbWeatherSource returns all time keys after a given time key correctly"() {
     given:
     def time = IconWeatherTestData.TIME_15H

src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlWeatherSourceCosmoIT.groovy

@@ -181,4 +181,23 @@ class SqlWeatherSourceCosmoIT extends Specification implements TestContainerHelp
     ex.message.contains("No data for given coordinates")
     ex.message.contains(invalidCoordinate.toString())
   }
+
+  def "A SqlWeatherSource throws NoDataException when some valid coordinates have no data in time interval"() {
+    given:
+    def validCoordinateWithData = CosmoWeatherTestData.COORDINATE_193186
+    def validCoordinateWithoutData = CosmoWeatherTestData.COORDINATE_193187
+    def futureTimeInterval = new ClosedInterval(CosmoWeatherTestData.TIME_17H.plusHours(1), CosmoWeatherTestData.TIME_17H.plusHours(2))
+
+    when: "requesting weather for valid coordinates but in a future time interval where no data exists"
+    source.getWeather(futureTimeInterval, [
+      validCoordinateWithData,
+      validCoordinateWithoutData
+    ])
+
+    then: "NoDataException is thrown for missing data in interval"
+    def ex = thrown(NoDataException)
+    ex.message.contains("No weather data for coordinates")
+    ex.message.contains("in interval")
+    ex.message.contains(futureTimeInterval.toString())
+  }
 }