Deleted duplicate spray format and fixed reply of patient eligible trial service

3 files changed, 6 insertions, 20 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
index b97570a..0520ef2 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientdefiningcriteria.scala
@@ -7,7 +7,7 @@ object patientdefiningcriteria {
   import DefaultJsonProtocol._
   import common._
 
-  implicit val patientLabelDefiningCriteriaWriter: JsonWriter[PatientLabel] = new JsonWriter[PatientLabel] {
+  implicit val patientLabelDefiningCriteriaWriter: RootJsonWriter[PatientLabel] = new RootJsonWriter[PatientLabel] {
     override def write(obj: PatientLabel) =
       JsObject(
         "id"    -> obj.id.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 bd448b3..b8c0058 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
@@ -37,11 +37,11 @@ object patienthypothesis {
     new RootJsonWriter[PatientHypothesis] {
       override def write(obj: PatientHypothesis): JsValue = {
         JsObject(
-          "id"                  -> obj.id.toJson,
-          "patientId"           -> obj.patientId.toJson,
-          "hypothesisId"        -> obj.hypothesisId.toJson,
-          "matchedTrials"       -> obj.matchedTrials.toJson,
-          "rationale"           -> obj.rationale.toJson
+          "id"            -> obj.id.toJson,
+          "patientId"     -> obj.patientId.toJson,
+          "hypothesisId"  -> obj.hypothesisId.toJson,
+          "matchedTrials" -> obj.matchedTrials.toJson,
+          "rationale"     -> obj.rationale.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 10a0a94..b36949e 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
@@ -44,20 +44,6 @@ object patientlabel {
     }
   }
 
-  implicit val patientLabelWriter: RootJsonWriter[PatientLabel] = new RootJsonWriter[PatientLabel] {
-    override def write(obj: PatientLabel): JsValue = {
-      JsObject(
-        "id"                   -> obj.id.toJson,
-        "labelId"              -> obj.labelId.toJson,
-        "primaryValue"         -> obj.primaryValue.toJson,
-        "verifiedPrimaryValue" -> obj.verifiedPrimaryValue.toJson,
-        "score"                -> obj.score.toJson,
-        "isImplicitMatch"      -> obj.isImplicitMatch.toJson,
-        "isVisible"            -> obj.isVisible.toJson
-      )
-    }
-  }
-
   implicit val patientLabelEvidenceWriter: RootJsonWriter[PatientLabelEvidenceView] =
     new RootJsonWriter[PatientLabelEvidenceView] {
       override def write(evidence: PatientLabelEvidenceView): JsValue =