From a997aa6539d1f0af4ab4fc395ff2033335da312a Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 30 Jun 2017 12:29:54 -0700 Subject: Latest PDS UI utils --- .../pdsuidomain/services/PatientService.scala | 49 +++++++++------------- 1 file changed, 19 insertions(+), 30 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala index 3f8b606..4619011 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala @@ -23,11 +23,10 @@ object PatientService { sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[Patient], totalFound: Int, lastUpdate: Option[LocalDateTime]) - extends GetListReply + case class EntityList(xs: Seq[Patient], totalFound: Int, lastUpdate: Option[LocalDateTime]) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } sealed trait GetByIdReply @@ -36,18 +35,17 @@ object PatientService { type Error = GetByIdReply with DomainError - case object NotFoundError - extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError case class CommonError(userMessage: String)(implicit requestContext: AuthenticatedRequestContext) - extends GetByIdReply with DomainError + 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)" + case Entity(x) => phi"GetByIdReply.Entity($x)" } } @@ -57,18 +55,16 @@ object PatientService { case class Updated(updated: Patient) extends UpdateReply - case object NotFoundError - extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case class CommonError(userMessage: String) - extends UpdateReply with DomainError + 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) + case x: Error => DomainError.toPhiString(x) } } } @@ -77,29 +73,22 @@ trait PatientService { import PatientService._ - def getById(id: UuidId[Patient]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(id: UuidId[Patient])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty, sorting: Option[Sorting] = None, - pagination: Option[Pagination] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + pagination: Option[Pagination] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] - def unassign(origPatient: Patient) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def unassign(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def start(origPatient: Patient) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def start(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def submit(origPatient: Patient) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def submit(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def restart(origPatient: Patient) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def restart(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def flag(origPatient: Patient) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def flag(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def resolve(origPatient: Patient) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def resolve(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } -- cgit v1.2.3