* just better implementation

AbsaOSS · Nov 30, 2024 · c344249 · c344249
1 parent d04d23b
commit c344249
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/reader/src/main/scala/za/co/absa/atum/reader/FlowReader.scala b/reader/src/main/scala/za/co/absa/atum/reader/FlowReader.scala
@@ -35,6 +35,4 @@ class FlowReader[F[_]](val mainFlowPartitioning: AtumPartitions)
                       (implicit serverConfig: ServerConfig, backend: SttpBackend[F, Any], ev: MonadError[F])
   extends Reader[F] with PartitioningIdProvider[F]{
 
-  override def partitioning: AtumPartitions = mainFlowPartitioning
-
 }
diff --git a/reader/src/main/scala/za/co/absa/atum/reader/basic/PartitioningIdProvider.scala b/reader/src/main/scala/za/co/absa/atum/reader/basic/PartitioningIdProvider.scala
@@ -26,9 +26,7 @@ import za.co.absa.atum.model.utils.JsonSyntaxExtensions.JsonSerializationSyntax
 import za.co.absa.atum.reader.basic.RequestResult.RequestResult
 
 trait PartitioningIdProvider[F[_]] {self: Reader[F] =>
-  def partitioning: AtumPartitions
-
-  def partitioningId()(implicit monad: MonadError[F]): F[RequestResult[Long]] = {
+  def partitioningId(partitioning: AtumPartitions)(implicit monad: MonadError[F]): F[RequestResult[Long]] = {
     val encodedPartitioning = partitioning.toPartitioningDTO.asBase64EncodedJsonString
     val queryResult = getQuery[SingleSuccessResponse[PartitioningWithIdDTO]]("/api/v2/partitionings", Map("partitioning" -> encodedPartitioning))
     queryResult.map{result =>

diff --git a/reader/src/test/scala/za/co/absa/atum/reader/basic/PartitioningIdProviderUnitTests.scala b/reader/src/test/scala/za/co/absa/atum/reader/basic/PartitioningIdProviderUnitTests.scala
@@ -58,20 +58,22 @@ class PartitioningIdProviderUnitTests extends AnyFunSuiteLike {
                                                   (implicit serverConfig: ServerConfig)
         extends Reader[Identity] with PartitioningIdProvider[Identity]{
 
-    override def partitioningId()(implicit monad: MonadError[Identity]): Identity[RequestResult[Long]] = super.partitioningId()
+    override def partitioningId(partitioning: AtumPartitions)
+                               (implicit monad: MonadError[Identity]): Identity[RequestResult[Long]] =
+      super.partitioningId(partitioning)
   }
 
 
   test("Gets the partitioning id") {
     val reader = ReaderWithPartitioningIdForTest(atumPartitionsToReply)
-    val response = reader.partitioningId()
+    val response = reader.partitioningId(atumPartitionsToReply)
     val result: Long = response.getOrElse(throw new Exception("Failed to get partitioning id"))
     assert(result == 1)
   }
 
   test("Not found on the partitioning id") {
     val reader = ReaderWithPartitioningIdForTest(atumPartitionsToNotFound)
-    val result = reader.partitioningId()
+    val result = reader.partitioningId(atumPartitionsToNotFound)
     result match {
       case Right(_) => fail("Expected a failure, but OK response received")
       case Left(_: DeserializationException[CirceError]) => fail("Expected a not found response, but deserialization error received")
@@ -82,9 +84,10 @@ class PartitioningIdProviderUnitTests extends AnyFunSuiteLike {
     }
   }
 
-  test("Failure to decode response body") {
+  test("Failure to decode res  " +
+    "]ponse body") {
     val reader = ReaderWithPartitioningIdForTest(atumPartitionsToFailedDecode)
-    val result = reader.partitioningId()
+    val result = reader.partitioningId(atumPartitionsToFailedDecode)
     assert(result.isLeft)
     result.swap.map(e => assert(e.isInstanceOf[DeserializationException[CirceError]]))
   }