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

2 files changed, 3 insertions, 41 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/resources/ResourcesStorage.scala b/src/main/scala/xyz/driver/pdsuicommon/resources/ResourcesStorage.scala
deleted file mode 100644
index 2be7ed7..0000000
--- a/src/main/scala/xyz/driver/pdsuicommon/resources/ResourcesStorage.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-package xyz.driver.pdsuicommon.resources
-
-import scala.io.{Codec, Source}
-
-trait ResourcesStorage {
-
-  /**
-    * @param resourcePath Don't forget / at start
-    */
-  def getFirstLine(resourcePath: String): String
-}
-
-object RealResourcesStorage extends ResourcesStorage {
-
-  def getFirstLine(resourcePath: String): String = {
-    val resourceUrl = getClass.getResource(resourcePath)
-    Option(resourceUrl) match {
-      case Some(url) =>
-        val source = Source.fromURL(resourceUrl)(Codec.UTF8)
-        try {
-          val lines = source.getLines()
-          if (lines.isEmpty) throw new RuntimeException(s"'$resourcePath' is empty")
-          else lines.next()
-        } finally {
-          source.close()
-        }
-      case None =>
-        throw new RuntimeException(s"Can not find the '$resourcePath'!")
-    }
-  }
-}
-
-object FakeResourcesStorage extends ResourcesStorage {
-
-  def getFirstLine(resourcePath: String): String = ""
-}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala
index 4ff3993..f617a20 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala
@@ -20,7 +20,6 @@ import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
 import xyz.driver.pdsuidomain.services.ExtractedDataService.RichExtractedData
 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 scala.collection.immutable
@@ -56,7 +55,7 @@ object CustomSwaggerJsonFormats {
   trait RichPatientLabelListResponse
   trait RichPatientCriterionListResponse
   trait RichPatientEligibleTrialListResponse
-  trait RichPatientHypothesisListResponse
+  trait PatientHypothesisListResponse
   trait PatientLabelEvidenceViewListResponse
 
   trait QueueUploadItemListResponse
@@ -200,7 +199,6 @@ object CustomSwaggerJsonFormats {
       classOf[PatientLabelEvidenceView] -> patientLabelEvidenceWriter.write(nextPatientLabelEvidenceView()),
       classOf[RichPatientEligibleTrial] -> patientEligibleTrialWriter.write(nextRichPatientEligibleTrial()),
       classOf[PatientHypothesis]        -> patientHypothesisWriter.write(nextPatientHypothesis()),
-      classOf[RichPatientHypothesis]    -> richPatientHypothesisWriter.write(nextRichPatientHypothesis()),
       classOf[PatientHistory]           -> patientHistoryFormat.write(nextPatientHistory()),
       classOf[PatientIssue]             -> patientIssueWriter.write(nextPatientIssue()),
       classOf[PatientListResponse]      -> listResponseWriter[Patient].write(nextPatientListResponse()),
@@ -213,8 +211,8 @@ object CustomSwaggerJsonFormats {
         nextPatientLabelEvidenceViewListResponse()),
       classOf[RichPatientEligibleTrialListResponse] -> listResponseWriter[RichPatientEligibleTrial].write(
         nextRichPatientEligibleTrialListResponse()),
-      classOf[RichPatientHypothesisListResponse] -> listResponseWriter[RichPatientHypothesis].write(
-        nextRichPatientHypothesisListResponse()),
+      classOf[PatientHypothesisListResponse] -> listResponseWriter[PatientHypothesis].write(
+        nextPatientHypothesisListResponse()),
       classOf[PatientIssueListResponse]   -> listResponseWriter[PatientIssue].write(nextPatientIssuesListResponse()),
       classOf[PatientHistoryListResponse] -> listResponseWriter[PatientHistory].write(nextPatientHistoryListResponse())
     ) ++ customCommonObjectsExamples