#188: moving the circe-related implicit conversions to a companion ob…

…ject of a given DTO
AbsaOSS · Jun 14, 2024 · 8d777f6 · 8d777f6
1 parent d6fe29d
commit 8d777f6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/model/src/main/scala/za/co/absa/atum/model/dto/MeasureResultDTO.scala b/model/src/main/scala/za/co/absa/atum/model/dto/MeasureResultDTO.scala
@@ -16,6 +16,8 @@
 
 package za.co.absa.atum.model.dto
 
+import io.circe.{Decoder, Encoder}
+
 case class MeasureResultDTO(
   mainValue: MeasureResultDTO.TypedValue,
   supportValues: Map[String, MeasureResultDTO.TypedValue] = Map.empty
@@ -36,4 +38,29 @@ object MeasureResultDTO {
     case object Double extends ResultValueType
   }
 
+
+  implicit val encodeResultValueType: Encoder[MeasureResultDTO.ResultValueType] = Encoder.encodeString.contramap {
+    case MeasureResultDTO.ResultValueType.String      => "String"
+    case MeasureResultDTO.ResultValueType.Long        => "Long"
+    case MeasureResultDTO.ResultValueType.BigDecimal  => "BigDecimal"
+    case MeasureResultDTO.ResultValueType.Double      => "Double"
+  }
+
+  implicit val decodeResultValueType: Decoder[MeasureResultDTO.ResultValueType] = Decoder.decodeString.emap {
+    case "String"     => Right(MeasureResultDTO.ResultValueType.String)
+    case "Long"       => Right(MeasureResultDTO.ResultValueType.Long)
+    case "BigDecimal" => Right(MeasureResultDTO.ResultValueType.BigDecimal)
+    case "Double"     => Right(MeasureResultDTO.ResultValueType.Double)
+    case other        => Left(s"Cannot decode $other as ResultValueType")
+  }
+
+  implicit val encodeTypedValue: Encoder[MeasureResultDTO.TypedValue] =
+    Encoder.forProduct2("value", "valueType")(tv => (tv.value, tv.valueType))
+
+  implicit val decodeTypedValue: Decoder[MeasureResultDTO.TypedValue] =
+    Decoder.forProduct2("value", "valueType")(MeasureResultDTO.TypedValue.apply)
+
+  implicit val decodeMeasureResultDTO: Decoder[MeasureResultDTO] =
+    Decoder.forProduct2("mainValue", "supportValues")(MeasureResultDTO.apply)
+
 }
diff --git a/server/src/main/scala/za/co/absa/atum/server/api/database/DoobieImplicits.scala b/server/src/main/scala/za/co/absa/atum/server/api/database/DoobieImplicits.scala
@@ -20,10 +20,8 @@ import cats.Show
 import cats.data.NonEmptyList
 import doobie.{Get, Put}
 import doobie.postgres.implicits._
-import io.circe.{Decoder, Encoder}
 import org.postgresql.jdbc.PgArray
 import org.postgresql.util.PGobject
-import za.co.absa.atum.model.dto.MeasureResultDTO
 
 import scala.util.{Failure, Success, Try}
 
@@ -157,27 +155,4 @@ object DoobieImplicits {
     }
   }
 
-  implicit val encodeResultValueType: Encoder[MeasureResultDTO.ResultValueType] = Encoder.encodeString.contramap {
-    case MeasureResultDTO.ResultValueType.String      => "String"
-    case MeasureResultDTO.ResultValueType.Long        => "Long"
-    case MeasureResultDTO.ResultValueType.BigDecimal  => "BigDecimal"
-    case MeasureResultDTO.ResultValueType.Double      => "Double"
-  }
-
-  implicit val decodeResultValueType: Decoder[MeasureResultDTO.ResultValueType] = Decoder.decodeString.emap {
-    case "String"     => Right(MeasureResultDTO.ResultValueType.String)
-    case "Long"       => Right(MeasureResultDTO.ResultValueType.Long)
-    case "BigDecimal" => Right(MeasureResultDTO.ResultValueType.BigDecimal)
-    case "Double"     => Right(MeasureResultDTO.ResultValueType.Double)
-    case other        => Left(s"Cannot decode $other as ResultValueType")
-  }
-
-  implicit val encodeTypedValue: Encoder[MeasureResultDTO.TypedValue] =
-    Encoder.forProduct2("value", "valueType")(tv => (tv.value, tv.valueType))
-
-  implicit val decodeTypedValue: Decoder[MeasureResultDTO.TypedValue] =
-    Decoder.forProduct2("value", "valueType")(MeasureResultDTO.TypedValue.apply)
-
-  implicit val decodeMeasureResultDTO: Decoder[MeasureResultDTO] =
-    Decoder.forProduct2("mainValue", "supportValues")(MeasureResultDTO.apply)
 }
diff --git a/server/src/main/scala/za/co/absa/atum/server/model/CheckpointFromDB.scala b/server/src/main/scala/za/co/absa/atum/server/model/CheckpointFromDB.scala
@@ -18,13 +18,10 @@ package za.co.absa.atum.server.model
 
 import za.co.absa.atum.model.dto.{CheckpointDTO, MeasureDTO, MeasureResultDTO, MeasurementDTO, PartitioningDTO}
 import io.circe.{DecodingFailure, Json}
-import io.circe.generic.auto._
 
 import java.time.ZonedDateTime
 import java.util.UUID
 
-import za.co.absa.atum.server.api.database.DoobieImplicits.decodeResultValueType
-
 case class CheckpointFromDB(
    idCheckpoint: UUID,
    checkpointName: String,