From 85c78f58f0428d13795aa0419ff42471513a34d6 Mon Sep 17 00:00:00 2001
From: Marvin Bertin <marvin.bertin@gmail.com>
Date: Tue, 10 Oct 2017 18:09:49 -0700
Subject: add diseaseList to ExportTrialArm

---
 .../xyz/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 +-
 .../scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

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

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 24fe641..fbac0df 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
@@ -4,12 +4,12 @@ import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
 import xyz.driver.pdsuidomain.entities.EligibilityArm
 
-final case class ExportTrialArm(armId: LongId[EligibilityArm], armName: String)
+final case class ExportTrialArm(armId: LongId[EligibilityArm], armName: String, diseaseList: Seq[String])
 
 object ExportTrialArm {
 
   implicit def toPhiString(x: ExportTrialArm): PhiString = {
     import x._
-    phi"ExportTrialArm(armId=$armId, armName=${Unsafe(armName)})"
+    phi"ExportTrialArm(armId=$armId, armName=${Unsafe(armName)}, diseaseList=${Unsafe(diseaseList)})"
   }
 }
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 5febd8f..1fe7533 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/export.scala
@@ -9,7 +9,9 @@ object export {
   import xyz.driver.core.generators._
 
   def nextExportTrialArm(): ExportTrialArm =
-    ExportTrialArm(armId = nextLongId[EligibilityArm], armName = nextString(100))
+    ExportTrialArm(armId = nextLongId[EligibilityArm],
+                   armName = nextString(100),
+                   diseaseList = listOf(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 1c4b6b4..4391453 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] = jsonFormat2(ExportTrialArm.apply)
+  implicit val trialArmFormat: RootJsonFormat[ExportTrialArm] = jsonFormat3(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 0431d95..e0efcd1 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/fake/FakeTrialService.scala
@@ -74,7 +74,8 @@ class FakeTrialService extends TrialService {
       generators.listOf(
         new ExportTrialArm(
           LongId[EligibilityArm](generators.nextInt(999999).toLong),
-          generators.nextName().value
+          generators.nextName().value,
+          generators.listOf(generators.oneOf("adenocarcinoma", "breast", "prostate"))
         )),
       generators.listOf(
         new ExportTrialLabelCriterion(
-- 
cgit v1.2.3