From 17edd2f48d93a2a96bafd5f10820b41b7416d177 Mon Sep 17 00:00:00 2001
From: Marvin Bertin <marvin.bertin@gmail.com>
Date: Tue, 10 Oct 2017 13:47:26 -0700
Subject: update to eligibility arm id

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

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

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialArm.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialArm.scala
index b2ed7fb..24fe641 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialArm.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialArm.scala
@@ -2,9 +2,9 @@ package xyz.driver.pdsuidomain.entities.export.trial
 
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuidomain.entities.Arm
+import xyz.driver.pdsuidomain.entities.EligibilityArm
 
-final case class ExportTrialArm(armId: LongId[Arm], armName: String, diseaseList: Seq[String])
+final case class ExportTrialArm(armId: LongId[EligibilityArm], armName: String)
 
 object ExportTrialArm {
 
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 b769893..7221d28 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
@@ -2,14 +2,14 @@ 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, Trial}
+import xyz.driver.pdsuidomain.entities.{Arm, Criterion, EligibilityArm, Trial}
 
 object export {
   import common._
   import xyz.driver.core.generators._
 
   def nextExportTrialArm(): ExportTrialArm =
-    ExportTrialArm(armId = nextLongId[Arm], armName = nextString(100), diseaseList = listOf(nextString(100)))
+    ExportTrialArm(armId = nextLongId[EligibilityArm], armName = nextString(100))
 
   def nextExportTrialLabelCriterion(): ExportTrialLabelCriterion =
     ExportTrialLabelCriterion(
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 0fe85ea..8a67469 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
@@ -25,7 +25,7 @@ object export {
   implicit val patientWithLabelsFormat: RootJsonFormat[ExportPatientWithLabels] =
     jsonFormat(ExportPatientWithLabels.apply, "patientId", "labelVersion", "labels")
 
-  implicit val trialArmFormat: RootJsonFormat[ExportTrialArm] = jsonFormat3(ExportTrialArm.apply)
+  implicit val trialArmFormat: RootJsonFormat[ExportTrialArm] = jsonFormat2(ExportTrialArm.apply)
 
   implicit val trialLabelCriterionFormat: RootJsonFormat[ExportTrialLabelCriterion] =
     new RootJsonFormat[ExportTrialLabelCriterion] {
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 37c3de5..517b563 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, Trial}
+import xyz.driver.pdsuidomain.entities.{Arm, Criterion, EligibilityArm, Trial}
 import xyz.driver.pdsuidomain.services.TrialService
 
 import scala.concurrent.Future
@@ -73,9 +73,8 @@ class FakeTrialService extends TrialService {
       labelVersion = 1L,
       generators.listOf(
         new ExportTrialArm(
-          LongId[Arm](generators.nextInt(999999).toLong),
-          generators.nextName().value,
-          generators.listOf(generators.oneOf("adenocarcinoma", "breast", "prostate"))
+          LongId[EligibilityArm](generators.nextInt(999999).toLong),
+          generators.nextName().value
         )),
       generators.listOf(
         new ExportTrialLabelCriterion(
-- 
cgit v1.2.3