Refactor reply mapping

1 files changed, 12 insertions, 30 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala
index e7cd2db..0bbbb72 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala
@@ -1,8 +1,8 @@
 package xyz.driver.pdsuidomain.services.rest
 
-import akka.http.scaladsl.marshalling.Marshal
 import scala.concurrent.{ExecutionContext, Future}
 
+import akka.http.scaladsl.marshalling.Marshal
 import akka.http.scaladsl.model._
 import akka.stream.ActorMaterializer
 import xyz.driver.core.rest._
@@ -18,31 +18,21 @@ class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protect
                                                                 protected val exec: ExecutionContext)
     extends ArmService with RestHelper {
 
-  import xyz.driver.pdsuidomain.services.ArmService._
   import xyz.driver.pdsuicommon.serialization.PlayJsonSupport._
-
-  // GET               /v1/arm                    xyz.driver.server.controllers.ArmController.getList
-  // GET               /v1/arm/:id                xyz.driver.server.controllers.ArmController.getById(id: Long)
-  // POST              /v1/arm                    xyz.driver.server.controllers.ArmController.create
-  // PATCH             /v1/arm/:id                xyz.driver.server.controllers.ArmController.update(id: Long)
-  // DELETE            /v1/arm/:id                xyz.driver.server.controllers.ArmController.delete(id: Long)
+  import xyz.driver.pdsuidomain.services.ArmService._
 
   def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
              sorting: Option[Sorting] = None,
              pagination: Option[Pagination] = None)(
           implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] = {
-
     val request = HttpRequest(
       HttpMethods.GET,
       endpointUri(baseUri, "/v1/arm", filterQuery(filter) ++ sortingQuery(sorting) ++ paginationQuery(pagination)))
-
     for {
       response <- transport.sendRequestGetResponse(requestContext)(request)
-      reply <- apiResponse[ListResponse[ApiArm], GetListReply](response) { api =>
-                GetListReply.EntityList(api.items.map(_.toDomain), api.meta.itemsCount)
-              }
+      reply    <- apiResponse[ListResponse[ApiArm]](response)
     } yield {
-      reply
+      GetListReply.EntityList(reply.items.map(_.toDomain), reply.meta.itemsCount)
     }
   }
 
@@ -50,11 +40,9 @@ class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protect
     val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/arm/$armId"))
     for {
       response <- transport.sendRequestGetResponse(requestContext)(request)
-      reply <- apiResponse[ApiArm, GetByIdReply](response) { api =>
-                GetByIdReply.Entity(api.toDomain)
-              }
+      reply    <- apiResponse[ApiArm](response)
     } yield {
-      reply
+      GetByIdReply.Entity(reply.toDomain)
     }
   }
 
@@ -63,11 +51,9 @@ class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protect
       entity <- Marshal(ApiArm.fromDomain(draftArm)).to[RequestEntity]
       request = HttpRequest(HttpMethods.POST, endpointUri(baseUri, "/v1/arm")).withEntity(entity)
       response <- transport.sendRequestGetResponse(requestContext)(request)
-      reply <- apiResponse[ApiArm, CreateReply](response) { api =>
-                CreateReply.Created(api.toDomain)
-              }
+      reply    <- apiResponse[ApiArm](response)
     } yield {
-      reply
+      CreateReply.Created(reply.toDomain)
     }
   }
 
@@ -76,11 +62,9 @@ class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protect
     val request = HttpRequest(HttpMethods.PATCH, endpointUri(baseUri, s"/v1/arm/$id"))
     for {
       response <- transport.sendRequestGetResponse(requestContext)(request)
-      reply <- apiResponse[ApiArm, UpdateReply](response) { api =>
-                UpdateReply.Updated(api.toDomain)
-              }
+      reply    <- apiResponse[ApiArm](response)
     } yield {
-      reply
+      UpdateReply.Updated(reply.toDomain)
     }
   }
 
@@ -88,11 +72,9 @@ class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protect
     val request = HttpRequest(HttpMethods.DELETE, endpointUri(baseUri, s"/v1/arm/$id"))
     for {
       response <- transport.sendRequestGetResponse(requestContext)(request)
-      reply <- apiResponse[ApiArm, DeleteReply](response) { _ =>
-                DeleteReply.Deleted
-              }
+      reply    <- apiResponse[ApiArm](response)
     } yield {
-      reply
+      DeleteReply.Deleted
     }
   }