Merge remote-tracking branch 'origin/df/#965-compression-at-resultEve…

…ntListener' into df/#965-compression-at-resultEventListener
ie3-institute · Sep 27, 2024 · 77bb521 · 77bb521
2 parents e26fe13 + a81c887
commit 77bb521
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/main/scala/edu/ie3/simona/event/listener/ResultEventListener.scala b/src/main/scala/edu/ie3/simona/event/listener/ResultEventListener.scala
@@ -69,7 +69,7 @@ object ResultEventListener extends Transformer3wResultSupport {
   ): Iterable[Future[(Class[_], ResultEntitySink)]] = {
     resultFileHierarchy.resultSinkType match {
       case csv: ResultSinkType.Csv =>
-        val enableCompression = csv.zipFiles
+        val enableCompression = csv.compressOutputs
 
         resultFileHierarchy.resultEntitiesToConsider.map { resultClass =>
           val filePathOpt =
@@ -107,7 +107,7 @@ object ResultEventListener extends Transformer3wResultSupport {
                 ResultEntityCsvSink(
                   finalFileName,
                   new ResultEntityProcessor(resultClass),
-                  fileName.endsWith(".gz"),
+                  finalFileName.endsWith(".gz"),
                 ),
               )
             }

diff --git a/src/main/scala/edu/ie3/simona/io/result/ResultSinkType.scala b/src/main/scala/edu/ie3/simona/io/result/ResultSinkType.scala
@@ -21,7 +21,7 @@ object ResultSinkType {
       fileFormat: String = ".csv",
       filePrefix: String = "",
       fileSuffix: String = "",
-      zipFiles: Boolean = false,
+      compressOutputs: Boolean = false,
   ) extends ResultSinkType
 
   final case class InfluxDb1x(url: String, database: String, scenario: String)
@@ -53,7 +53,7 @@ object ResultSinkType {
           params.fileFormat,
           params.filePrefix,
           params.fileSuffix,
-          params.zipFiles,
+          params.compressOutputs,
         )
       case Some(params: SimonaConfig.Simona.Output.Sink.InfluxDb1x) =>
         InfluxDb1x(buildInfluxDb1xUrl(params), params.database, runName)

diff --git a/src/test/scala/edu/ie3/simona/config/ConfigFailFastSpec.scala b/src/test/scala/edu/ie3/simona/config/ConfigFailFastSpec.scala
@@ -856,7 +856,9 @@ class ConfigFailFastSpec extends UnitSpec with ConfigTestData {
           intercept[InvalidConfigParameterException] {
             ConfigFailFast invokePrivate checkDataSink(
               Sink(
-                Some(Csv("", "", "", isHierarchic = false, zipFiles = false)),
+                Some(
+                  Csv(compressOutputs = false, "", "", "", isHierarchic = false)
+                ),
                 Some(InfluxDb1x("", 0, "")),
                 None,
               )

diff --git a/src/test/scala/edu/ie3/simona/io/result/ResultSinkTypeSpec.scala b/src/test/scala/edu/ie3/simona/io/result/ResultSinkTypeSpec.scala
@@ -23,7 +23,7 @@ class ResultSinkTypeSpec extends UnitSpec {
             filePrefix = "",
             fileSuffix = "",
             isHierarchic = false,
-            zipFiles = false,
+            compressOutputs = false,
           )
         ),
         influxDb1x = None,
@@ -35,7 +35,7 @@ class ResultSinkTypeSpec extends UnitSpec {
           fileFormat shouldBe conf.csv.value.fileFormat
           filePrefix shouldBe conf.csv.value.filePrefix
           fileSuffix shouldBe conf.csv.value.fileSuffix
-          zipFiles shouldBe conf.csv.value.zipFiles
+          zipFiles shouldBe conf.csv.value.compressOutputs
         case _ =>
           fail("Wrong ResultSinkType got instantiated.")
       }
@@ -107,7 +107,7 @@ class ResultSinkTypeSpec extends UnitSpec {
             filePrefix = "",
             fileSuffix = "",
             isHierarchic = false,
-            zipFiles = false,
+            compressOutputs = false,
           )
         ),
         influxDb1x = Some(