Merge pull request #54 from drivergroup/PDSUI-2336v0.11.0

PDSUI-2336 Cleanup

2 files changed, 0 insertions, 62 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPartialPatientHypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPartialPatientHypothesis.scala
deleted file mode 100644
index 0858ce1..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPartialPatientHypothesis.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package xyz.driver.pdsuidomain.formats.json.patient.hypothesis
-
-import xyz.driver.pdsuidomain.entities.PatientHypothesis
-import org.davidbild.tristate.Tristate
-import org.davidbild.tristate.contrib.play.ToJsPathOpsFromJsPath
-import play.api.libs.functional.syntax._
-import play.api.libs.json._
-
-final case class ApiPartialPatientHypothesis(rationale: Tristate[String]) {
-
-  def applyTo(orig: PatientHypothesis): PatientHypothesis = {
-    orig.copy(
-      rationale = rationale.cata(Some(_), None, orig.rationale)
-    )
-  }
-}
-
-object ApiPartialPatientHypothesis {
-
-  implicit val reads: Reads[ApiPartialPatientHypothesis] =
-    (__ \ "rationale").readTristate[String].map(x => ApiPartialPatientHypothesis(x))
-
-  implicit val writes: Writes[ApiPartialPatientHypothesis] =
-    (__ \ "rationale").writeTristate[String].contramap(_.rationale)
-
-  implicit val format: Format[ApiPartialPatientHypothesis] = Format(reads, writes)
-}
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
deleted file mode 100644
index 584ff72..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/hypothesis/ApiPatientHypothesis.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-package xyz.driver.pdsuidomain.formats.json.patient.hypothesis
-
-import java.util.UUID
-
-import xyz.driver.pdsuidomain.entities.PatientHypothesis
-import play.api.libs.functional.syntax._
-import play.api.libs.json._
-
-final case class ApiPatientHypothesis(id: UUID,
-                                      patientId: String,
-                                      hypothesisId: UUID,
-                                      matchedTrials: Long,
-                                      rationale: Option[String],
-                                      isRationaleRequired: Boolean)
-
-object ApiPatientHypothesis {
-
-  implicit val apiPatientHypothesisJsonFormat: Format[ApiPatientHypothesis] = (
-    (JsPath \ "id").format[UUID] and
-      (JsPath \ "patientId").format[String] and
-      (JsPath \ "hypothesisId").format[UUID] and
-      (JsPath \ "matchedTrials").format[Long] and
-      (JsPath \ "rationale").formatNullable[String] and
-      (JsPath \ "isRationaleRequired").format[Boolean]
-  )(ApiPatientHypothesis.apply, unlift(ApiPatientHypothesis.unapply))
-
-  def fromDomain(patientHypothesis: PatientHypothesis, isRationaleRequired: Boolean) = ApiPatientHypothesis(
-    id = patientHypothesis.id.id,
-    patientId = patientHypothesis.patientId.toString,
-    hypothesisId = patientHypothesis.hypothesisId.id,
-    matchedTrials = patientHypothesis.matchedTrials,
-    rationale = patientHypothesis.rationale,
-    isRationaleRequired = isRationaleRequired
-  )
-}