Align temperature processing in Cosmo and Icon factories to use Kelvin units, adding null-checks to prevent FactoryException for missing temperature values. Update tests to reflect changes in exception handling.

Author: pierrepetersmeier

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed tests of `TimeBasedValue` [#1469](https://github.com/ie3-institute/PowerSystemDataModel/issues/1469)
 - Requiring `thermalBus` field in house and storage input [#1509](https://github.com/ie3-institute/PowerSystemDataModel/issues/1509)
 - Fixed handling of erroneous field values in `EntitySource.enrichWithDefault()` [#1511](https://github.com/ie3-institute/PowerSystemDataModel/issues/1511)
+- Aligned temperature processing in Cosmo and Icon factories to kelvin and added checks to prevent NullPointerExceptions for missing values. [#1521](https://github.com/ie3-institute/PowerSystemDataModel/issues/1521)
 
 ### Changed
 - Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

@@ -5,6 +5,7 @@
 */
 package edu.ie3.datamodel.io.factory.timeseries;
 
+import edu.ie3.datamodel.exceptions.FactoryException;
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
 import edu.ie3.datamodel.models.value.WeatherValue;
@@ -75,7 +76,12 @@ protected TimeBasedValue<WeatherValue> buildModel(TimeBasedWeatherValueData data
     ComparableQuantity<Irradiance> diffuseIrradiance =
         data.getQuantity(DIFFUSE_IRRADIANCE, PowerSystemUnits.WATT_PER_SQUAREMETRE);
     ComparableQuantity<Temperature> temperature =
-        data.getQuantity(TEMPERATURE, Units.KELVIN).to(StandardUnits.TEMPERATURE);
+        data.getQuantityOptional(TEMPERATURE, Units.KELVIN)
+            .map(quantity -> quantity.to(StandardUnits.TEMPERATURE))
+            .orElseThrow(
+                () ->
+                    new FactoryException(
+                        "The field \"" + TEMPERATURE + "\" is missing but required."));
     ComparableQuantity<Angle> windDirection =
         data.getQuantity(WIND_DIRECTION, StandardUnits.WIND_DIRECTION);
     ComparableQuantity<Speed> windVelocity =

src/main/java/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactory.java

@@ -5,6 +5,7 @@
 */
 package edu.ie3.datamodel.io.factory.timeseries;
 
+import edu.ie3.datamodel.exceptions.FactoryException;
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
 import edu.ie3.datamodel.models.value.WeatherValue;
@@ -88,7 +89,12 @@ protected TimeBasedValue<WeatherValue> buildModel(TimeBasedWeatherValueData data
     ComparableQuantity<Irradiance> diffuseIrradiance =
         data.getQuantity(DIFFUSE_IRRADIANCE, PowerSystemUnits.WATT_PER_SQUAREMETRE);
     ComparableQuantity<Temperature> temperature =
-        data.getQuantity(TEMPERATURE, Units.KELVIN).to(StandardUnits.TEMPERATURE);
+        data.getQuantityOptional(TEMPERATURE, Units.KELVIN)
+            .map(quantity -> quantity.to(StandardUnits.TEMPERATURE))
+            .orElseThrow(
+                () ->
+                    new FactoryException(
+                        "The field \"" + TEMPERATURE + "\" is missing but required."));
     ComparableQuantity<Angle> windDirection = getWindDirection(data);
     ComparableQuantity<Speed> windVelocity = getWindVelocity(data);
     Optional<ComparableQuantity<Temperature>> groundTemperatureLevel1 =

src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

@@ -40,7 +40,8 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
     factory.buildModel(data)
 
     then:
-    thrown(NullPointerException)
+    def exception = thrown(FactoryException)
+    exception.message.toLowerCase().contains("temperature")
   }
 
   def "A PsdmTimeBasedWeatherValueFactory should be able to create time series values"() {
@@ -62,19 +63,14 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
 
     def data = new TimeBasedWeatherValueData(parameter, coordinate)
 
-    def expectedTemperature = Quantities.getQuantity(
-        Double.parseDouble(parameter.get("temperature")),
-        Units.KELVIN
-        )
-
     def expectedResults = new TimeBasedValue(
         time, new WeatherValue(coordinate,
         Quantities.getQuantity(286.872985839844d, StandardUnits.SOLAR_IRRADIANCE),
         Quantities.getQuantity(282.671997070312d, StandardUnits.SOLAR_IRRADIANCE),
-        expectedTemperature,
+        Quantities.getQuantity(278.019012451172d, Units.KELVIN),
         Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
         Quantities.getQuantity(1.66103506088257d, StandardUnits.WIND_VELOCITY),
-        Optional.of(expectedTemperature),
+        Optional.of(Quantities.getQuantity(278.019012451172d, Units.KELVIN)),
         Optional.empty()))
 
     when:

src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/IconTimeBasedWeatherValueFactoryTest.groovy

@@ -200,10 +200,9 @@ class IconTimeBasedWeatherValueFactoryTest extends Specification {
     given:
     def factory = new IconTimeBasedWeatherValueFactory()
     def coordinate = CosmoWeatherTestData.COORDINATE_67775
-    def time = TimeUtil.withDefaults.toZonedDateTime("2019-01-01T00:00:00Z")
 
     Map<String, String> parameter = [
-      "time"        : TimeUtil.withDefaults.toString(time),
+      "time"        : "2019-01-01T00:00:00Z",
       "aswdifdS"    : "1.0",
       "aswdirS"     : "2.0",
       "t2m"         : "",
@@ -218,6 +217,7 @@ class IconTimeBasedWeatherValueFactoryTest extends Specification {
     factory.buildModel(data)
 
     then:
-    thrown(Exception)
+    def exception = thrown(FactoryException)
+    exception.message.toLowerCase().contains("t2m")
   }
 }