3 files changed, 32 insertions, 17 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala
index 4d6d0a2..71423e8 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala
@@ -2,10 +2,15 @@ package xyz.driver.pdsuidomain.formats.json.eligibilityarm
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
+import xyz.driver.entities.patient.CancerType
 import xyz.driver.pdsuicommon.domain.{LongId, StringId}
-import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases, Trial}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases}
 
-final case class ApiEligibilityArm(id: Long, name: String, originalName: String, trialId: String, diseases: Seq[String]) {
+final case class ApiEligibilityArm(id: Long,
+                                   name: String,
+                                   originalName: String,
+                                   trialId: String,
+                                   diseases: Seq[String]) {
 
   def toDomain: EligibilityArmWithDiseases = {
     val eligibilityArm = EligibilityArm(
@@ -16,11 +21,15 @@ final case class ApiEligibilityArm(id: Long, name: String, originalName: String,
       deleted = None // if we have an ApiEligibilityArm object, the EligibilityArm itself has not been deleted
     )
 
-    EligibilityArmWithDiseases(eligibilityArm, this.diseases.map { disease =>
-      val condition = Trial.Condition.fromString(disease)
-        .getOrElse(throw new NoSuchElementException(s"unknown condition $disease"))
-      EligibilityArmDisease(eligibilityArm.id, condition)
-    })
+    EligibilityArmWithDiseases(
+      eligibilityArm,
+      this.diseases.map { disease =>
+        val condition = CancerType
+          .fromString(disease)
+          .getOrElse(throw new NoSuchElementException(s"unknown condition $disease"))
+        EligibilityArmDisease(eligibilityArm.id, condition)
+      }
+    )
   }
 }
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala
index 6cf71a2..087fed5 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala
@@ -1,8 +1,9 @@
 package xyz.driver.pdsuidomain.formats.json.eligibilityarm
 
-import xyz.driver.pdsuicommon.domain.{LongId, StringId}
-import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases, Trial}
 import play.api.libs.json.{Format, Json}
+import xyz.driver.entities.patient.CancerType
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases}
 
 final case class ApiCreateEligibilityArm(name: String, trialId: String, diseases: Seq[String]) {
 
@@ -14,11 +15,15 @@ final case class ApiCreateEligibilityArm(name: String, trialId: String, diseases
       originalName = name
     )
 
-    EligibilityArmWithDiseases(eligibilityArm, diseases.map { disease =>
-      val condition = Trial.Condition.fromString(disease)
-        .getOrElse(throw new NoSuchElementException(s"unknown condition $disease"))
-      EligibilityArmDisease(eligibilityArm.id, condition)
-    })
+    EligibilityArmWithDiseases(
+      eligibilityArm,
+      diseases.map { disease =>
+        val condition = CancerType
+          .fromString(disease)
+          .getOrElse(throw new NoSuchElementException(s"unknown condition $disease"))
+        EligibilityArmDisease(eligibilityArm.id, condition)
+      }
+    )
   }
 }
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala
index 3d9445f..aca22ef 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala
@@ -1,7 +1,8 @@
 package xyz.driver.pdsuidomain.formats.json.eligibilityarm
 
 import play.api.libs.json.{Format, Json}
-import xyz.driver.pdsuidomain.entities.{EligibilityArmDisease, EligibilityArmWithDiseases, Trial}
+import xyz.driver.entities.patient.CancerType
+import xyz.driver.pdsuidomain.entities.{EligibilityArmDisease, EligibilityArmWithDiseases}
 
 final case class ApiPartialEligibilityArm(name: String, diseases: Seq[String]) {
 
@@ -10,9 +11,9 @@ final case class ApiPartialEligibilityArm(name: String, diseases: Seq[String]) {
     val armDiseases = diseases.map { disease =>
       EligibilityArmDisease(
         armWithDisease.eligibilityArm.id,
-        Trial.Condition.fromString(disease).getOrElse(throw new NoSuchElementException(s"unknown condition $disease")))
+        CancerType.fromString(disease).getOrElse(throw new NoSuchElementException(s"unknown condition $disease")))
     }
-    EligibilityArmWithDiseases(arm ,armDiseases)
+    EligibilityArmWithDiseases(arm, armDiseases)
   }
 }