enhancing TimeSeriesProcessor

Author: danielfeismann

src/main/java/edu/ie3/datamodel/io/processor/timeseries/FieldSourceToMethod.java

@@ -25,5 +25,7 @@ public enum FieldSource {
     WEATHER_IRRADIANCE,
     WEATHER_TEMPERATURE,
     WEATHER_WIND,
+    GROUND_TEMPERATURE_ONE,
+    GROUND_TEMPERATURE_TWO,
   }
 }

src/main/java/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessor.java

@@ -172,6 +172,17 @@ private SortedMap<String, FieldSourceToMethod> buildFieldToSource(
           .forEach(addFunction.apply(WEATHER_IRRADIANCE));
       mapFieldNameToGetter(TemperatureValue.class).forEach(addFunction.apply(WEATHER_TEMPERATURE));
       mapFieldNameToGetter(WindValue.class).forEach(addFunction.apply(WEATHER_WIND));
+      Map<String, GetterMethod> groundTempMap = mapFieldNameToGetter(GroundTemperatureValue.class);
+      groundTempMap.forEach(
+          (fieldName, getter) ->
+              addFunction
+                  .apply(GROUND_TEMPERATURE_ONE)
+                  .accept("groundTemperatureValueOne", getter));
+      groundTempMap.forEach(
+          (fieldName, getter) ->
+              addFunction
+                  .apply(GROUND_TEMPERATURE_TWO)
+                  .accept("groundTemperatureValueTwo", getter));
 
     } else if (valueClass.equals(BdewLoadValues.class)) {
 
@@ -272,6 +283,22 @@ private Map<String, String> handleEntry(T timeSeries, E entry) throws EntityProc
 
       Map<String, GetterMethod> windFieldToMethod = extractFieldToMethod(WEATHER_WIND);
       valueResult.putAll(processObject(weatherValue.getWind(), windFieldToMethod));
+
+      Map<String, GetterMethod> groundTempOneFieldToMethod =
+          extractFieldToMethod(GROUND_TEMPERATURE_ONE);
+      if (weatherValue.getGroundTemperatureValueOne().isPresent()) {
+        valueResult.putAll(
+            processObject(
+                weatherValue.getGroundTemperatureValueOne().get(), groundTempOneFieldToMethod));
+      }
+
+      Map<String, GetterMethod> groundTempTwoFieldToMethod =
+          extractFieldToMethod(GROUND_TEMPERATURE_TWO);
+      if (weatherValue.getGroundTemperatureValueTwo().isPresent()) {
+        valueResult.putAll(
+            processObject(
+                weatherValue.getGroundTemperatureValueTwo().get(), groundTempTwoFieldToMethod));
+      }
     }
 
     /* Join all information and sort them */

src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy

@@ -185,8 +185,8 @@ trait TimeSeriesTestData {
     new SolarIrradianceValue(Quantities.getQuantity(5d, StandardUnits.SOLAR_IRRADIANCE), Quantities.getQuantity(10d, StandardUnits.SOLAR_IRRADIANCE)),
     new TemperatureValue(Quantities.getQuantity(5d, CELSIUS)),
     new WindValue(Quantities.getQuantity(5d, DEGREE_GEOM), Quantities.getQuantity(10d, METRE_PER_SECOND)),
-    null,
-    null
+    Optional.empty(),
+    Optional.empty()
     )
     ),
     new TimeBasedValue<>(
@@ -196,8 +196,8 @@ trait TimeSeriesTestData {
     new SolarIrradianceValue(Quantities.getQuantity(15d, StandardUnits.SOLAR_IRRADIANCE), Quantities.getQuantity(20d, StandardUnits.SOLAR_IRRADIANCE)),
     new TemperatureValue(Quantities.getQuantity(15d, CELSIUS)),
     new WindValue(Quantities.getQuantity(15d, DEGREE_GEOM), Quantities.getQuantity(20d, METRE_PER_SECOND)),
-    null,
-    null
+    Optional.empty(),
+    Optional.empty()
     )
     ),
     new TimeBasedValue<>(
@@ -223,8 +223,6 @@ trait TimeSeriesTestData {
       "temperature"             : "5.0",
       "time"                    : "2020-04-02T10:00:00Z",
       "velocity"                : "10.0",
-      "groundTemperatureValueOne"    : "10.0",
-      "groundTemperatureValueTwo"   : "10.0"
     ] as LinkedHashMap,
     [
       "coordinate"            : "{\"type\":\"Point\",\"coordinates\":[7.412152,51.492758],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",
@@ -234,8 +232,6 @@ trait TimeSeriesTestData {
       "temperature"             : "15.0",
       "time"                    : "2020-04-02T10:15:00Z",
       "velocity"                : "20.0",
-      "groundTemperatureValueOne"    : "10.0",
-      "groundTemperatureValueTwo"   : "10.0"
     ] as LinkedHashMap,
     [
       "coordinate"            : "{\"type\":\"Point\",\"coordinates\":[7.412152,51.492758],\"crs\":{\"type\":\"name\",\"properties\":{\"name\":\"EPSG:4326\"}}}",