diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain')
62 files changed, 559 insertions, 631 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala index 40e84c9..87c5fd9 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/ScrapedTrial.scala @@ -51,9 +51,7 @@ object ScrapedIntervention { implicit def toPhiString(x: ScrapedIntervention): PhiString = phi"ScrapedIntervention(${Unsafe(x.name)})" } -final case class ScrapedArm(name: String, - kind: Option[String], - interventions: Set[ScrapedIntervention]) +final case class ScrapedArm(name: String, kind: Option[String], interventions: Set[ScrapedIntervention]) object ScrapedArm { diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/arm/ApiArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/arm/ApiArm.scala index 509ea35..2185e3a 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/arm/ApiArm.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/arm/ApiArm.scala @@ -12,7 +12,7 @@ object ApiArm { (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] and (JsPath \ "trialId").format[String] - ) (ApiArm.apply, unlift(ApiArm.unapply)) + )(ApiArm.apply, unlift(ApiArm.unapply)) def fromDomain(arm: Arm): ApiArm = ApiArm( id = arm.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/category/ApiCategory.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/category/ApiCategory.scala index fabdaa2..f1e15f3 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/category/ApiCategory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/category/ApiCategory.scala @@ -13,7 +13,7 @@ object ApiCategory { (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] and (JsPath \ "labels").format[List[ApiLabel]] - ) (ApiCategory.apply, unlift(ApiCategory.unapply)) + )(ApiCategory.apply, unlift(ApiCategory.unapply)) def fromDomain(categoryWithLabels: CategoryWithLabels) = ApiCategory( id = categoryWithLabels.category.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala index 0f3b76e..1e7114a 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala @@ -26,7 +26,7 @@ object ApiCriterion { (JsPath \ "isCompound").format[Boolean] and (JsPath \ "labels").format(seqJsonFormat[ApiCriterionLabel]) and (JsPath \ "trialId").format[String] - ) (ApiCriterion.apply, unlift(ApiCriterion.unapply)) + )(ApiCriterion.apply, unlift(ApiCriterion.unapply)) def fromDomain(richCriterion: RichCriterion) = ApiCriterion( id = richCriterion.criterion.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala index 85c91d5..604a98b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala @@ -37,5 +37,5 @@ object ApiNewCriterion { (JsPath \ "text").formatNullable[String] and (JsPath \ "labels").format(seqJsonFormat[ApiCriterionLabel]) and (JsPath \ "trialId").format[String] - ) (ApiNewCriterion.apply, unlift(ApiNewCriterion.unapply)) + )(ApiNewCriterion.apply, unlift(ApiNewCriterion.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala index c73c3ef..2bcda56 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala @@ -34,15 +34,19 @@ final case class ApiUpdateCriterion(meta: Tristate[String], object ApiUpdateCriterion { private val reads: Reads[ApiUpdateCriterion] = ( - (JsPath \ "meta").readTristate(Reads { x => JsSuccess(Json.stringify(x)) }).map { - case Tristate.Present("{}") => Tristate.Absent - case x => x - } and + (JsPath \ "meta") + .readTristate(Reads { x => + JsSuccess(Json.stringify(x)) + }) + .map { + case Tristate.Present("{}") => Tristate.Absent + case x => x + } and (JsPath \ "arms").readTristate(seqJsonFormat[Long]) and (JsPath \ "text").readNullable[String] and (JsPath \ "isCompound").readNullable[Boolean] and (JsPath \ "labels").readTristate(seqJsonFormat[ApiCriterionLabel]) - ) (ApiUpdateCriterion.apply _) + )(ApiUpdateCriterion.apply _) private val writes: Writes[ApiUpdateCriterion] = ( (JsPath \ "meta").writeTristate(Writes[String](Json.parse)) and @@ -50,7 +54,7 @@ object ApiUpdateCriterion { (JsPath \ "text").writeNullable[String] and (JsPath \ "isCompound").writeNullable[Boolean] and (JsPath \ "labels").writeTristate(seqJsonFormat[ApiCriterionLabel]) - ) (unlift(ApiUpdateCriterion.unapply)) + )(unlift(ApiUpdateCriterion.unapply)) implicit val format: Format[ApiUpdateCriterion] = Format(reads, writes) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala index be9c65b..0fd96b3 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala @@ -28,7 +28,7 @@ object ApiDocument { private val statusFormat = Format( Reads.StringReads.filter(ValidationError("unknown status")) { case x if DocumentUtils.statusFromString.isDefinedAt(x) => true - case _ => false + case _ => false }, Writes.StringWrites ) @@ -47,8 +47,10 @@ object ApiDocument { (JsPath \ "previousStatus").formatNullable(statusFormat) and (JsPath \ "assignee").formatNullable[Long] and (JsPath \ "previousAssignee").formatNullable[Long] and - (JsPath \ "meta").formatNullable(Format(Reads { x => JsSuccess(Json.stringify(x)) }, Writes[String](Json.parse))) - ) (ApiDocument.apply, unlift(ApiDocument.unapply)) + (JsPath \ "meta").formatNullable(Format(Reads { x => + JsSuccess(Json.stringify(x)) + }, Writes[String](Json.parse))) + )(ApiDocument.apply, unlift(ApiDocument.unapply)) def fromDomain(document: Document): ApiDocument = { ApiDocument( diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala index e00da20..8b11b91 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala @@ -11,7 +11,7 @@ object ApiDocumentType { implicit val format: Format[ApiDocumentType] = ( (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] - ) (ApiDocumentType.apply, unlift(ApiDocumentType.unapply)) + )(ApiDocumentType.apply, unlift(ApiDocumentType.unapply)) def fromDomain(documentType: DocumentType) = ApiDocumentType( id = documentType.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala index 7b370ba..eb0ac46 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala @@ -11,7 +11,7 @@ object ApiProviderType { implicit val format: Format[ApiProviderType] = ( (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] - ) (ApiProviderType.apply, unlift(ApiProviderType.unapply)) + )(ApiProviderType.apply, unlift(ApiProviderType.unapply)) def fromDomain(providerType: ProviderType) = ApiProviderType( id = providerType.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/DocumentUtils.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/DocumentUtils.scala index 87e449f..24e388e 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/DocumentUtils.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/DocumentUtils.scala @@ -5,20 +5,20 @@ import xyz.driver.pdsuidomain.entities.Document.Status object DocumentUtils { val statusFromString: PartialFunction[String, Status] = { - case "New" => Status.New + case "New" => Status.New case "Organized" => Status.Organized case "Extracted" => Status.Extracted - case "Done" => Status.Done - case "Flagged" => Status.Flagged - case "Archived" => Status.Archived + case "Done" => Status.Done + case "Flagged" => Status.Flagged + case "Archived" => Status.Archived } def statusToString(x: Status): String = x match { - case Status.New => "New" + case Status.New => "New" case Status.Organized => "Organized" case Status.Extracted => "Extracted" - case Status.Done => "Done" - case Status.Flagged => "Flagged" - case Status.Archived => "Archived" + case Status.Done => "Done" + case Status.Flagged => "Flagged" + case Status.Archived => "Archived" } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala index dad7a1e..ec4185f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiExtractedData.scala @@ -26,12 +26,17 @@ object ApiExtractedData { (JsPath \ "keywordId").formatNullable[Long] and (JsPath \ "evidence").formatNullable[String] and (JsPath \ "meta").formatNullable[String] and - (JsPath \ "labels").formatNullable[List[ApiExtractedDataLabel]](Format( - Reads.of[List[ApiExtractedDataLabel]].filter(ValidationError("empty labels"))({ - case x if x.nonEmpty => true - case _ => false - }), Writes.of[List[ApiExtractedDataLabel]])) - ) (ApiExtractedData.apply, unlift(ApiExtractedData.unapply)) + (JsPath \ "labels").formatNullable[List[ApiExtractedDataLabel]]( + Format( + Reads + .of[List[ApiExtractedDataLabel]] + .filter(ValidationError("empty labels"))({ + case x if x.nonEmpty => true + case _ => false + }), + Writes.of[List[ApiExtractedDataLabel]] + )) + )(ApiExtractedData.apply, unlift(ApiExtractedData.unapply)) def fromDomain(extractedDataWithLabels: RichExtractedData) = ApiExtractedData( id = extractedDataWithLabels.extractedData.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala index 69b5627..cfd55fd 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/extracteddata/ApiPartialExtractedData.scala @@ -66,7 +66,7 @@ object ApiPartialExtractedData { (JsPath \ "evidence").readTristate[String] and (JsPath \ "meta").readTristate[String] and (JsPath \ "labels").readTristate[List[ApiExtractedDataLabel]] - ) (ApiPartialExtractedData.apply _) + )(ApiPartialExtractedData.apply _) private val writes: Writes[ApiPartialExtractedData] = ( (JsPath \ "documentId").writeNullable[Long] and @@ -74,7 +74,7 @@ object ApiPartialExtractedData { (JsPath \ "evidence").writeTristate[String] and (JsPath \ "meta").writeTristate[String] and (JsPath \ "labels").writeTristate[List[ApiExtractedDataLabel]] - ) (unlift(ApiPartialExtractedData.unapply)) + )(unlift(ApiPartialExtractedData.unapply)) implicit val format: Format[ApiPartialExtractedData] = Format(reads, writes) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/hypothesis/ApiHypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/hypothesis/ApiHypothesis.scala index 0d6763c..7446ec3 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/hypothesis/ApiHypothesis.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/hypothesis/ApiHypothesis.scala @@ -15,7 +15,7 @@ object ApiHypothesis { (JsPath \ "name").format[String] and (JsPath \ "treatmentType").format[String] and (JsPath \ "description").format[String] - ) (ApiHypothesis.apply, unlift(ApiHypothesis.unapply)) + )(ApiHypothesis.apply, unlift(ApiHypothesis.unapply)) def fromDomain(hypothesis: Hypothesis) = ApiHypothesis( id = hypothesis.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala index 37a9758..39e0000 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiIntervention.scala @@ -22,7 +22,7 @@ object ApiIntervention { (JsPath \ "isActive").format[Boolean] and (JsPath \ "arms").format[List[Long]] and (JsPath \ "trialId").format[String] - ) (ApiIntervention.apply, unlift(ApiIntervention.unapply)) + )(ApiIntervention.apply, unlift(ApiIntervention.unapply)) def fromDomain(interventionWithArms: InterventionWithArms): ApiIntervention = { import interventionWithArms.intervention diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala index ca444eb..54d2cb7 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala @@ -11,7 +11,7 @@ object ApiInterventionType { implicit val format: Format[ApiInterventionType] = ( (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] - ) (ApiInterventionType.apply, unlift(ApiInterventionType.unapply)) + )(ApiInterventionType.apply, unlift(ApiInterventionType.unapply)) def fromDomain(interventionType: InterventionType) = ApiInterventionType( id = interventionType.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala index 416237a..f67ba6b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala @@ -12,7 +12,7 @@ final case class ApiPartialIntervention(typeId: Option[Long], def applyTo(orig: InterventionWithArms): InterventionWithArms = { val origIntervention = orig.intervention - val draftArmList = arms.map(_.map(x => InterventionArm(LongId(x), orig.intervention.id))) + val draftArmList = arms.map(_.map(x => InterventionArm(LongId(x), orig.intervention.id))) orig.copy( intervention = origIntervention.copy( typeId = typeId.map(LongId(_)).orElse(origIntervention.typeId), @@ -31,14 +31,14 @@ object ApiPartialIntervention { (JsPath \ "description").readNullable[String] and (JsPath \ "isActive").readNullable[Boolean] and (JsPath \ "arms").readNullable[List[Long]] - ) (ApiPartialIntervention.apply _) + )(ApiPartialIntervention.apply _) private val writes: Writes[ApiPartialIntervention] = ( (JsPath \ "typeId").writeNullable[Long] and (JsPath \ "description").writeNullable[String] and (JsPath \ "isActive").writeNullable[Boolean] and (JsPath \ "arms").writeNullable[List[Long]] - ) (unlift(ApiPartialIntervention.unapply)) + )(unlift(ApiPartialIntervention.unapply)) implicit val format: Format[ApiPartialIntervention] = Format(reads, writes) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/keyword/ApiKeyword.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/keyword/ApiKeyword.scala index afd012d..a9d02fc 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/keyword/ApiKeyword.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/keyword/ApiKeyword.scala @@ -13,7 +13,7 @@ object ApiKeyword { (JsPath \ "id").format[Long] and (JsPath \ "keyword").format[String] and (JsPath \ "labels").format[List[ApiLabel]] - ) (ApiKeyword.apply, unlift(ApiKeyword.unapply)) + )(ApiKeyword.apply, unlift(ApiKeyword.unapply)) def fromDomain(keywordWithLabels: KeywordWithLabels) = ApiKeyword( id = keywordWithLabels.keyword.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala index 2788bf2..7a65af8 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala @@ -21,7 +21,7 @@ final case class ApiCriterionLabel(labelId: Option[Long], categoryId = categoryId.map(LongId[Category]), value = value.map { case "Yes" => true - case "No" => false + case "No" => false }, isDefining = isDefining ) @@ -41,9 +41,13 @@ object ApiCriterionLabel { implicit val format: Format[ApiCriterionLabel] = ( (JsPath \ "labelId").formatNullable[Long] and (JsPath \ "categoryId").formatNullable[Long] and - (JsPath \ "value").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({ x => - x == "Yes" || x == "No" - }), Writes.of[String])) and + (JsPath \ "value").formatNullable[String]( + Format(Reads + .of[String] + .filter(ValidationError("unknown value"))({ x => + x == "Yes" || x == "No" + }), + Writes.of[String])) and (JsPath \ "isDefining").format[Boolean] - ) (ApiCriterionLabel.apply, unlift(ApiCriterionLabel.unapply)) + )(ApiCriterionLabel.apply, unlift(ApiCriterionLabel.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala index 9159d27..cb45025 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala @@ -22,11 +22,15 @@ object ApiExtractedDataLabel { implicit val format: Format[ApiExtractedDataLabel] = ( (JsPath \ "id").formatNullable[Long] and (JsPath \ "categoryId").formatNullable[Long] and - (JsPath \ "value").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) - ) (ApiExtractedDataLabel.apply, unlift(ApiExtractedDataLabel.unapply)) + (JsPath \ "value").formatNullable[String]( + Format(Reads + .of[String] + .filter(ValidationError("unknown value"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String])) + )(ApiExtractedDataLabel.apply, unlift(ApiExtractedDataLabel.unapply)) def fromDomain(dataLabel: ExtractedDataLabel) = ApiExtractedDataLabel( id = dataLabel.labelId.map(_.id), diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala index 8c30f3a..042b380 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiLabel.scala @@ -12,7 +12,7 @@ object ApiLabel { (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] and (JsPath \ "categoryId").format[Long] - ) (ApiLabel.apply, unlift(ApiLabel.unapply)) + )(ApiLabel.apply, unlift(ApiLabel.unapply)) def fromDomain(x: Label) = ApiLabel( id = x.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala index 20b2607..05f9564 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiMessage.scala @@ -55,5 +55,5 @@ object ApiMessage { (JsPath \ "evidence").formatNullable[String] and (JsPath \ "archiveRequired").formatNullable[Boolean] and (JsPath \ "meta").formatNullable[String] - ) (ApiMessage.apply, unlift(ApiMessage.unapply)) + )(ApiMessage.apply, unlift(ApiMessage.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala index 151234c..8c390e7 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/message/ApiPartialMessage.scala @@ -66,7 +66,7 @@ object ApiPartialMessage { (JsPath \ "evidence").formatNullable[String] and (JsPath \ "archiveRequired").formatNullable[Boolean] and (JsPath \ "meta").formatNullable[String] - ) (ApiPartialMessage.apply, unlift(ApiPartialMessage.unapply)) + )(ApiPartialMessage.apply, unlift(ApiPartialMessage.unapply)) def fromDomain(domain: Message) = ApiPartialMessage( text = Some(domain.text), diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala index 0a3938c..caa556b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala @@ -28,7 +28,7 @@ object ApiPatient { (JsPath \ "previousAssignee").formatNullable[Long] and (JsPath \ "lastUpdate").format[ZonedDateTime] and (JsPath \ "condition").format[String] - ) (ApiPatient.apply, unlift(ApiPatient.unapply)) + )(ApiPatient.apply, unlift(ApiPatient.unapply)) def fromDomain(patient: Patient) = ApiPatient( id = patient.id.toString, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/PatientStatus.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/PatientStatus.scala index d906fc6..a23a1de 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/PatientStatus.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/PatientStatus.scala @@ -5,20 +5,20 @@ import xyz.driver.pdsuidomain.entities.Patient.Status object PatientStatus { val statusFromString: PartialFunction[String, Status] = { - case "New" => Status.New + case "New" => Status.New case "Verified" => Status.Verified case "Reviewed" => Status.Reviewed - case "Curated" => Status.Curated - case "Flagged" => Status.Flagged - case "Done" => Status.Done + case "Curated" => Status.Curated + case "Flagged" => Status.Flagged + case "Done" => Status.Done } def statusToString(x: Status): String = x match { - case Status.New => "New" + case Status.New => "New" case Status.Verified => "Verified" case Status.Reviewed => "Reviewed" - case Status.Curated => "Curated" - case Status.Flagged => "Flagged" - case Status.Done => "Done" + case Status.Curated => "Curated" + case Status.Flagged => "Flagged" + case Status.Done => "Done" } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala index c1a6e76..42c3259 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala @@ -26,12 +26,17 @@ object ApiPatientEligibleTrial { (JsPath \ "trialTitle").format[String] and (JsPath \ "arms").format[List[String]] and (JsPath \ "hypothesisId").format[UUID] and - (JsPath \ "eligibilityStatus").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown eligibility status"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) and + (JsPath \ "eligibilityStatus").formatNullable[String](Format( + Reads + .of[String] + .filter(ValidationError("unknown eligibility status"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String] + )) and (JsPath \ "isVerified").format[Boolean] - ) (ApiPatientEligibleTrial.apply, unlift(ApiPatientEligibleTrial.unapply)) + )(ApiPatientEligibleTrial.apply, unlift(ApiPatientEligibleTrial.unapply)) def fromDomain(eligibleTrialWithTrial: RichPatientEligibleTrial) = ApiPatientEligibleTrial( id = eligibleTrialWithTrial.group.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPatientHypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPatientHypothesis.scala index 1b0767d..374370e 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPatientHypothesis.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPatientHypothesis.scala @@ -20,7 +20,7 @@ object ApiPatientHypothesis { (JsPath \ "hypothesisId").format[UUID] and (JsPath \ "matchedTrials").format[Long] and (JsPath \ "rationale").formatNullable[String] - ) (ApiPatientHypothesis.apply, unlift(ApiPatientHypothesis.unapply)) + )(ApiPatientHypothesis.apply, unlift(ApiPatientHypothesis.unapply)) def fromDomain(patientHypothesis: PatientHypothesis) = ApiPatientHypothesis( id = patientHypothesis.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala index 82e3a3f..40f7de4 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala @@ -8,13 +8,13 @@ import play.api.libs.functional.syntax._ import play.api.libs.json._ import xyz.driver.pdsuicommon.domain.FuzzyValue -final case class ApiPartialPatientLabel(primaryValue: Option[String], - verifiedPrimaryValue: Tristate[String]) { +final case class ApiPartialPatientLabel(primaryValue: Option[String], verifiedPrimaryValue: Tristate[String]) { def applyTo(orig: PatientLabel): PatientLabel = { orig.copy( primaryValue = primaryValue.map(FuzzyValue.fromString).orElse(orig.primaryValue), - verifiedPrimaryValue = verifiedPrimaryValue.cata(x => Some(FuzzyValue.fromString(x)), None, orig.verifiedPrimaryValue) + verifiedPrimaryValue = + verifiedPrimaryValue.cata(x => Some(FuzzyValue.fromString(x)), None, orig.verifiedPrimaryValue) ) } @@ -23,16 +23,24 @@ final case class ApiPartialPatientLabel(primaryValue: Option[String], object ApiPartialPatientLabel { implicit val format: Format[ApiPartialPatientLabel] = ( - (JsPath \ "primaryValue").formatNullable[String](Format( - Reads.of[String].filter(ValidationError("unknown primary value"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) and - (JsPath \ "verifiedPrimaryValue").formatTristate[String](Format( - Reads.of[String].filter(ValidationError("unknown verified primary value"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) - ) (ApiPartialPatientLabel.apply, unlift(ApiPartialPatientLabel.unapply)) + (JsPath \ "primaryValue").formatNullable[String]( + Format(Reads + .of[String] + .filter(ValidationError("unknown primary value"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String])) and + (JsPath \ "verifiedPrimaryValue").formatTristate[String]( + Format( + Reads + .of[String] + .filter(ValidationError("unknown verified primary value"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String] + )) + )(ApiPartialPatientLabel.apply, unlift(ApiPartialPatientLabel.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabelDefiningCriteria.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabelDefiningCriteria.scala index 3fe135e..ae64c33 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabelDefiningCriteria.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabelDefiningCriteria.scala @@ -12,11 +12,15 @@ object ApiPatientLabelDefiningCriteria { implicit val format: Format[ApiPatientLabelDefiningCriteria] = ( (JsPath \ "labelId").format[Long] and - (JsPath \ "value").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) - ) (ApiPatientLabelDefiningCriteria.apply, unlift(ApiPatientLabelDefiningCriteria.unapply)) + (JsPath \ "value").formatNullable[String]( + Format(Reads + .of[String] + .filter(ValidationError("unknown value"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String])) + )(ApiPatientLabelDefiningCriteria.apply, unlift(ApiPatientLabelDefiningCriteria.unapply)) def fromDomain(x: PatientLabel) = ApiPatientLabelDefiningCriteria( labelId = x.labelId.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala index b68dad5..399bc7d 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala @@ -9,16 +9,13 @@ import play.api.libs.json.{Format, JsPath, Reads, Writes} import xyz.driver.pdsuicommon.domain.FuzzyValue final case class ApiPartialPatientCriterion(eligibilityStatus: Option[String], - verifiedEligibilityStatus: Tristate[String]) { + verifiedEligibilityStatus: Tristate[String]) { def applyTo(orig: PatientCriterion): PatientCriterion = { orig.copy( eligibilityStatus = eligibilityStatus.map(FuzzyValue.fromString).orElse(orig.eligibilityStatus), - verifiedEligibilityStatus = verifiedEligibilityStatus.cata(x => - Some(FuzzyValue.fromString(x)), - None, - orig.verifiedEligibilityStatus - ) + verifiedEligibilityStatus = + verifiedEligibilityStatus.cata(x => Some(FuzzyValue.fromString(x)), None, orig.verifiedEligibilityStatus) ) } } @@ -26,15 +23,25 @@ final case class ApiPartialPatientCriterion(eligibilityStatus: Option[String], object ApiPartialPatientCriterion { implicit val format: Format[ApiPartialPatientCriterion] = ( - (JsPath \ "eligibilityStatus").formatNullable[String](Format( - Reads.of[String].filter(ValidationError("unknown eligibility status"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) and - (JsPath \ "verifiedEligibilityStatus").formatTristate[String](Format( - Reads.of[String].filter(ValidationError("unknown verified eligibility status"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) - ) (ApiPartialPatientCriterion.apply, unlift(ApiPartialPatientCriterion.unapply)) + (JsPath \ "eligibilityStatus").formatNullable[String]( + Format( + Reads + .of[String] + .filter(ValidationError("unknown eligibility status"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String] + )) and + (JsPath \ "verifiedEligibilityStatus").formatTristate[String]( + Format( + Reads + .of[String] + .filter(ValidationError("unknown verified eligibility status"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String] + )) + )(ApiPartialPatientCriterion.apply, unlift(ApiPartialPatientCriterion.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterionList.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterionList.scala index 71cb58f..4b08970 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterionList.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterionList.scala @@ -8,8 +8,8 @@ import play.api.libs.json.{Format, JsPath, Reads, Writes} import xyz.driver.pdsuidomain.services.PatientCriterionService.DraftPatientCriterion final case class ApiPartialPatientCriterionList(id: Long, - eligibilityStatus: Option[String], - isVerified: Option[Boolean]) { + eligibilityStatus: Option[String], + isVerified: Option[Boolean]) { def toDomain: DraftPatientCriterion = DraftPatientCriterion( id = LongId[PatientCriterion](id), @@ -23,10 +23,14 @@ object ApiPartialPatientCriterionList { implicit val format: Format[ApiPartialPatientCriterionList] = ( (JsPath \ "id").format[Long] and (JsPath \ "eligibilityStatus").formatNullable[String](Format( - Reads.of[String].filter(ValidationError("unknown eligibility status"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) and + Reads + .of[String] + .filter(ValidationError("unknown eligibility status"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String] + )) and (JsPath \ "isVerified").formatNullable[Boolean] - ) (ApiPartialPatientCriterionList.apply, unlift(ApiPartialPatientCriterionList.unapply)) + )(ApiPartialPatientCriterionList.apply, unlift(ApiPartialPatientCriterionList.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala index 57c030b..cee67b2 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala @@ -7,10 +7,7 @@ import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuidomain.entities._ import play.api.libs.json._ -final case class ApiCreateRecord(disease: String, - patientId: String, - requestId: UUID, - filename: String) { +final case class ApiCreateRecord(disease: String, patientId: String, requestId: UUID, filename: String) { def toDomain = MedicalRecord( id = LongId(0), diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala index 6096006..de54a9e 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala @@ -24,7 +24,7 @@ object ApiRecord { private val statusFormat = Format( Reads.StringReads.filter(ValidationError("unknown status")) { case x if MedicalRecordStatus.statusFromString.isDefinedAt(x) => true - case _ => false + case _ => false }, Writes.StringWrites ) @@ -39,8 +39,10 @@ object ApiRecord { (JsPath \ "previousStatus").formatNullable(statusFormat) and (JsPath \ "assignee").formatNullable[Long] and (JsPath \ "previousAssignee").formatNullable[Long] and - (JsPath \ "meta").format(Format(Reads { x => JsSuccess(Json.stringify(x)) }, Writes[String](Json.parse))) - ) (ApiRecord.apply, unlift(ApiRecord.unapply)) + (JsPath \ "meta").format(Format(Reads { x => + JsSuccess(Json.stringify(x)) + }, Writes[String](Json.parse))) + )(ApiRecord.apply, unlift(ApiRecord.unapply)) def fromDomain(record: MedicalRecord) = ApiRecord( id = record.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala index b752a4c..0d17b66 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiUpdateRecord.scala @@ -10,9 +10,7 @@ import play.api.libs.functional.syntax._ import play.api.libs.json._ import xyz.driver.pdsuicommon.json.JsonSerializer -final case class ApiUpdateRecord(status: Option[String], - assignee: Tristate[Long], - meta: Tristate[String]) { +final case class ApiUpdateRecord(status: Option[String], assignee: Tristate[Long], meta: Tristate[String]) { def applyTo(orig: MedicalRecord): MedicalRecord = { orig.copy( @@ -26,22 +24,29 @@ final case class ApiUpdateRecord(status: Option[String], object ApiUpdateRecord { private val reads: Reads[ApiUpdateRecord] = ( - (JsPath \ "status").readNullable[String](Reads.of[String].filter(ValidationError("unknown status"))({ - case x if MedicalRecordStatus.statusFromString.isDefinedAt(x) => true - case _ => false - })) and + (JsPath \ "status").readNullable[String]( + Reads + .of[String] + .filter(ValidationError("unknown status"))({ + case x if MedicalRecordStatus.statusFromString.isDefinedAt(x) => true + case _ => false + })) and (JsPath \ "assignee").readTristate[Long] and - (JsPath \ "meta").readTristate(Reads { x => JsSuccess(Json.stringify(x)) }).map { - case Tristate.Present("{}") => Tristate.Absent - case x => x - } - ) (ApiUpdateRecord.apply _) + (JsPath \ "meta") + .readTristate(Reads { x => + JsSuccess(Json.stringify(x)) + }) + .map { + case Tristate.Present("{}") => Tristate.Absent + case x => x + } + )(ApiUpdateRecord.apply _) private val writes: Writes[ApiUpdateRecord] = ( (JsPath \ "status").writeNullable[String] and (JsPath \ "assignee").writeTristate[Long] and (JsPath \ "meta").writeTristate(Writes[String](Json.parse)) - ) (unlift(ApiUpdateRecord.unapply)) + )(unlift(ApiUpdateRecord.unapply)) implicit val format: Format[ApiUpdateRecord] = Format(reads, writes) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/MedicalRecordStatus.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/MedicalRecordStatus.scala index bde4af0..a77b76b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/MedicalRecordStatus.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/MedicalRecordStatus.scala @@ -5,30 +5,30 @@ import xyz.driver.pdsuidomain.entities.MedicalRecord.Status object MedicalRecordStatus { val statusFromString: PartialFunction[String, Status] = { - case "Unprocessed" => Status.Unprocessed - case "PreCleaning" => Status.PreCleaning - case "New" => Status.New - case "Cleaned" => Status.Cleaned - case "PreOrganized" => Status.PreOrganized + case "Unprocessed" => Status.Unprocessed + case "PreCleaning" => Status.PreCleaning + case "New" => Status.New + case "Cleaned" => Status.Cleaned + case "PreOrganized" => Status.PreOrganized case "PreOrganizing" => Status.PreOrganizing - case "Reviewed" => Status.Reviewed - case "Organized" => Status.Organized - case "Done" => Status.Done - case "Flagged" => Status.Flagged - case "Archived" => Status.Archived + case "Reviewed" => Status.Reviewed + case "Organized" => Status.Organized + case "Done" => Status.Done + case "Flagged" => Status.Flagged + case "Archived" => Status.Archived } def statusToString(x: Status): String = x match { - case Status.Unprocessed => "Unprocessed" - case Status.PreCleaning => "PreCleaning" - case Status.New => "New" - case Status.Cleaned => "Cleaned" - case Status.PreOrganized => "PreOrganized" + case Status.Unprocessed => "Unprocessed" + case Status.PreCleaning => "PreCleaning" + case Status.New => "New" + case Status.Cleaned => "Cleaned" + case Status.PreOrganized => "PreOrganized" case Status.PreOrganizing => "PreOrganizing" - case Status.Reviewed => "Reviewed" - case Status.Organized => "Organized" - case Status.Done => "Done" - case Status.Flagged => "Flagged" - case Status.Archived => "Archived" + case Status.Reviewed => "Reviewed" + case Status.Organized => "Organized" + case Status.Done => "Done" + case Status.Flagged => "Flagged" + case Status.Archived => "Archived" } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala index 958ff5d..26c7352 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/studydesign/ApiStudyDesign.scala @@ -11,7 +11,7 @@ object ApiStudyDesign { implicit val format: Format[ApiStudyDesign] = ( (JsPath \ "id").format[Long] and (JsPath \ "name").format[String] - ) (ApiStudyDesign.apply, unlift(ApiStudyDesign.unapply)) + )(ApiStudyDesign.apply, unlift(ApiStudyDesign.unapply)) def fromDomain(studyDesign: StudyDesign) = ApiStudyDesign( id = studyDesign.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiPartialTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiPartialTrial.scala index 0dc1446..f89f181 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiPartialTrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiPartialTrial.scala @@ -31,14 +31,14 @@ object ApiPartialTrial { (JsPath \ "studyDesignId").readTristate[Long] and (JsPath \ "overview").readTristate[String] and (JsPath \ "title").readTristate[String] - ) (ApiPartialTrial.apply _) + )(ApiPartialTrial.apply _) private val writes: Writes[ApiPartialTrial] = ( (JsPath \ "hypothesisId").writeTristate[UUID] and (JsPath \ "studyDesignId").writeTristate[Long] and (JsPath \ "overview").writeTristate[String] and (JsPath \ "title").writeTristate[String] - ) (unlift(ApiPartialTrial.unapply)) + )(unlift(ApiPartialTrial.unapply)) implicit val format: Format[ApiPartialTrial] = Format(reads, writes) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiTrial.scala index 3267617..db980ee 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiTrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/ApiTrial.scala @@ -41,7 +41,7 @@ object ApiTrial { (JsPath \ "overviewTemplate").format[String] and (JsPath \ "isUpdated").format[Boolean] and (JsPath \ "title").format[String] - ) (ApiTrial.apply, unlift(ApiTrial.unapply)) + )(ApiTrial.apply, unlift(ApiTrial.unapply)) def fromDomain(trial: Trial): ApiTrial = ApiTrial( id = trial.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/TrialStatus.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/TrialStatus.scala index 49bcbcb..a5b557b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/TrialStatus.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/trial/TrialStatus.scala @@ -5,26 +5,26 @@ import xyz.driver.pdsuidomain.entities.Trial.Status object TrialStatus { val statusFromString: PartialFunction[String, Status] = { - case "New" => Status.New - case "ReviewSummary" => Status.ReviewSummary - case "Summarized" => Status.Summarized - case "PendingUpdate" => Status.PendingUpdate - case "Update" => Status.Update + case "New" => Status.New + case "ReviewSummary" => Status.ReviewSummary + case "Summarized" => Status.Summarized + case "PendingUpdate" => Status.PendingUpdate + case "Update" => Status.Update case "ReviewCriteria" => Status.ReviewCriteria - case "Done" => Status.Done - case "Flagged" => Status.Flagged - case "Archived" => Status.Archived + case "Done" => Status.Done + case "Flagged" => Status.Flagged + case "Archived" => Status.Archived } def statusToString(x: Status): String = x match { - case Status.New => "New" - case Status.ReviewSummary => "ReviewSummary" - case Status.Summarized => "Summarized" - case Status.PendingUpdate => "PendingUpdate" - case Status.Update => "Update" + case Status.New => "New" + case Status.ReviewSummary => "ReviewSummary" + case Status.Summarized => "Summarized" + case Status.PendingUpdate => "PendingUpdate" + case Status.Update => "Update" case Status.ReviewCriteria => "ReviewCriteria" - case Status.Done => "Done" - case Status.Flagged => "Flagged" - case Status.Archived => "Archived" + case Status.Done => "Done" + case Status.Flagged => "Flagged" + case Status.Archived => "Archived" } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala index 977934b..654508c 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala @@ -14,9 +14,7 @@ import ApiPartialUser._ import xyz.driver.pdsuicommon.json.JsonValidationException import xyz.driver.pdsuicommon.validation.{AdditionalConstraints, JsonValidationErrors} -final case class ApiPartialUser(email: Option[String], - name: Option[String], - roleId: Option[String]) { +final case class ApiPartialUser(email: Option[String], name: Option[String], roleId: Option[String]) { def applyTo(orig: User): Try[User] = Try { val validation = Map( @@ -36,8 +34,8 @@ final case class ApiPartialUser(email: Option[String], def toDomain(id: LongId[User] = LongId(0L)): Try[User] = Try { val validation = Map( - JsPath \ "email" -> AdditionalConstraints.optionNonEmptyConstraint(email), - JsPath \ "name" -> AdditionalConstraints.optionNonEmptyConstraint(name), + JsPath \ "email" -> AdditionalConstraints.optionNonEmptyConstraint(email), + JsPath \ "name" -> AdditionalConstraints.optionNonEmptyConstraint(name), JsPath \ "roleId" -> AdditionalConstraints.optionNonEmptyConstraint(roleId) ) @@ -71,13 +69,19 @@ object ApiPartialUser { implicit val format: Format[ApiPartialUser] = ( (JsPath \ "email").formatNullable[String](Format(Reads.email, Writes.StringWrites)) and - (JsPath \ "name").formatNullable[String](Format( - Reads.filterNot[String](ValidationError("Username is too long (max length is 255 chars)", 255))(_.length > 255), - Writes.StringWrites - )) and - (JsPath \ "roleId").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown role"))({ - case x if UserRole.roleFromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) - ) (ApiPartialUser.apply, unlift(ApiPartialUser.unapply)) + (JsPath \ "name").formatNullable[String]( + Format( + Reads.filterNot[String](ValidationError("Username is too long (max length is 255 chars)", 255))( + _.length > 255), + Writes.StringWrites + )) and + (JsPath \ "roleId").formatNullable[String]( + Format(Reads + .of[String] + .filter(ValidationError("unknown role"))({ + case x if UserRole.roleFromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String])) + )(ApiPartialUser.apply, unlift(ApiPartialUser.unapply)) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala index c2653ec..29138ed 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiUser.scala @@ -15,12 +15,16 @@ object ApiUser { (JsPath \ "id").format[Long] and (JsPath \ "email").format[String](Reads.email) and (JsPath \ "name").format[String] and - (JsPath \ "roleId").format[String](Format(Reads.of[String].filter(ValidationError("unknown role"))({ - case x if UserRole.roleFromString.isDefinedAt(x) => true - case _ => false - }), Writes.of[String])) and + (JsPath \ "roleId").format[String]( + Format(Reads + .of[String] + .filter(ValidationError("unknown role"))({ + case x if UserRole.roleFromString.isDefinedAt(x) => true + case _ => false + }), + Writes.of[String])) and (JsPath \ "latestActivity").formatNullable[ZonedDateTime] - ) (ApiUser.apply, unlift(ApiUser.unapply)) + )(ApiUser.apply, unlift(ApiUser.unapply)) def fromDomain(user: User) = ApiUser( user.id.id, diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/UserRole.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/UserRole.scala index 74acb81..412a969 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/UserRole.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/user/UserRole.scala @@ -5,29 +5,33 @@ import xyz.driver.pdsuicommon.domain.User.Role object UserRole { val roleFromString: PartialFunction[String, Role] = { - case "Cleaner" => Role.RecordCleaner - case "Organizer" => Role.RecordOrganizer - case "Extractor" => Role.DocumentExtractor - case "RecordAdmin" => Role.RecordAdmin - case "TrialSummarizer" => Role.TrialSummarizer - case "CriteriaCurator" => Role.CriteriaCurator - case "TrialAdmin" => Role.TrialAdmin - case "EligibilityVerifier" => Role.EligibilityVerifier + case "Cleaner" => Role.RecordCleaner + case "Organizer" => Role.RecordOrganizer + case "Extractor" => Role.DocumentExtractor + case "RecordAdmin" => Role.RecordAdmin + case "TrialSummarizer" => Role.TrialSummarizer + case "CriteriaCurator" => Role.CriteriaCurator + case "TrialAdmin" => Role.TrialAdmin + case "EligibilityVerifier" => Role.EligibilityVerifier case "TreatmentMatchingAdmin" => Role.TreatmentMatchingAdmin - case "RoutesCurator" => Role.RoutesCurator + case "RoutesCurator" => Role.RoutesCurator + case "SystemUser" => Role.SystemUser + case "ResearchOncologist" => Role.ResearchOncologist // No Mixed at this time } def roleToString(x: Role): String = x match { - case Role.RecordCleaner => "Cleaner" - case Role.RecordOrganizer => "Organizer" - case Role.DocumentExtractor => "Extractor" - case Role.RecordAdmin => "RecordAdmin" - case Role.TrialSummarizer => "TrialSummarizer" - case Role.CriteriaCurator => "CriteriaCurator" - case Role.TrialAdmin => "TrialAdmin" - case Role.EligibilityVerifier => "EligibilityVerifier" + case Role.RecordCleaner => "Cleaner" + case Role.RecordOrganizer => "Organizer" + case Role.DocumentExtractor => "Extractor" + case Role.RecordAdmin => "RecordAdmin" + case Role.TrialSummarizer => "TrialSummarizer" + case Role.CriteriaCurator => "CriteriaCurator" + case Role.TrialAdmin => "TrialAdmin" + case Role.EligibilityVerifier => "EligibilityVerifier" case Role.TreatmentMatchingAdmin => "TreatmentMatchingAdmin" - case Role.RoutesCurator => "RoutesCurator" + case Role.RoutesCurator => "RoutesCurator" + case Role.SystemUser => "SystemUser" + case Role.ResearchOncologist => "ResearchOncologist" } } 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] diff --git a/src/main/scala/xyz/driver/pdsuidomain/storage/RequestStorage.scala b/src/main/scala/xyz/driver/pdsuidomain/storage/RequestStorage.scala index 9e3ad67..6aa49a1 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/storage/RequestStorage.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/storage/RequestStorage.scala @@ -30,13 +30,13 @@ class RequestStorage extends PhiLogging { } def get(patientId: UuidId[Patient], disease: String): Option[Value] = { - logger.debug(phi"get($patientId,${Unsafe(disease)}") + logger.debug(phi"get($patientId, ${Unsafe(disease)}") val key = (patientId, disease.toLowerCase) storage.get(key) } def contains(patientId: UuidId[Patient], disease: String, value: Set[LongId[Arm]]): Boolean = { - logger.debug(phi"contains(key=($patientId,${Unsafe(disease)}),value=$value") + logger.debug(phi"contains(key=($patientId,${Unsafe(disease)}), value=$value") get(patientId, disease.toLowerCase).contains(value) } |