From 5832f63b84d7388441d1200f2442dc1e9de0225c Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 27 Jun 2017 17:13:02 -0700 Subject: All PDS UI domain models, API case classes, service traits and necessary utils moved to pdsui-common --- .../patient/label/ApiPartialPatientLabel.scala | 38 +++++++++++++++++ .../json/patient/label/ApiPatientLabel.scala | 47 ++++++++++++++++++++++ .../label/ApiPatientLabelDefiningCriteria.scala | 25 ++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabel.scala create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabelDefiningCriteria.scala (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label') 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 new file mode 100644 index 0000000..82e3a3f --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala @@ -0,0 +1,38 @@ +package xyz.driver.pdsuidomain.formats.json.patient.label + +import xyz.driver.pdsuidomain.entities.PatientLabel +import org.davidbild.tristate.Tristate +import org.davidbild.tristate.contrib.play.ToJsPathOpsFromJsPath +import play.api.data.validation.ValidationError +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]) { + + 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) + ) + } + +} + +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)) + +} diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabel.scala new file mode 100644 index 0000000..fc8687b --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabel.scala @@ -0,0 +1,47 @@ +package xyz.driver.pdsuidomain.formats.json.patient.label + +import xyz.driver.pdsuidomain.entities.PatientLabel +import play.api.data.validation.ValidationError +import play.api.libs.functional.syntax._ +import play.api.libs.json._ +import xyz.driver.pdsuicommon.domain.FuzzyValue + +final case class ApiPatientLabel(id: Long, + labelId: Long, + primaryValue: Option[String], + verifiedPrimaryValue: Option[String], + score: Int, + isImplicitMatch: Boolean, + isVisible: Boolean, + isVerified: Boolean) + +object ApiPatientLabel { + + implicit val apiPatientLabelJsonFormat: Format[ApiPatientLabel] = ( + (JsPath \ "id").format[Long] and + (JsPath \ "labelId").format[Long] and + (JsPath \ "primaryValue").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), Writes.of[String])) and + (JsPath \ "verifiedPrimaryValue").formatNullable[String](Format(Reads.of[String].filter(ValidationError("unknown value"))({ + case x if FuzzyValue.fromString.isDefinedAt(x) => true + case _ => false + }), Writes.of[String])) and + (JsPath \ "score").format[Int] and + (JsPath \ "isImplicitMatch").format[Boolean] and + (JsPath \ "isVisible").format[Boolean] and + (JsPath \ "isVerified").format[Boolean] + ) (ApiPatientLabel.apply, unlift(ApiPatientLabel.unapply)) + + def fromDomain(patientLabel: PatientLabel, isVerified: Boolean): ApiPatientLabel = ApiPatientLabel( + id = patientLabel.id.id, + labelId = patientLabel.labelId.id, + primaryValue = patientLabel.primaryValue.map(FuzzyValue.valueToString), + verifiedPrimaryValue = patientLabel.verifiedPrimaryValue.map(FuzzyValue.valueToString), + score = patientLabel.score, + isImplicitMatch = patientLabel.isImplicitMatch, + isVisible = patientLabel.isVisible, + isVerified = isVerified + ) +} 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 new file mode 100644 index 0000000..3fe135e --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPatientLabelDefiningCriteria.scala @@ -0,0 +1,25 @@ +package xyz.driver.pdsuidomain.formats.json.patient.label + +import play.api.data.validation.ValidationError +import play.api.libs.functional.syntax._ +import play.api.libs.json._ +import xyz.driver.pdsuicommon.domain.FuzzyValue +import xyz.driver.pdsuidomain.entities.PatientLabel + +final case class ApiPatientLabelDefiningCriteria(labelId: Long, value: Option[String]) + +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)) + + def fromDomain(x: PatientLabel) = ApiPatientLabelDefiningCriteria( + labelId = x.labelId.id, + value = x.verifiedPrimaryValue.map(FuzzyValue.valueToString) + ) +} -- cgit v1.2.3