Merge branch 'master' into TRIAL-193v0.15.1.1

1 files changed, 4 insertions, 46 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala
index 1ddf401..a999bf9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala
@@ -5,62 +5,20 @@ import xyz.driver.entities.labels.Label
 import xyz.driver.entities.users.AuthUserInfo
 import xyz.driver.pdsuicommon.db._
 import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
-import xyz.driver.pdsuicommon.error.DomainError
+import xyz.driver.pdsuidomain.ListResponse
 import xyz.driver.pdsuidomain.entities._
 
 import scala.concurrent.Future
 
-object PatientLabelEvidenceService {
-
-  trait DefaultAccessDeniedError {
-    def userMessage: String = "Access denied"
-  }
-
-  trait DefaultPatientNotFoundError {
-    def userMessage: String = "Patient not found"
-  }
-
-  sealed trait GetByIdReply
-  object GetByIdReply {
-    final case class Entity(x: PatientLabelEvidenceView) extends GetByIdReply
-
-    type Error = GetByIdReply with DomainError
-
-    final case class NotFoundError(userMessage: String) extends GetByIdReply with DomainError.NotFoundError
-
-    final case class CommonError(userMessage: String) extends GetByIdReply with DomainError
-
-    case object AuthorizationError
-        extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-  }
-
-  sealed trait GetListReply
-  object GetListReply {
-    final case class EntityList(xs: Seq[PatientLabelEvidenceView], totalFound: Int) extends GetListReply
-
-    type Error = GetListReply with DomainError
-
-    case object PatientNotFoundError
-        extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError
-
-    case object AuthorizationError
-        extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
-
-    final case class CommonError(userMessage: String) extends GetListReply with DomainError
-  }
-}
-
 trait PatientLabelEvidenceService {
 
-  import PatientLabelEvidenceService._
-
   def getById(patientId: UuidId[Patient], labelId: LongId[Label], id: LongId[PatientLabelEvidence])(
-          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetByIdReply]
+          implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Option[PatientLabelEvidenceView]]
 
   def getAll(patientId: UuidId[Patient],
              labelId: LongId[Label],
              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[PatientLabelEvidenceView]]
 }