Replace tuples in services replies to rich-classes

3 files changed, 40 insertions, 46 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
index b091746..8da153d 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala
@@ -1,10 +1,9 @@
 package xyz.driver.pdsuidomain.formats.json.sprayformats
 
 import spray.json._
-import xyz.driver.entities.labels.Label
-import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId}
+import xyz.driver.pdsuicommon.domain.FuzzyValue
 import xyz.driver.pdsuidomain.entities._
-import xyz.driver.pdsuidomain.services.PatientCriterionService.DraftPatientCriterion
+import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion}
 
 object patientcriterion {
   import DefaultJsonProtocol._
@@ -38,30 +37,27 @@ object patientcriterion {
     override def read(json: JsValue) = json.convertTo[List[JsValue]].map(_.convertTo[DraftPatientCriterion])
   }
 
-  implicit val patientCriterionWriter: JsonWriter[(PatientCriterion, LongId[Label], List[PatientCriterionArm])] =
-    new JsonWriter[(PatientCriterion, LongId[Label], List[PatientCriterionArm])] {
-      override def write(obj: (PatientCriterion, LongId[Label], List[PatientCriterionArm])): JsValue = {
-        val criterion = obj._1
-        val labelId   = obj._2
-        val arms      = obj._3
+  implicit val patientCriterionWriter: JsonWriter[RichPatientCriterion] =
+    new JsonWriter[RichPatientCriterion] {
+      override def write(obj: RichPatientCriterion): JsValue = {
         JsObject(
-          "id"            -> criterion.id.toJson,
-          "labelId"       -> labelId.toJson,
-          "nctId"         -> criterion.nctId.toJson,
-          "criterionId"   -> criterion.criterionId.toJson,
-          "criterionText" -> criterion.criterionText.toJson,
-          "criterionValue" -> criterion.criterionValue.map {
+          "id"            -> obj.patientCriterion.id.toJson,
+          "labelId"       -> obj.labelId.toJson,
+          "nctId"         -> obj.patientCriterion.nctId.toJson,
+          "criterionId"   -> obj.patientCriterion.criterionId.toJson,
+          "criterionText" -> obj.patientCriterion.criterionText.toJson,
+          "criterionValue" -> obj.patientCriterion.criterionValue.map {
             case true  => "Yes"
             case false => "No"
           }.toJson,
-          "criterionIsDefining"       -> criterion.criterionIsDefining.toJson,
-          "criterionIsCompound"       -> criterion.criterionValue.isEmpty.toJson,
-          "arms"                      -> arms.map(_.armName).toJson,
-          "eligibilityStatus"         -> criterion.eligibilityStatus.toJson,
-          "verifiedEligibilityStatus" -> criterion.verifiedEligibilityStatus.toJson,
-          "isVerified"                -> criterion.isVerified.toJson,
-          "isVisible"                 -> criterion.isVisible.toJson,
-          "lastUpdate"                -> criterion.lastUpdate.toJson
+          "criterionIsDefining"       -> obj.patientCriterion.criterionIsDefining.toJson,
+          "criterionIsCompound"       -> obj.patientCriterion.criterionValue.isEmpty.toJson,
+          "arms"                      -> obj.armList.map(_.armName).toJson,
+          "eligibilityStatus"         -> obj.patientCriterion.eligibilityStatus.toJson,
+          "verifiedEligibilityStatus" -> obj.patientCriterion.verifiedEligibilityStatus.toJson,
+          "isVerified"                -> obj.patientCriterion.isVerified.toJson,
+          "isVisible"                 -> obj.patientCriterion.isVisible.toJson,
+          "lastUpdate"                -> obj.patientCriterion.lastUpdate.toJson
         )
       }
     }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala
index 4f2783c..a85d8af 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patienthypothesis.scala
@@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
 
 import spray.json._
 import xyz.driver.pdsuidomain.entities._
+import xyz.driver.pdsuidomain.services.PatientHypothesisService.RichPatientHypothesis
 
 object patienthypothesis {
   import DefaultJsonProtocol._
@@ -18,18 +19,16 @@ object patienthypothesis {
     case _ => deserializationError(s"Expected Json Object as partial PatientHypothesis, but got $json")
   }
 
-  implicit val patientHypothesisWriter: JsonWriter[(PatientHypothesis, Boolean)] =
-    new JsonWriter[(PatientHypothesis, Boolean)] {
-      override def write(obj: (PatientHypothesis, Boolean)): JsValue = {
-        val patientHypothesis   = obj._1
-        val isRationaleRequired = obj._2
+  implicit val patientHypothesisWriter: JsonWriter[RichPatientHypothesis] =
+    new JsonWriter[RichPatientHypothesis] {
+      override def write(obj: RichPatientHypothesis): JsValue = {
         JsObject(
-          "id"                  -> patientHypothesis.id.toJson,
-          "patientId"           -> patientHypothesis.patientId.toJson,
-          "hypothesisId"        -> patientHypothesis.hypothesisId.toJson,
-          "matchedTrials"       -> patientHypothesis.matchedTrials.toJson,
-          "rationale"           -> patientHypothesis.rationale.toJson,
-          "isRationaleRequired" -> isRationaleRequired.toJson
+          "id"                  -> obj.patientHypothesis.id.toJson,
+          "patientId"           -> obj.patientHypothesis.patientId.toJson,
+          "hypothesisId"        -> obj.patientHypothesis.hypothesisId.toJson,
+          "matchedTrials"       -> obj.patientHypothesis.matchedTrials.toJson,
+          "rationale"           -> obj.patientHypothesis.rationale.toJson,
+          "isRationaleRequired" -> obj.isRequired.toJson
         )
       }
     }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala
index 3b52833..d7ff5a4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientlabel.scala
@@ -3,6 +3,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
 import spray.json._
 import xyz.driver.pdsuicommon.domain.FuzzyValue
 import xyz.driver.pdsuidomain.entities._
+import xyz.driver.pdsuidomain.services.PatientLabelService.RichPatientLabel
 
 object patientlabel {
   import DefaultJsonProtocol._
@@ -28,19 +29,17 @@ object patientlabel {
     case _ => deserializationError(s"Expected Json Object as PatientLabel, but got $json")
   }
 
-  implicit val patientLabelWriter: JsonWriter[(PatientLabel, Boolean)] = new JsonWriter[(PatientLabel, Boolean)] {
-    override def write(obj: (PatientLabel, Boolean)): JsValue = {
-      val patientLabel = obj._1
-      val isVerified   = obj._2
+  implicit val patientLabelWriter: JsonWriter[RichPatientLabel] = new JsonWriter[RichPatientLabel] {
+    override def write(obj: RichPatientLabel): JsValue = {
       JsObject(
-        "id"                   -> patientLabel.id.toJson,
-        "labelId"              -> patientLabel.labelId.toJson,
-        "primaryValue"         -> patientLabel.primaryValue.toJson,
-        "verifiedPrimaryValue" -> patientLabel.verifiedPrimaryValue.toJson,
-        "score"                -> patientLabel.score.toJson,
-        "isImplicitMatch"      -> patientLabel.isImplicitMatch.toJson,
-        "isVisible"            -> patientLabel.isVisible.toJson,
-        "isVerified"           -> isVerified.toJson
+        "id"                   -> obj.patientLabel.id.toJson,
+        "labelId"              -> obj.patientLabel.labelId.toJson,
+        "primaryValue"         -> obj.patientLabel.primaryValue.toJson,
+        "verifiedPrimaryValue" -> obj.patientLabel.verifiedPrimaryValue.toJson,
+        "score"                -> obj.patientLabel.score.toJson,
+        "isImplicitMatch"      -> obj.patientLabel.isImplicitMatch.toJson,
+        "isVisible"            -> obj.patientLabel.isVisible.toJson,
+        "isVerified"           -> obj.isVerified.toJson
       )
     }
   }