From 9c95eb7247cb0818af9a9e4afe884698360f994c Mon Sep 17 00:00:00 2001
From: Marvin Bertin <marvin.bertin@gmail.com>
Date: Tue, 10 Oct 2017 15:20:08 -0700
Subject: fix exports with EligibilityArms

---
 .../pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala | 4 ++--
 src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala     | 4 ++--
 .../xyz/driver/pdsuidomain/formats/json/sprayformats/export.scala     | 4 ++--
 .../scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala
index 385bbbe..8376e34 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala
@@ -3,12 +3,12 @@ package xyz.driver.pdsuidomain.entities.export.trial
 import xyz.driver.entities.labels.Label
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion}
+import xyz.driver.pdsuidomain.entities.{Criterion, EligibilityArm}
 
 final case class ExportTrialLabelCriterion(criterionId: LongId[Criterion],
                                            value: Option[Boolean],
                                            labelId: LongId[Label],
-                                           armIds: Set[LongId[Arm]],
+                                           armIds: Set[LongId[EligibilityArm]],
                                            criteria: String,
                                            isCompound: Boolean,
                                            isDefining: Boolean)
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
index 7221d28..5febd8f 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
@@ -2,7 +2,7 @@ package xyz.driver.pdsuidomain.fakes.entities
 
 import xyz.driver.entities.labels.Label
 import xyz.driver.pdsuidomain.entities.export.trial._
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, EligibilityArm, Trial}
+import xyz.driver.pdsuidomain.entities.{Criterion, EligibilityArm, Trial}
 
 object export {
   import common._
@@ -16,7 +16,7 @@ object export {
       criterionId = nextLongId[Criterion],
       value = nextOption[Boolean](nextBoolean()),
       labelId = nextLongId[Label],
-      armIds = setOf(nextLongId[Arm]),
+      armIds = setOf(nextLongId[EligibilityArm]),
       criteria = nextString(100),
       isCompound = nextBoolean(),
       isDefining = nextBoolean()
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/export.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/export.scala
index 8a67469..1c4b6b4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/export.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/export.scala
@@ -5,7 +5,7 @@ import xyz.driver.entities.labels.Label
 import xyz.driver.formats.json.labels._
 import xyz.driver.pdsuidomain.entities.export.patient._
 import xyz.driver.pdsuidomain.entities.export.trial.{ExportTrialArm, ExportTrialLabelCriterion, ExportTrialWithLabels}
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion}
+import xyz.driver.pdsuidomain.entities.{Criterion, EligibilityArm}
 
 object export {
   import DefaultJsonProtocol._
@@ -68,7 +68,7 @@ object export {
               longIdFormat[Criterion].read(criterionId),
               value,
               longIdFormat[Label].read(labelId),
-              armIdsVector.map(longIdFormat[Arm].read).toSet,
+              armIdsVector.map(longIdFormat[EligibilityArm].read).toSet,
               criterionText,
               isCompound,
               isDefining
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
index 517b563..0431d95 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
@@ -12,7 +12,7 @@ import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext
 import xyz.driver.pdsuicommon.db._
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.export.trial.{ExportTrialArm, ExportTrialLabelCriterion, ExportTrialWithLabels}
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, EligibilityArm, Trial}
+import xyz.driver.pdsuidomain.entities.{Criterion, EligibilityArm, Trial}
 import xyz.driver.pdsuidomain.services.TrialService
 
 import scala.concurrent.Future
@@ -81,7 +81,7 @@ class FakeTrialService extends TrialService {
           LongId[Criterion](generators.nextInt(999999).toLong),
           generators.nextOption(generators.nextBoolean()),
           LongId[Label](generators.nextInt(999999).toLong),
-          generators.setOf(LongId[Arm](generators.nextInt(999999).toLong)),
+          generators.setOf(LongId[EligibilityArm](generators.nextInt(999999).toLong)),
           generators.nextName().value,
           generators.nextBoolean(),
           generators.nextBoolean()
-- 
cgit v1.2.3