Fixed richcriterion to use eligibility arms

6 files changed, 10 insertions, 10 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
index 574d008..ac7412c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
@@ -59,7 +59,7 @@ object trialcuration {
     val criterion = nextCriterion()
     RichCriterion(
       criterion = criterion,
-      armIds = Seq(nextLongId[Arm], nextLongId[Arm]),
+      armIds = Seq(nextLongId[EligibilityArm], nextLongId[EligibilityArm]),
       labels = Seq(
         nextCriterionLabel(criterion.id),
         nextCriterionLabel(criterion.id)
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala
index 4986b17..b34f339 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiCriterion.scala
@@ -4,7 +4,7 @@ import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId}
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, Trial}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, Criterion, Trial}
 import xyz.driver.pdsuidomain.formats.json.label.ApiCriterionLabel
 import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion
 
@@ -24,7 +24,7 @@ final case class ApiCriterion(id: Long,
       isCompound,
       meta.getOrElse("")
     ),
-    armIds = arms.map(LongId[Arm]),
+    armIds = arms.map(LongId[EligibilityArm]),
     labels = labels.map(_.toDomain(LongId[Criterion](id)))
   )
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala
index ab7641f..21be524 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiNewCriterion.scala
@@ -23,7 +23,7 @@ final case class ApiNewCriterion(meta: Option[String],
       isCompound = isCompound.getOrElse(false),
       text = text
     ),
-    armIds = arms.getOrElse(Seq.empty).map(LongId[Arm]),
+    armIds = arms.getOrElse(Seq.empty).map(LongId[EligibilityArm]),
     labels = labels.map(_.toDomain(LongId(Long.MaxValue))) // A developer should specify right criterionId himself
   )
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala
index 2bcda56..2113d8e 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/criterion/ApiUpdateCriterion.scala
@@ -2,7 +2,7 @@ package xyz.driver.pdsuidomain.formats.json.criterion
 
 import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion}
+import xyz.driver.pdsuidomain.entities.{EligibilityArm, Criterion}
 import org.davidbild.tristate._
 import org.davidbild.tristate.contrib.play.ToJsPathOpsFromJsPath
 import play.api.libs.functional.syntax._
@@ -18,7 +18,7 @@ final case class ApiUpdateCriterion(meta: Tristate[String],
 
   def applyTo(orig: RichCriterion): RichCriterion = RichCriterion(
     criterion = applyTo(orig.criterion),
-    armIds = arms.cata(_.map(LongId[Arm]), Seq.empty, orig.armIds),
+    armIds = arms.cata(_.map(LongId[EligibilityArm]), Seq.empty, orig.armIds),
     labels = labels.cata(_.map(_.toDomain(orig.criterion.id)), Seq.empty, orig.labels)
   )
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala
index 732bcad..c406cc1 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/criterion.scala
@@ -74,7 +74,7 @@ object criterion {
 
       val arms = fields
         .get("arms")
-        .map(_.convertTo[Option[List[LongId[Arm]]]].getOrElse(List.empty[LongId[Arm]]))
+        .map(_.convertTo[Option[List[LongId[EligibilityArm]]]].getOrElse(List.empty[LongId[EligibilityArm]]))
         .getOrElse(orig.armIds)
 
       val labels = fields
@@ -130,8 +130,8 @@ object criterion {
 
         val arms = fields
           .get("arms")
-          .map(_.convertTo[List[LongId[Arm]]])
-          .getOrElse(List.empty[LongId[Arm]])
+          .map(_.convertTo[List[LongId[EligibilityArm]]])
+          .getOrElse(List.empty[LongId[EligibilityArm]])
 
         val labels = fields
           .get("labels")
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
index fd9268b..fdefa65 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
@@ -21,7 +21,7 @@ object CriterionService {
     def userMessage: String = "Access denied"
   }
 
-  final case class RichCriterion(criterion: Criterion, armIds: Seq[LongId[Arm]], labels: Seq[CriterionLabel])
+  final case class RichCriterion(criterion: Criterion, armIds: Seq[LongId[EligibilityArm]], labels: Seq[CriterionLabel])
   object RichCriterion {
     implicit def toPhiString(x: RichCriterion): PhiString = {
       import x._