fixes, minors

AbsaOSS · May 22, 2024 · 3f09ecf · 3f09ecf
1 parent 34cfee0
commit 3f09ecf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/server/src/main/scala/za/co/absa/atum/server/model/PlayJsonImplicits.scala b/server/src/main/scala/za/co/absa/atum/server/model/PlayJsonImplicits.scala
@@ -94,7 +94,7 @@ object PlayJsonImplicits {
   implicit val readsAtumContextDTO: Reads[AtumContextDTO] = Json.reads[AtumContextDTO]
   implicit val writesAtumContextDTO: Writes[AtumContextDTO] = Json.writes[AtumContextDTO]
 
-  implicit def readsSingleApiResponse[T: Reads]: Reads[SingleSuccessResponse[T]] = Json.reads[SingleSuccessResponse[T]]
-  implicit def writesSingleApiResponse[T: Writes]: Writes[SingleSuccessResponse[T]] = Json.writes[SingleSuccessResponse[T]]
+  implicit def readsSingleSuccessResponse[T: Reads]: Reads[SingleSuccessResponse[T]] = Json.reads[SingleSuccessResponse[T]]
+  implicit def writesSingleSuccessResponse[T: Writes]: Writes[SingleSuccessResponse[T]] = Json.writes[SingleSuccessResponse[T]]
 
 }
diff --git a/server/src/test/scala/za/co/absa/atum/server/api/controller/PartitioningControllerSpec.scala b/server/src/test/scala/za/co/absa/atum/server/api/controller/PartitioningControllerSpec.scala
@@ -5,14 +5,15 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package za.co.absa.atum.server.api.controller
 
 import org.mockito.Mockito.{mock, when}

diff --git a/server/src/test/scala/za/co/absa/atum/server/api/http/CreateCheckpointEndpointSpec.scala b/server/src/test/scala/za/co/absa/atum/server/api/http/CreateCheckpointEndpointSpec.scala
@@ -27,7 +27,7 @@ import za.co.absa.atum.model.dto.CheckpointDTO
 import za.co.absa.atum.server.api.TestData
 import za.co.absa.atum.server.api.controller.CheckpointController
 import za.co.absa.atum.server.model.ErrorResponse.{GeneralErrorResponse, InternalServerErrorResponse}
-import za.co.absa.atum.server.model.PlayJsonImplicits.{readsCheckpointDTO, writesCheckpointDTO}
+import za.co.absa.atum.server.model.PlayJsonImplicits._
 import za.co.absa.atum.server.model.SuccessResponse.SingleSuccessResponse
 import zio._
 import zio.test.Assertion.equalTo
@@ -47,10 +47,7 @@ object CreateCheckpointEndpointSpec extends ZIOSpecDefault with Endpoints with T
   private val checkpointControllerMockLayer = ZLayer.succeed(checkpointControllerMock)
 
   private val createCheckpointServerEndpoint =
-    createCheckpointEndpoint.zServerLogic(
-      CheckpointController.createCheckpoint
-//      CheckpointController.createCheckpoint _ andThen(_.map(SingleSuccessResponse(_)))
-    )
+    createCheckpointEndpoint.zServerLogic(CheckpointController.createCheckpoint)
 
   def spec: Spec[TestEnvironment with Scope, Any] = {
     val backendStub = TapirStubInterpreter(SttpBackendStub.apply(new RIOMonadError[CheckpointController]))
@@ -60,7 +57,7 @@ object CreateCheckpointEndpointSpec extends ZIOSpecDefault with Endpoints with T
 
     val request = basicRequest
       .post(uri"https://test.com/api/v1/createCheckpoint")
-      .response(asJson[CheckpointDTO])
+      .response(asJson[SingleSuccessResponse[CheckpointDTO]])
 
     suite("CreateCheckpointEndpointSuite")(
       test("Returns expected CheckpointDTO") {
@@ -71,7 +68,7 @@ object CreateCheckpointEndpointSpec extends ZIOSpecDefault with Endpoints with T
         val body = response.map(_.body)
         val statusCode = response.map(_.code)
 
-        assertZIO(body <&> statusCode)(equalTo(Right(SingleSuccessResponse(checkpointDTO1)), StatusCode.Created))
+        assertZIO(body <*> statusCode)(equalTo(Right(SingleSuccessResponse(checkpointDTO1)), StatusCode.Created))
       },
       test("Returns expected BadRequest") {
         val response = request

diff --git a/server/src/test/scala/za/co/absa/atum/server/api/http/CreatePartitioningEndpointSpec.scala b/server/src/test/scala/za/co/absa/atum/server/api/http/CreatePartitioningEndpointSpec.scala
@@ -27,7 +27,7 @@ import za.co.absa.atum.model.dto.AtumContextDTO
 import za.co.absa.atum.server.api.TestData
 import za.co.absa.atum.server.api.controller.PartitioningController
 import za.co.absa.atum.server.model.ErrorResponse.{GeneralErrorResponse, InternalServerErrorResponse}
-import za.co.absa.atum.server.model.PlayJsonImplicits.{readsAtumContextDTO, writesPartitioningSubmitDTO}
+import za.co.absa.atum.server.model.PlayJsonImplicits._
 import za.co.absa.atum.server.model.SuccessResponse.SingleSuccessResponse
 import zio._
 import zio.test.Assertion.equalTo
@@ -47,10 +47,7 @@ object CreatePartitioningEndpointSpec extends ZIOSpecDefault with Endpoints with
   private val createPartitioningEndpointMockLayer = ZLayer.succeed(createPartitioningEndpointMock)
 
   private val createPartitioningServerEndpoint =
-    createPartitioningEndpoint.zServerLogic(
-//      PartitioningController.createPartitioningIfNotExists _ andThen (_.map(SingleSuccessResponse(_)))
-      PartitioningController.createPartitioningIfNotExists
-    )
+    createPartitioningEndpoint.zServerLogic(PartitioningController.createPartitioningIfNotExists)
 
   def spec: Spec[TestEnvironment with Scope, Any] = {
     val backendStub = TapirStubInterpreter(SttpBackendStub.apply(new RIOMonadError[PartitioningController]))
@@ -60,7 +57,7 @@ object CreatePartitioningEndpointSpec extends ZIOSpecDefault with Endpoints with
 
     val request = basicRequest
       .post(uri"https://test.com/api/v1/createPartitioning")
-      .response(asJson[AtumContextDTO])
+      .response(asJson[SingleSuccessResponse[AtumContextDTO]])
 
     suite("CreatePartitioningEndpointSuite")(
       test("Returns expected AtumContextDTO") {
@@ -71,7 +68,9 @@ object CreatePartitioningEndpointSpec extends ZIOSpecDefault with Endpoints with
         val body = response.map(_.body)
         val statusCode = response.map(_.code)
 
-        assertZIO(body <&> statusCode)(equalTo(Right(createAtumContextDTO(partitioningSubmitDTO1)), StatusCode.Ok))
+        assertZIO(body <&> statusCode)(
+          equalTo(Right(SingleSuccessResponse(createAtumContextDTO(partitioningSubmitDTO1))), StatusCode.Ok)
+        )
       },
       test("Returns expected BadRequest") {
         val response = request