1 files changed, 10 insertions, 75 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala
index e23fc7a..6f95fdb 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala
@@ -1,104 +1,39 @@
 package xyz.driver.pdsuidomain.services
 
-import java.time.LocalDateTime
-
 import xyz.driver.core.rest.AuthorizedServiceRequestContext
 import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuicommon.db._
 import xyz.driver.pdsuicommon.domain._
-import xyz.driver.pdsuicommon.error.DomainError
-import xyz.driver.pdsuicommon.logging._
+import xyz.driver.pdsuidomain.ListResponse
 import xyz.driver.pdsuidomain.entities._
 
 import scala.concurrent.Future
 
-object PatientService {
-
-  trait DefaultNotFoundError {
-    def userMessage: String = "Patient not found"
-  }
-
-  trait DefaultAccessDeniedError {
-    def userMessage: String = "Access denied"
-  }
-
-  sealed trait GetListReply
-  object GetListReply {
-    final case class EntityList(xs: Seq[Patient], totalFound: Int, lastUpdate: Option[LocalDateTime])
-        extends GetListReply
-
-    case object AuthorizationError
-        extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-  }
-
-  sealed trait GetByIdReply
-  object GetByIdReply {
-    final case class Entity(x: Patient) extends GetByIdReply
-
-    type Error = GetByIdReply with DomainError
-
-    case object NotFoundError extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError
-
-    case object AuthorizationError
-        extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-
-    final case class CommonError(userMessage: String)(
-            implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo])
-        extends GetByIdReply with DomainError
-
-    implicit def toPhiString(reply: GetByIdReply): PhiString = reply match {
-      case x: DomainError => phi"GetByIdReply.Error($x)"
-      case Entity(x)      => phi"GetByIdReply.Entity($x)"
-    }
-  }
-
-  sealed trait UpdateReply
-  object UpdateReply {
-    type Error = UpdateReply with DomainError
-
-    final case class Updated(updated: Patient) extends UpdateReply
-
-    case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError
-
-    case object AuthorizationError
-        extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError
-
-    final case class CommonError(userMessage: String) extends UpdateReply with DomainError
-
-    implicit def toPhiString(reply: UpdateReply): PhiString = reply match {
-      case Updated(x) => phi"Updated($x)"
-      case x: Error   => DomainError.toPhiString(x)
-    }
-  }
-}
-
 trait PatientService {
 
-  import PatientService._
-
   def getById(id: UuidId[Patient])(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetByIdReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Option[Patient]]
 
   def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
              sorting: Option[Sorting] = None,
-             pagination: Option[Pagination] = None)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetListReply]
+             pagination: Pagination = Pagination.Default)(
+    implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[ListResponse[Patient]]
 
   def unassign(origPatient: Patient)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient]
 
   def start(origPatient: Patient)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient]
 
   def submit(origPatient: Patient)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient]
 
   def restart(origPatient: Patient)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient]
 
   def flag(origPatient: Patient)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient]
 
   def resolve(origPatient: Patient)(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient]
 }