Fixes #120 - Calling getPartioningAdditionalData of the repo in the s…

…ervice
AbsaOSS · Mar 19, 2024 · 086525e · 086525e
1 parent ff6edb5
commit 086525e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/server/src/main/scala/za/co/absa/atum/server/api/repository/PartitioningRepository.scala b/server/src/main/scala/za/co/absa/atum/server/api/repository/PartitioningRepository.scala
@@ -93,8 +93,8 @@ object PartitioningRepositoryImpl {
   val layer: URLayer[CreatePartitioningIfNotExists, PartitioningRepository] = ZLayer {
     for {
       createPartitioningIfNotExists <- ZIO.service[CreatePartitioningIfNotExists]
-      getPartitioningMeasures <- ZIO.service[GetPartitioningMeasures]
-      getPartitioningAdditionalData <- ZIO.service[GetPartitioningAdditionalData]
-    } yield new PartitioningRepositoryImpl(createPartitioningIfNotExists, getPartitioningMeasures, getPartitioningAdditionalData)
+//      getPartitioningMeasures <- ZIO.service[GetPartitioningMeasures]
+//      getPartitioningAdditionalData <- ZIO.service[GetPartitioningAdditionalData]
+    } yield new PartitioningRepositoryImpl(createPartitioningIfNotExists)
   }
 }
diff --git a/server/src/main/scala/za/co/absa/atum/server/api/service/PartitioningService.scala b/server/src/main/scala/za/co/absa/atum/server/api/service/PartitioningService.scala
@@ -16,7 +16,7 @@
 
 package za.co.absa.atum.server.api.service
 
-import za.co.absa.atum.model.dto.{MeasureDTO, PartitioningSubmitDTO}
+import za.co.absa.atum.model.dto.{AdditionalDataDTO, MeasureDTO, PartitioningSubmitDTO}
 import za.co.absa.atum.server.api.exception.{DatabaseError, ServiceError}
 import za.co.absa.atum.server.api.repository.PartitioningRepository
 import za.co.absa.fadb.exceptions.StatusException
@@ -32,6 +32,10 @@ trait PartitioningService {
   def getPartitioningMeasures(
     partitioning: PartitioningSubmitDTO
   ): IO[ServiceError, Either[StatusException, Seq[MeasureDTO]]]
+
+  def getPartioningAdditionalData(
+    partitioning: PartitioningSubmitDTO
+  ): IO[ServiceError, Either[StatusException, AdditionalDataDTO]]
 }
 
 class PartitioningServiceImpl(partitioningRepository: PartitioningRepository) extends PartitioningService {
@@ -53,6 +57,13 @@ class PartitioningServiceImpl(partitioningRepository: PartitioningRepository) ex
       }
   }
 
+  override def getPartioningAdditionalData(partitioning: PartitioningSubmitDTO): IO[ServiceError, Either[StatusException, AdditionalDataDTO]] = {
+    partitioningRepository
+      .getPartitioningAdditionalData(partitioning)
+      .mapError { case DatabaseError(message) =>
+        ServiceError(s"Failed to retrieve partitioning additional data: $message")
+      }
+  }
 }
 
 object PartitioningServiceImpl {