diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services')
20 files changed, 287 insertions, 420 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/ArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/ArmService.scala index bc59f0c..43e46ed 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/ArmService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/ArmService.scala @@ -1,6 +1,5 @@ package xyz.driver.pdsuidomain.services - import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext import xyz.driver.pdsuicommon.db._ import xyz.driver.pdsuicommon.domain.LongId @@ -27,14 +26,13 @@ object ArmService { 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 } @@ -45,7 +43,7 @@ object ArmService { case class EntityList(xs: Seq[Arm], totalFound: Int) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } @@ -56,14 +54,12 @@ object ArmService { type Error = UpdateReply with DomainError - 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 case class AlreadyExistsError(x: Arm) extends UpdateReply with DomainError { val userMessage = s"The arm with such name of trial already exists." @@ -71,7 +67,7 @@ object ArmService { 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) } } @@ -82,10 +78,9 @@ object ArmService { type Error = CreateReply with DomainError case object AuthorizationError - extends CreateReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends CreateReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case class CommonError(userMessage: String) - extends CreateReply with DomainError + case class CommonError(userMessage: String) extends CreateReply with DomainError case class AlreadyExistsError(x: Arm) extends CreateReply with DomainError { val userMessage = s"The arm with this name of trial already exists." @@ -93,7 +88,7 @@ object ArmService { implicit def toPhiString(reply: CreateReply): PhiString = reply match { case Created(x) => phi"Created($x)" - case x: Error => DomainError.toPhiString(x) + case x: Error => DomainError.toPhiString(x) } } @@ -103,14 +98,12 @@ object ArmService { type Error = DeleteReply with DomainError - case object NotFoundError - extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case class CommonError(userMessage: String) - extends DeleteReply with DomainError + case class CommonError(userMessage: String) extends DeleteReply with DomainError } } @@ -120,8 +113,8 @@ trait ArmService { 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 getById(armId: LongId[Arm])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala index e3d806c..ffb7843 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala @@ -21,9 +21,7 @@ object CriterionService { def userMessage: String = "Access denied" } - case class RichCriterion(criterion: Criterion, - armIds: Seq[LongId[Arm]], - labels: Seq[CriterionLabel]) + case class RichCriterion(criterion: Criterion, armIds: Seq[LongId[Arm]], labels: Seq[CriterionLabel]) object RichCriterion { implicit def toPhiString(x: RichCriterion): PhiString = { import x._ @@ -38,7 +36,7 @@ object CriterionService { case class Created(x: RichCriterion) extends CreateReply case object AuthorizationError - extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError case class CommonError(userMessage: String) extends CreateReply with DomainError } @@ -49,29 +47,27 @@ object CriterionService { 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)" } } sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[RichCriterion], - totalFound: Int, - lastUpdate: Option[LocalDateTime]) extends GetListReply + case class EntityList(xs: Seq[RichCriterion], 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 UpdateReply @@ -80,14 +76,12 @@ object CriterionService { case class Updated(updated: RichCriterion) 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 } sealed trait DeleteReply @@ -96,14 +90,12 @@ object CriterionService { type Error = DeleteReply with DomainError - case object NotFoundError - extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case class CommonError(userMessage: String) - extends DeleteReply with DomainError + case class CommonError(userMessage: String) extends DeleteReply with DomainError } } @@ -111,21 +103,18 @@ trait CriterionService { import CriterionService._ - def create(draftRichCriterion: RichCriterion) - (implicit requestContext: AuthenticatedRequestContext): Future[CreateReply] + def create(draftRichCriterion: RichCriterion)( + implicit requestContext: AuthenticatedRequestContext): Future[CreateReply] - def getById(id: LongId[Criterion]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(id: LongId[Criterion])(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 update(origRichCriterion: RichCriterion, - draftRichCriterion: RichCriterion) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origRichCriterion: RichCriterion, draftRichCriterion: RichCriterion)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def delete(id: LongId[Criterion]) - (implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply] + def delete(id: LongId[Criterion])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/DocumentService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/DocumentService.scala index cd242c9..ffa252c 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/DocumentService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/DocumentService.scala @@ -27,31 +27,28 @@ object DocumentService { 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)" } } sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[Document], - totalFound: Int, - lastUpdate: Option[LocalDateTime]) extends GetListReply + case class EntityList(xs: Seq[Document], totalFound: Int, lastUpdate: Option[LocalDateTime]) extends GetListReply type Error = GetListReply with DomainError case object AuthorizationError - extends GetListReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends GetListReply with DefaultAccessDeniedError with DomainError.AuthorizationError case class CommonError(userMessage: String) extends GetListReply with DomainError } @@ -62,14 +59,12 @@ object DocumentService { type Error = CreateReply with DomainError - case object NotFoundError - extends CreateReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends CreateReply with DefaultNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends CreateReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends CreateReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case class CommonError(userMessage: String) - extends CreateReply with DomainError + case class CommonError(userMessage: String) extends CreateReply with DomainError } sealed trait UpdateReply @@ -78,36 +73,31 @@ object DocumentService { type Error = UpdateReply with DomainError - 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) } } - sealed trait DeleteReply object DeleteReply { case object Deleted extends DeleteReply type Error = DeleteReply with DomainError - case object NotFoundError - extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case class CommonError(userMessage: String) - extends DeleteReply with DomainError + case class CommonError(userMessage: String) extends DeleteReply with DomainError } } @@ -116,42 +106,32 @@ trait DocumentService { import DocumentService._ - - def getById(id: LongId[Document]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(id: LongId[Document])(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 create(draftDocument: Document)(implicit requestContext: AuthenticatedRequestContext): Future[CreateReply] // Update operations are validated in internal.*Command - def update(orig: Document, draft: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(orig: Document, draft: Document)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def delete(id: LongId[Document]) - (implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply] + def delete(id: LongId[Document])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply] - def start(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def start(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def submit(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def submit(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def restart(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def restart(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def flag(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def flag(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def resolve(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def resolve(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def unassign(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def unassign(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def archive(orig: Document) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def archive(orig: Document)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/DocumentTypeService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/DocumentTypeService.scala index 30fd348..1268cbf 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/DocumentTypeService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/DocumentTypeService.scala @@ -12,8 +12,7 @@ object DocumentTypeService { sealed trait GetListReply object GetListReply { case class EntityList(xs: Seq[DocumentType], totalFound: Int) extends GetListReply - case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError { + case object AuthorizationError extends GetListReply with DomainError.AuthorizationError { def userMessage: String = "Access denied" } } @@ -21,6 +20,6 @@ object DocumentTypeService { trait DocumentTypeService { - def getAll(sorting: Option[Sorting] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + def getAll(sorting: Option[Sorting] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala index 6cde411..93cb3ea 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala @@ -19,8 +19,7 @@ object ExtractedDataService { def userMessage: String = "Access denied" } - case class RichExtractedData(extractedData: ExtractedData, - labels: List[ExtractedDataLabel]) + case class RichExtractedData(extractedData: ExtractedData, labels: List[ExtractedDataLabel]) object RichExtractedData { implicit def toPhiString(x: RichExtractedData): PhiString = { @@ -35,10 +34,9 @@ object ExtractedDataService { case class Entity(x: RichExtractedData) extends GetByIdReply case object AuthorizationError - extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case object NotFoundError - extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends GetByIdReply with DomainError } @@ -48,7 +46,7 @@ object ExtractedDataService { case class EntityList(xs: Seq[RichExtractedData], totalFound: Int) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } sealed trait CreateReply @@ -57,7 +55,7 @@ object ExtractedDataService { case class Created(x: RichExtractedData) extends CreateReply case object AuthorizationError - extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError case class CommonError(userMessage: String) extends CreateReply with DomainError } @@ -68,13 +66,11 @@ object ExtractedDataService { case class Updated(updated: RichExtractedData) extends UpdateReply case object AuthorizationError - extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case object NotFoundError - extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError - case class CommonError(userMessage: String) - extends UpdateReply with DomainError + case class CommonError(userMessage: String) extends UpdateReply with DomainError } sealed trait DeleteReply @@ -83,10 +79,9 @@ object ExtractedDataService { case object Deleted extends DeleteReply case object AuthorizationError - extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError + extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError - case object NotFoundError - extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends DeleteReply with DomainError } @@ -96,21 +91,18 @@ trait ExtractedDataService { import ExtractedDataService._ - def getById(id: LongId[ExtractedData]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(id: LongId[ExtractedData])(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 create(draftRichExtractedData: RichExtractedData) - (implicit requestContext: AuthenticatedRequestContext): Future[CreateReply] + def create(draftRichExtractedData: RichExtractedData)( + implicit requestContext: AuthenticatedRequestContext): Future[CreateReply] - def update(origRichExtractedData: RichExtractedData, - draftRichExtractedData: RichExtractedData) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origRichExtractedData: RichExtractedData, draftRichExtractedData: RichExtractedData)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def delete(id: LongId[ExtractedData]) - (implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply] + def delete(id: LongId[ExtractedData])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/HypothesisService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/HypothesisService.scala index 64ce3ea..7fccf7f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/HypothesisService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/HypothesisService.scala @@ -12,8 +12,7 @@ object HypothesisService { object GetListReply { case class EntityList(xs: Seq[Hypothesis], totalFound: Int) extends GetListReply - case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError { + case object AuthorizationError extends GetListReply with DomainError.AuthorizationError { def userMessage: String = "Access denied" } } @@ -23,6 +22,6 @@ trait HypothesisService { import HypothesisService._ - def getAll(sorting: Option[Sorting] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + def getAll(sorting: Option[Sorting] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/InterventionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/InterventionService.scala index d65c9f9..a4b380f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/InterventionService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/InterventionService.scala @@ -21,11 +21,10 @@ object InterventionService { sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[InterventionWithArms], totalFound: Int) - extends GetListReply + case class EntityList(xs: Seq[InterventionWithArms], totalFound: Int) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } sealed trait GetByIdReply @@ -34,18 +33,17 @@ object InterventionService { 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)" } } @@ -55,14 +53,12 @@ object InterventionService { case class Updated(updated: InterventionWithArms) 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 } } @@ -73,13 +69,11 @@ trait InterventionService { 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 getById(id: LongId[Intervention]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(id: LongId[Intervention])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def update(origIntervention: InterventionWithArms, - draftIntervention: InterventionWithArms) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origIntervention: InterventionWithArms, draftIntervention: InterventionWithArms)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/InterventionTypeService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/InterventionTypeService.scala index db7473e..5805655 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/InterventionTypeService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/InterventionTypeService.scala @@ -12,8 +12,7 @@ object InterventionTypeService { object GetListReply { case class EntityList(xs: Seq[InterventionType], totalFound: Int) extends GetListReply - case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError { + case object AuthorizationError extends GetListReply with DomainError.AuthorizationError { def userMessage: String = "Access denied" } } @@ -23,6 +22,6 @@ trait InterventionTypeService { import InterventionTypeService._ - def getAll(sorting: Option[Sorting] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + def getAll(sorting: Option[Sorting] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala index 5ee69a2..8824c41 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala @@ -13,8 +13,7 @@ object KeywordService { object GetListReply { case class EntityList(xs: Seq[KeywordWithLabels], totalFound: Int) extends GetListReply - case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError { + case object AuthorizationError extends GetListReply with DomainError.AuthorizationError { def userMessage: String = "Access denied" } } @@ -24,6 +23,6 @@ trait KeywordService { import KeywordService._ - def getAll(sorting: Option[Sorting] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + def getAll(sorting: Option[Sorting] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/MedicalRecordService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/MedicalRecordService.scala index 7b5aa66..f077d82 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/MedicalRecordService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/MedicalRecordService.scala @@ -29,14 +29,12 @@ object MedicalRecordService { type Error = GetByIdReply with DomainError - case object NotFoundError extends GetByIdReply - with DomainError.NotFoundError with DefaultNotFoundError + case object NotFoundError extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError - case class CommonError(userMessage: String) extends GetByIdReply - with DomainError + case class CommonError(userMessage: String) extends GetByIdReply with DomainError - case object AuthorizationError extends GetByIdReply - with DomainError.AuthorizationError with DefaultAccessDeniedError + case object AuthorizationError + extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError } sealed trait GetPdfSourceReply @@ -46,27 +44,24 @@ object MedicalRecordService { case class Entity(x: PdfSource.Channel) extends GetPdfSourceReply case object AuthorizationError - extends GetPdfSourceReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetPdfSourceReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case object NotFoundError - extends GetPdfSourceReply with DomainError.NotFoundError { + case object NotFoundError extends GetPdfSourceReply with DomainError.NotFoundError { def userMessage: String = "Medical record PDF hasn't been found" } - case object RecordNotFoundError - extends GetPdfSourceReply with DomainError.NotFoundError with DefaultNotFoundError + case object RecordNotFoundError extends GetPdfSourceReply with DomainError.NotFoundError with DefaultNotFoundError - case class CommonError(userMessage: String) - extends GetPdfSourceReply with DomainError + case class CommonError(userMessage: String) extends GetPdfSourceReply with DomainError } sealed trait GetListReply object GetListReply { case class EntityList(xs: Seq[MedicalRecord], totalFound: Int, lastUpdate: Option[LocalDateTime]) - extends GetListReply + extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } sealed trait CreateReply @@ -80,14 +75,12 @@ object MedicalRecordService { case class Updated(updated: MedicalRecord) 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 } case class Settings(pdfSourceBucket: String) @@ -97,41 +90,33 @@ trait MedicalRecordService { import MedicalRecordService._ - def getById(recordId: LongId[MedicalRecord]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(recordId: LongId[MedicalRecord])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def getPdfSource(recordId: LongId[MedicalRecord]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetPdfSourceReply] + def getPdfSource(recordId: LongId[MedicalRecord])( + implicit requestContext: AuthenticatedRequestContext): Future[GetPdfSourceReply] 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 create(draft: MedicalRecord): Future[CreateReply] - def update(origRecord: MedicalRecord, - draftRecord: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origRecord: MedicalRecord, draftRecord: MedicalRecord)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def start(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def start(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def submit(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def submit(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def restart(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def restart(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def flag(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def flag(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def resolve(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def resolve(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def unassign(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def unassign(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def archive(orig: MedicalRecord) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def archive(orig: MedicalRecord)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala index ff95ed0..593e2ce 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala @@ -42,16 +42,16 @@ object PatientCriterionService { case class EntityList(xs: Seq[(PatientCriterion, LongId[Label], List[Arm], Boolean)], totalFound: Int, - lastUpdate: Option[LocalDateTime]) extends GetListReply + lastUpdate: Option[LocalDateTime]) + extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object PatientNotFoundError - extends GetListReply with DomainError.NotFoundError with DefaultPatientNotFoundError + extends GetListReply with DomainError.NotFoundError with DefaultPatientNotFoundError - case class CommonError(userMessage: String) - extends GetListReply with DomainError + case class CommonError(userMessage: String) extends GetListReply with DomainError } @@ -59,22 +59,18 @@ object PatientCriterionService { object GetByIdReply { type Error = GetByIdReply with DomainError - case class Entity(x: PatientCriterion, - labelId: LongId[Label], - armList: List[Arm], - criterionIsCompound: Boolean) extends GetByIdReply + case class Entity(x: PatientCriterion, labelId: LongId[Label], armList: List[Arm], criterionIsCompound: Boolean) + extends GetByIdReply case object AuthorizationError - extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case object NotFoundError - extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError + case object NotFoundError extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError case object PatientNotFoundError - extends GetByIdReply with DomainError.NotFoundError with DefaultPatientNotFoundError + extends GetByIdReply with DomainError.NotFoundError with DefaultPatientNotFoundError - case class CommonError(userMessage: String) - extends GetByIdReply with DomainError + case class CommonError(userMessage: String) extends GetByIdReply with DomainError implicit def toPhiString(reply: GetByIdReply): PhiString = reply match { case x: DomainError => phi"GetByIdReply.Error($x)" @@ -91,13 +87,12 @@ object PatientCriterionService { case object Updated extends UpdateReply case object AuthorizationError - extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object PatientNotFoundError - extends UpdateReply with DomainError.NotFoundError with DefaultPatientNotFoundError + extends UpdateReply with DomainError.NotFoundError with DefaultPatientNotFoundError - case class CommonError(userMessage: String) - extends UpdateReply with DomainError + case class CommonError(userMessage: String) extends UpdateReply with DomainError } } @@ -108,19 +103,15 @@ trait PatientCriterionService { def getAll(patientId: UuidId[Patient], 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 getById(patientId: UuidId[Patient], - id: LongId[PatientCriterion]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(patientId: UuidId[Patient], id: LongId[PatientCriterion])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def updateList(patientId: UuidId[Patient], - draftEntities: List[DraftPatientCriterion]) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def updateList(patientId: UuidId[Patient], draftEntities: List[DraftPatientCriterion])( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] - def update(origEntity: PatientCriterion, - draftEntity: PatientCriterion, - patientId: UuidId[Patient]) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origEntity: PatientCriterion, draftEntity: PatientCriterion, patientId: UuidId[Patient])( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientEligibleTrialService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientEligibleTrialService.scala index 64b4b81..d322fdd 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientEligibleTrialService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientEligibleTrialService.scala @@ -23,9 +23,7 @@ object PatientEligibleTrialService { def userMessage: String = "Access denied" } - case class RichPatientEligibleTrial(trial: Trial, - group: PatientTrialArmGroupView, - arms: List[Arm]) + case class RichPatientEligibleTrial(trial: Trial, group: PatientTrialArmGroupView, arms: List[Arm]) object RichPatientEligibleTrial { implicit def toPhiString(x: RichPatientEligibleTrial): PhiString = { phi"RichPatientEligibleTrial(group=${x.group}, trial=${x.trial}, arms=${x.arms})" @@ -34,14 +32,13 @@ object PatientEligibleTrialService { sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[RichPatientEligibleTrial], totalFound: Int) - extends GetListReply + case class EntityList(xs: Seq[RichPatientEligibleTrial], totalFound: Int) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object PatientNotFoundError - extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends GetListReply with DomainError } @@ -52,38 +49,37 @@ object PatientEligibleTrialService { 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 PatientNotFoundError - extends GetByIdReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetByIdReply with DefaultPatientNotFoundError 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) 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)" } } sealed trait GetCriterionListOfGroupReply object GetCriterionListOfGroupReply { case class EntityList(xs: Seq[(PatientCriterion, LongId[Label], List[Arm], Boolean)], totalFound: Int) - extends GetCriterionListOfGroupReply + extends GetCriterionListOfGroupReply type Error = GetCriterionListOfGroupReply with DomainError case object AuthorizationError - extends GetCriterionListOfGroupReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetCriterionListOfGroupReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object NotFoundError - extends GetCriterionListOfGroupReply with DefaultNotFoundError with DomainError.NotFoundError + extends GetCriterionListOfGroupReply with DefaultNotFoundError with DomainError.NotFoundError case object PatientNotFoundError - extends GetCriterionListOfGroupReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetCriterionListOfGroupReply with DefaultPatientNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends GetCriterionListOfGroupReply with DomainError } @@ -94,21 +90,19 @@ object PatientEligibleTrialService { case class Updated(updated: RichPatientEligibleTrial) extends UpdateReply - case object NotFoundError - extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError case object PatientNotFoundError - extends UpdateReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends UpdateReply with DefaultPatientNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError - 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) } } } @@ -120,18 +114,16 @@ trait PatientEligibleTrialService { def getAll(patientId: UuidId[Patient], 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 getById(patientId: UuidId[Patient], - id: LongId[PatientTrialArmGroup]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(patientId: UuidId[Patient], id: LongId[PatientTrialArmGroup])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def getCriterionListByGroupId(patientId: UuidId[Patient], - id: LongId[PatientTrialArmGroup]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetCriterionListOfGroupReply] + def getCriterionListByGroupId(patientId: UuidId[Patient], id: LongId[PatientTrialArmGroup])( + implicit requestContext: AuthenticatedRequestContext): Future[GetCriterionListOfGroupReply] def update(origEligibleTrialWithTrial: RichPatientEligibleTrial, - draftPatientTrialArmGroup: PatientTrialArmGroupView) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + draftPatientTrialArmGroup: PatientTrialArmGroupView)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala index dff595a..39ee2b1 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala @@ -25,14 +25,13 @@ object PatientHypothesisService { sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[PatientHypothesis], totalFound: Int) - extends GetListReply + case class EntityList(xs: Seq[PatientHypothesis], totalFound: Int) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object PatientNotFoundError - extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends GetListReply with DomainError } @@ -43,20 +42,19 @@ object PatientHypothesisService { 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 PatientNotFoundError - extends GetByIdReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetByIdReply with DefaultPatientNotFoundError 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) 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)" } } @@ -66,21 +64,19 @@ object PatientHypothesisService { case class Updated(updated: PatientHypothesis) extends UpdateReply - case object NotFoundError - extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError case object PatientNotFoundError - extends UpdateReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends UpdateReply with DefaultPatientNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError - 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) } } } @@ -92,14 +88,12 @@ trait PatientHypothesisService { def getAll(patientId: UuidId[Patient], 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 getById(patientId: UuidId[Patient], - hypothesisId: UuidId[Hypothesis]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(patientId: UuidId[Patient], hypothesisId: UuidId[Hypothesis])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def update(origPatientHypothesis: PatientHypothesis, - draftPatientHypothesis: PatientHypothesis) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origPatientHypothesis: PatientHypothesis, draftPatientHypothesis: PatientHypothesis)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala index 8e791d4..f6039f0 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelEvidenceService.scala @@ -12,10 +12,7 @@ import scala.concurrent.Future object PatientLabelEvidenceService { - case class Aggregated(evidence: PatientLabelEvidence, - date: LocalDate, - documentType: String, - providerType: String) + case class Aggregated(evidence: PatientLabelEvidence, date: LocalDate, documentType: String, providerType: String) trait DefaultAccessDeniedError { def userMessage: String = "Access denied" @@ -27,28 +24,24 @@ object PatientLabelEvidenceService { type Error = GetByIdReply with DomainError - case class NotFoundError(userMessage: String) extends GetByIdReply - with DomainError.NotFoundError + case class NotFoundError(userMessage: String) extends GetByIdReply with DomainError.NotFoundError - case class CommonError(userMessage: String) extends GetByIdReply - with DomainError + case class CommonError(userMessage: String) extends GetByIdReply with DomainError - case object AuthorizationError extends GetByIdReply - with DomainError.AuthorizationError with DefaultAccessDeniedError + case object AuthorizationError + extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError } sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[Aggregated], totalFound: Int) - extends GetListReply + case class EntityList(xs: Seq[Aggregated], totalFound: Int) extends GetListReply type Error = GetListReply with DomainError case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case class CommonError(userMessage: String) extends GetListReply - with DomainError + case class CommonError(userMessage: String) extends GetListReply with DomainError } } @@ -56,15 +49,13 @@ trait PatientLabelEvidenceService { import PatientLabelEvidenceService._ - def getById(patientId: UuidId[Patient], - labelId: LongId[Label], - id: LongId[PatientLabelEvidence]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(patientId: UuidId[Patient], labelId: LongId[Label], id: LongId[PatientLabelEvidence])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] def getAll(patientId: UuidId[Patient], labelId: LongId[Label], 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] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelService.scala index 1d488ad..5fa2a4d 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientLabelService.scala @@ -25,28 +25,26 @@ object PatientLabelService { sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[(PatientLabel, Boolean)], totalFound: Int) - extends GetListReply + case class EntityList(xs: Seq[(PatientLabel, Boolean)], totalFound: Int) extends GetListReply case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object PatientNotFoundError - extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetListReply with DefaultPatientNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends GetListReply with DomainError } sealed trait GetDefiningCriteriaListReply object GetDefiningCriteriaListReply { - case class EntityList(xs: Seq[PatientLabel], totalFound: Int) - extends GetDefiningCriteriaListReply + case class EntityList(xs: Seq[PatientLabel], totalFound: Int) extends GetDefiningCriteriaListReply case object AuthorizationError - extends GetDefiningCriteriaListReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetDefiningCriteriaListReply with DomainError.AuthorizationError with DefaultAccessDeniedError case object PatientNotFoundError - extends GetDefiningCriteriaListReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetDefiningCriteriaListReply with DefaultPatientNotFoundError with DomainError.NotFoundError case class CommonError(userMessage: String) extends GetDefiningCriteriaListReply with DomainError } @@ -57,20 +55,19 @@ object PatientLabelService { type Error = GetByLabelIdReply with DomainError - case object NotFoundError - extends GetByLabelIdReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends GetByLabelIdReply with DefaultNotFoundError with DomainError.NotFoundError case object PatientNotFoundError - extends GetByLabelIdReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends GetByLabelIdReply with DefaultPatientNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends GetByLabelIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetByLabelIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError case class CommonError(userMessage: String) extends GetByLabelIdReply with DomainError implicit def toPhiString(reply: GetByLabelIdReply): PhiString = reply match { case x: DomainError => phi"GetByIdReply.Error($x)" - case Entity(x, y) => phi"GetByIdReply.Entity($x, $y)" + case Entity(x, y) => phi"GetByIdReply.Entity($x, $y)" } } @@ -80,21 +77,19 @@ object PatientLabelService { case class Updated(updated: PatientLabel, isVerified: Boolean) extends UpdateReply - case object NotFoundError - extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError + case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError case object PatientNotFoundError - extends UpdateReply with DefaultPatientNotFoundError with DomainError.NotFoundError + extends UpdateReply with DefaultPatientNotFoundError with DomainError.NotFoundError case object AuthorizationError - extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends UpdateReply with DomainError.AuthorizationError with DefaultAccessDeniedError - 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, y) => phi"Updated($x, $y)" - case x: Error => DomainError.toPhiString(x) + case x: Error => DomainError.toPhiString(x) } } } @@ -106,19 +101,17 @@ trait PatientLabelService { def getAll(patientId: UuidId[Patient], 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 getDefiningCriteriaList(patientId: UuidId[Patient], hypothesisId: UuidId[Hypothesis], - pagination: Option[Pagination] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetDefiningCriteriaListReply] + pagination: Option[Pagination] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetDefiningCriteriaListReply] - def getByLabelIdOfPatient(patientId: UuidId[Patient], - labelId: LongId[Label]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByLabelIdReply] + def getByLabelIdOfPatient(patientId: UuidId[Patient], labelId: LongId[Label])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByLabelIdReply] - def update(origPatientLabel: PatientLabel, - draftPatientLabel: PatientLabel) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origPatientLabel: PatientLabel, draftPatientLabel: PatientLabel)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] } 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] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/ProviderTypeService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/ProviderTypeService.scala index 49901a4..ef48aa0 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/ProviderTypeService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/ProviderTypeService.scala @@ -11,8 +11,7 @@ object ProviderTypeService { sealed trait GetListReply object GetListReply { case class EntityList(xs: Seq[ProviderType], totalFound: Int) extends GetListReply - case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError { + case object AuthorizationError extends GetListReply with DomainError.AuthorizationError { def userMessage: String = "Access denied" } } @@ -22,6 +21,6 @@ trait ProviderTypeService { import ProviderTypeService._ - def getAll(sorting: Option[Sorting] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + def getAll(sorting: Option[Sorting] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/ScrapedTrialsService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/ScrapedTrialsService.scala index 4417a54..b595584 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/ScrapedTrialsService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/ScrapedTrialsService.scala @@ -25,8 +25,7 @@ object ScrapedTrialsService { sealed trait GetAllRawTrialsExceptReply object GetAllRawTrialsExceptReply { - case class MultipleRawTrials(rawTrials: Seq[ScrapedTrial]) - extends GetAllRawTrialsExceptReply + case class MultipleRawTrials(rawTrials: Seq[ScrapedTrial]) extends GetAllRawTrialsExceptReply } sealed trait GetHtmlForReply diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/StudyDesignService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/StudyDesignService.scala index d086c5f..a1ce613 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/StudyDesignService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/StudyDesignService.scala @@ -12,8 +12,7 @@ object StudyDesignService { object GetListReply { case class EntityList(xs: Seq[StudyDesign], totalFound: Int) extends GetListReply - case object AuthorizationError - extends GetListReply with DomainError.AuthorizationError { + case object AuthorizationError extends GetListReply with DomainError.AuthorizationError { def userMessage: String = "Access denied" } } @@ -23,6 +22,6 @@ trait StudyDesignService { import StudyDesignService._ - def getAll(sorting: Option[Sorting] = None) - (implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + def getAll(sorting: Option[Sorting] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala index 4af4449..47f76f2 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/TrialService.scala @@ -1,6 +1,5 @@ package xyz.driver.pdsuidomain.services - import java.time.LocalDateTime import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext @@ -25,11 +24,10 @@ object TrialService { sealed trait GetListReply object GetListReply { - case class EntityList(xs: Seq[Trial], totalFound: Int, lastUpdate: Option[LocalDateTime]) - extends GetListReply + case class EntityList(xs: Seq[Trial], 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 @@ -38,18 +36,17 @@ object TrialService { 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)" } } @@ -60,18 +57,15 @@ object TrialService { case class Entity(x: PdfSource) extends GetPdfSourceReply case object AuthorizationError - extends GetPdfSourceReply with DomainError.AuthorizationError with DefaultAccessDeniedError + extends GetPdfSourceReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case object NotFoundError - extends GetPdfSourceReply with DomainError.NotFoundError { + case object NotFoundError extends GetPdfSourceReply with DomainError.NotFoundError { def userMessage: String = "Trial's PDF hasn't been found" } - case object TrialNotFoundError - extends GetPdfSourceReply with DomainError.NotFoundError with DefaultNotFoundError + case object TrialNotFoundError extends GetPdfSourceReply with DomainError.NotFoundError with DefaultNotFoundError - case class CommonError(userMessage: String) - extends GetPdfSourceReply with DomainError + case class CommonError(userMessage: String) extends GetPdfSourceReply with DomainError } sealed trait UpdateReply @@ -80,18 +74,16 @@ object TrialService { case class Updated(updated: Trial) 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) } } } @@ -100,19 +92,18 @@ trait TrialService { import TrialService._ - def getById(id: StringId[Trial]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getById(id: StringId[Trial])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def getPdfSource(trialId: StringId[Trial]) - (implicit requestContext: AuthenticatedRequestContext): Future[GetPdfSourceReply] + def getPdfSource(trialId: StringId[Trial])( + implicit requestContext: AuthenticatedRequestContext): Future[GetPdfSourceReply] 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 update(origTrial: Trial, draftTrial: Trial) - (implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] + def update(origTrial: Trial, draftTrial: Trial)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] def start(origTrial: Trial)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] |