Fixed richcriterion to use eligibility arms

3 files changed, 5 insertions, 5 deletions

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)
   )