PDSUI-2329 Removing `isRationaleRequired` field from the `PatientHypothesis`v0.12.3

3 files changed, 4 insertions, 33 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
index e4d7de6..713c711 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala
@@ -8,7 +8,6 @@ import xyz.driver.pdsuidomain.ListResponse
 import xyz.driver.pdsuidomain.entities._
 import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion}
 import xyz.driver.pdsuidomain.services.PatientEligibleTrialService.RichPatientEligibleTrial
-import xyz.driver.pdsuidomain.services.PatientHypothesisService.RichPatientHypothesis
 import xyz.driver.pdsuidomain.services.PatientLabelService.RichPatientLabel
 import eu.timepit.refined.{refineV, refineMV}
 
@@ -173,11 +172,6 @@ object treatmentmatching {
     }
   )
 
-  def nextRichPatientHypothesis(): RichPatientHypothesis = RichPatientHypothesis(
-    patientHypothesis = nextPatientHypothesis(),
-    isRequired = generators.nextBoolean()
-  )
-
   def nextPatientIssue(): PatientIssue = PatientIssue(
     id = nextLongId[PatientIssue],
     userId = nextStringId[User],
@@ -222,8 +216,8 @@ object treatmentmatching {
     nextListResponse(xs)
   }
 
-  def nextRichPatientHypothesisListResponse(): ListResponse[RichPatientHypothesis] = {
-    val xs: Seq[RichPatientHypothesis] = Seq.fill(3)(nextRichPatientHypothesis())
+  def nextPatientHypothesisListResponse(): ListResponse[PatientHypothesis] = {
+    val xs: Seq[PatientHypothesis] = Seq.fill(3)(nextPatientHypothesis())
     nextListResponse(xs)
   }
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthypothesis.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthypothesis.scala
index a459158..da991a4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthypothesis.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienthypothesis.scala
@@ -2,7 +2,6 @@ package xyz.driver.pdsuidomain.formats.json
 
 import spray.json._
 import xyz.driver.pdsuidomain.entities._
-import xyz.driver.pdsuidomain.services.PatientHypothesisService.RichPatientHypothesis
 
 object patienthypothesis {
   import DefaultJsonProtocol._
@@ -20,20 +19,6 @@ object patienthypothesis {
     case _ => deserializationError(s"Expected Json Object as partial PatientHypothesis, but got $json")
   }
 
-  implicit val richPatientHypothesisWriter: RootJsonWriter[RichPatientHypothesis] =
-    new RootJsonWriter[RichPatientHypothesis] {
-      override def write(obj: RichPatientHypothesis): JsValue = {
-        JsObject(
-          "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
-        )
-      }
-    }
-
   implicit val patientHypothesisWriter: RootJsonWriter[PatientHypothesis] =
     new RootJsonWriter[PatientHypothesis] {
       override def write(obj: PatientHypothesis): JsValue = {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala
index 07734ed..1e655d5 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientHypothesisService.scala
@@ -23,17 +23,9 @@ object PatientHypothesisService {
     def userMessage: String = "Access denied"
   }
 
-  final case class RichPatientHypothesis(patientHypothesis: PatientHypothesis, isRequired: Boolean)
-
-  object RichPatientHypothesis {
-    implicit def toPhiString(x: RichPatientHypothesis): PhiString = {
-      phi"RichPatientHypothesis(patientHypothesis=${x.patientHypothesis}, isRequired=${x.isRequired})"
-    }
-  }
-
   sealed trait GetListReply
   object GetListReply {
-    final case class EntityList(xs: Seq[RichPatientHypothesis], totalFound: Int) extends GetListReply
+    final case class EntityList(xs: Seq[PatientHypothesis], totalFound: Int) extends GetListReply
 
     case object AuthorizationError
         extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
@@ -46,7 +38,7 @@ object PatientHypothesisService {
 
   sealed trait GetByIdReply
   object GetByIdReply {
-    final case class Entity(x: RichPatientHypothesis) extends GetByIdReply
+    final case class Entity(x: PatientHypothesis) extends GetByIdReply
 
     type Error = GetByIdReply with DomainError