From 3f09ecf4d4bf669d14dc113c83d8a65ce1a10d97 Mon Sep 17 00:00:00 2001 From: Pavel Salamon Date: Wed, 22 May 2024 11:08:18 +0200 Subject: [PATCH] fixes, minors --- .../absa/atum/server/model/PlayJsonImplicits.scala | 4 ++-- .../api/controller/PartitioningControllerSpec.scala | 3 ++- .../api/http/CreateCheckpointEndpointSpec.scala | 11 ++++------- .../api/http/CreatePartitioningEndpointSpec.scala | 13 ++++++------- 4 files changed, 14 insertions(+), 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 index c567be3fb..d900e5441 100644 --- 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 index 46df42935..c0e11f45e 100644 --- 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,7 +5,7 @@ * 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, @@ -13,6 +13,7 @@ * 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 index e34264eb5..7400c506f 100644 --- 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 index b3a66f7e2..8e8a7821e 100644 --- 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