Merge branch 'dev' into sp/#273-simplify-ParticipantConfigUtil

ie3-institute · Jul 31, 2022 · 4629335 · 4629335
2 parents 3e83e39 + a5b7992
commit 4629335
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix treatment of non-InitializeTrigger triggers in initialization within SimScheduler [#237](https://github.com/ie3-institute/simona/issues/237)
 - Fix breaking SIMONA caused by introducing temperature dependant load profiles in PSDM [#255](https://github.com/ie3-institute/simona/issues/255)
 - Respect for voltage angle in DBFS slack voltage exchange protocol [#69](https://github.com/ie3-institute/simona/issues/69)
+- Adapted to changed time series interfaces in PSDM [#296](https://github.com/ie3-institute/simona/issues/296)
 
 ### Removed
 - Remove workaround for tscfg tmp directory [#178](https://github.com/ie3-institute/simona/issues/178)

diff --git a/src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceProxy.scala b/src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceProxy.scala
@@ -8,24 +8,24 @@ package edu.ie3.simona.service.primary
 
 import akka.actor.{Actor, ActorRef, PoisonPill, Props}
 import edu.ie3.datamodel.io.connectors.SqlConnector
+import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
+import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.naming.{
   DatabaseNamingStrategy,
   EntityPersistenceNamingStrategy,
   FileNamingStrategy
 }
-import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
-import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation
-import edu.ie3.datamodel.io.source.{
-  TimeSeriesMappingSource,
-  TimeSeriesTypeSource
-}
 import edu.ie3.datamodel.io.source.csv.{
   CsvTimeSeriesMappingSource,
-  CsvTimeSeriesTypeSource
+  CsvTimeSeriesMetaInformationSource
 }
 import edu.ie3.datamodel.io.source.sql.{
   SqlTimeSeriesMappingSource,
-  SqlTimeSeriesTypeSource
+  SqlTimeSeriesMetaInformationSource
+}
+import edu.ie3.datamodel.io.source.{
+  TimeSeriesMappingSource,
+  TimeSeriesMetaInformationSource
 }
 import edu.ie3.datamodel.models.value.Value
 import edu.ie3.simona.config.SimonaConfig
@@ -67,6 +67,7 @@ import java.text.SimpleDateFormat
 import java.time.ZonedDateTime
 import java.util.UUID
 import scala.Option.when
+import scala.compat.java8.OptionConverters.RichOptionalGeneric
 import scala.jdk.CollectionConverters._
 import scala.util.{Failure, Success, Try}
 
@@ -148,15 +149,13 @@ case class PrimaryServiceProxy(
     createSources(primaryConfig).map {
       case (mappingSource, metaInformationSource) =>
         val modelToTimeSeries = mappingSource.getMapping.asScala.toMap
-        val timeSeriesMetaInformation =
-          metaInformationSource.getTimeSeriesMetaInformation.asScala.toMap
-
         val timeSeriesToSourceRef = modelToTimeSeries.values
           .to(LazyList)
           .distinct
           .flatMap { timeSeriesUuid =>
-            timeSeriesMetaInformation
-              .get(timeSeriesUuid) match {
+            metaInformationSource
+              .getTimeSeriesMetaInformation(timeSeriesUuid)
+              .asScala match {
               case Some(metaInformation) =>
                 /* Only register those entries, that meet the supported column schemes */
                 when(
@@ -186,7 +185,7 @@ case class PrimaryServiceProxy(
 
   private def createSources(
       primaryConfig: PrimaryConfig
-  ): Try[(TimeSeriesMappingSource, TimeSeriesTypeSource)] = {
+  ): Try[(TimeSeriesMappingSource, TimeSeriesMetaInformationSource)] = {
     Seq(
       primaryConfig.sqlParams,
       primaryConfig.influxDb1xParams,
@@ -201,7 +200,7 @@ case class PrimaryServiceProxy(
             directoryPath,
             fileNamingStrategy
           ),
-          new CsvTimeSeriesTypeSource(
+          new CsvTimeSeriesMetaInformationSource(
             csvSep,
             directoryPath,
             fileNamingStrategy
@@ -219,7 +218,7 @@ case class PrimaryServiceProxy(
             sqlParams.schemaName,
             new EntityPersistenceNamingStrategy()
           ),
-          new SqlTimeSeriesTypeSource(
+          new SqlTimeSeriesMetaInformationSource(
             sqlConnector,
             sqlParams.schemaName,
             new DatabaseNamingStrategy()

diff --git a/src/main/scala/edu/ie3/simona/service/weather/WeatherSourceWrapper.scala b/src/main/scala/edu/ie3/simona/service/weather/WeatherSourceWrapper.scala
@@ -45,7 +45,7 @@ import edu.ie3.simona.util.TickUtil
 import edu.ie3.simona.util.TickUtil.TickLong
 import edu.ie3.util.exceptions.EmptyQuantityException
 import edu.ie3.util.interval.ClosedInterval
-import edu.ie3.util.scala.DoubleUtils.ImplicitDouble
+import edu.ie3.util.DoubleUtils.ImplicitDouble
 import tech.units.indriya.quantity.Quantities
 import tech.units.indriya.unit.Units
 

diff --git a/src/test/scala/edu/ie3/simona/service/ev/ExtEvDataServiceSpec.scala b/src/test/scala/edu/ie3/simona/service/ev/ExtEvDataServiceSpec.scala
@@ -741,7 +741,7 @@ class ExtEvDataServiceSpec
       extData.receiveTriggerQueue.size() shouldBe 1
       // only evcs 1 should be included, the other one is full
       extData.receiveTriggerQueue.take() shouldBe new ProvideEvcsFreeLots(
-        Map(evcs1UUID -> new Integer(2)).asJava
+        Map(evcs1UUID -> Integer.valueOf(2)).asJava
       )
     }
 

diff --git a/src/test/scala/edu/ie3/simona/test/common/input/TimeSeriesTestData.scala b/src/test/scala/edu/ie3/simona/test/common/input/TimeSeriesTestData.scala
@@ -6,10 +6,8 @@
 
 package edu.ie3.simona.test.common.input
 
-import edu.ie3.datamodel.io.naming.timeseries.{
-  ColumnScheme,
-  IndividualTimeSeriesMetaInformation
-}
+import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
+import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 
 import java.util.UUID
 
@@ -21,19 +19,22 @@ trait TimeSeriesTestData {
   protected val uuidPqh: UUID =
     UUID.fromString("46be1e57-e4ed-4ef7-95f1-b2b321cb2047")
 
-  protected val metaP: IndividualTimeSeriesMetaInformation =
-    new IndividualTimeSeriesMetaInformation(
+  protected val metaP: CsvIndividualTimeSeriesMetaInformation =
+    new CsvIndividualTimeSeriesMetaInformation(
       uuidP,
-      ColumnScheme.ACTIVE_POWER
+      ColumnScheme.ACTIVE_POWER,
+      s"its_p_$uuidP"
     )
-  protected val metaPq: IndividualTimeSeriesMetaInformation =
-    new IndividualTimeSeriesMetaInformation(
+  protected val metaPq: CsvIndividualTimeSeriesMetaInformation =
+    new CsvIndividualTimeSeriesMetaInformation(
       uuidPq,
-      ColumnScheme.APPARENT_POWER
+      ColumnScheme.APPARENT_POWER,
+      s"its_pq_$uuidPq"
     )
-  protected val metaPqh: IndividualTimeSeriesMetaInformation =
-    new IndividualTimeSeriesMetaInformation(
+  protected val metaPqh: CsvIndividualTimeSeriesMetaInformation =
+    new CsvIndividualTimeSeriesMetaInformation(
       uuidPqh,
-      ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND
+      ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND,
+      s"its_pqh_$uuidPqh"
     )
 }