From dc2461e5dfba282ccb45f737bb6245260e20dd81 Mon Sep 17 00:00:00 2001
From: timgushue <tim@driver.xyz>
Date: Tue, 26 Sep 2017 10:57:19 -0700
Subject: Fixing some intervention slotarm type issues and eligibility issues

---
 src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala        | 2 +-
 src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala     | 2 +-
 .../scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala   | 2 +-
 .../driver/pdsuidomain/formats/json/sprayformats/intervention.scala   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/scala/xyz/driver')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala
index 0dfb33f..afb86b3 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala
@@ -28,7 +28,7 @@ object Criterion {
   }
 }
 
-final case class CriterionArm(criterionId: LongId[Criterion], armId: LongId[Arm])
+final case class CriterionArm(criterionId: LongId[Criterion], armId: LongId[EligibilityArm])
 
 object CriterionArm {
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
index cb677cf..a8c22a2 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala
@@ -12,7 +12,7 @@ object InterventionType {
   }
 }
 
-final case class InterventionArm(armId: LongId[Arm], interventionId: LongId[Intervention])
+final case class InterventionArm(armId: LongId[SlotArm], interventionId: LongId[Intervention])
 
 object InterventionArm {
   implicit def toPhiString(x: InterventionArm): PhiString = {
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 ecb6e0a..574d008 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala
@@ -81,7 +81,7 @@ object trialcuration {
 
   def nextInterventionArm(interventionId: LongId[Intervention]): InterventionArm = InterventionArm(
     interventionId = interventionId,
-    armId = nextLongId[Arm]
+    armId = nextLongId[SlotArm]
   )
 
   def nextInterventionWithArms(): InterventionWithArms = {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
index 8651932..dcbe886 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala
@@ -50,7 +50,7 @@ object intervention {
 
         val arms = fields
           .get("arms")
-          .map(_.convertTo[List[LongId[Arm]]].map(x => InterventionArm(armId = x, interventionId = LongId(0))))
+          .map(_.convertTo[List[LongId[SlotArm]]].map(x => InterventionArm(armId = x, interventionId = LongId(0))))
           .getOrElse(List.empty[InterventionArm])
 
         InterventionWithArms(
@@ -93,7 +93,7 @@ object intervention {
       val origIntervention = orig.intervention
       val arms = fields
         .get("arms")
-        .map(_.convertTo[List[LongId[Arm]]].map(x => InterventionArm(x, orig.intervention.id)))
+        .map(_.convertTo[List[LongId[SlotArm]]].map(x => InterventionArm(x, orig.intervention.id)))
 
       orig.copy(
         intervention = origIntervention.copy(
-- 
cgit v1.2.3