Fixes #120 - Adding implicit conversion

AbsaOSS · Apr 4, 2024 · baf89a2 · baf89a2
1 parent f43f67f
commit baf89a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...la/za/co/absa/atum/server/api/database/runs/functions/GetPartitioningAdditionalData.scala b/...la/za/co/absa/atum/server/api/database/runs/functions/GetPartitioningAdditionalData.scala
@@ -29,20 +29,24 @@ import za.co.absa.fadb.doobie.DoobieFunction.DoobieMultipleResultFunction
 import za.co.absa.fadb.doobie.DoobieEngine
 import zio.interop.catz.asyncInstance
 import zio.{Task, URLayer, ZIO, ZLayer}
+import doobie._
+import doobie.postgres.implicits._
 
 class GetPartitioningAdditionalData (implicit schema: DBSchema, dbEngine: DoobieEngine[Task])
   extends DoobieMultipleResultFunction[PartitioningSubmitDTO, AdditionalDataDTO, Task]
   {
+    implicit val getMapWithOptionStringValues: Get[Map[String, Option[String]]] = Get[Map[String, String]]
+      .tmap(map => map.map { case (k, v) => k -> Option(v) })
 
-  override def sql(values: PartitioningSubmitDTO)(implicit read: Read[AdditionalDataDTO]): Fragment = {
+    override def sql(values: PartitioningSubmitDTO)(implicit read: Read[AdditionalDataDTO]): Fragment = {
     val partitioning = PartitioningForDB.fromSeqPartitionDTO(values.partitioning)
     val partitioningJsonString = Json.toJson(partitioning).toString
 
     sql"""SELECT ${Fragment.const(selectEntry)} FROM ${Fragment.const(functionName)}(
                   ${
-      import za.co.absa.atum.server.api.database.DoobieImplicits.Jsonb.jsonbPutUsingString
-      partitioningJsonString
-    }
+                      import za.co.absa.atum.server.api.database.DoobieImplicits.Jsonb.jsonbPutUsingString
+                      partitioningJsonString
+                   }
                 ) ${Fragment.const(alias)};"""
   }
 

diff --git a/...in/scala/za/co/absa/atum/server/api/database/runs/functions/GetPartitioningMeasures.scala b/...in/scala/za/co/absa/atum/server/api/database/runs/functions/GetPartitioningMeasures.scala
@@ -29,10 +29,14 @@ import za.co.absa.atum.server.api.database.PostgresDatabaseProvider
 import za.co.absa.atum.server.api.database.runs.Runs
 import zio._
 import zio.interop.catz._
+import doobie._
+import doobie.postgres.implicits._
 
 class GetPartitioningMeasures (implicit schema: DBSchema, dbEngine: DoobieEngine[Task])
   extends DoobieMultipleResultFunction[PartitioningSubmitDTO, MeasureDTO, Task]
   {
+    implicit val getMapWithOptionStringValues: Get[Map[String, Option[String]]] = Get[Map[String, String]]
+      .tmap(map => map.map { case (k, v) => k -> Option(v) })
 
   override def sql(values: PartitioningSubmitDTO)(implicit read: Read[MeasureDTO]): Fragment = {
     val partitioning = PartitioningForDB.fromSeqPartitionDTO(values.partitioning)