From 01170a92bec7e09be89727143b442e4fb78446e7 Mon Sep 17 00:00:00 2001
From: Kseniya Tomskikh <ktomskih@datamonsters.co>
Date: Mon, 3 Jul 2017 18:06:35 +0600
Subject: PDSUI-2003 Added arm ids list to PatientCriterion

---
 .../formats/json/patient/eligible/ApiPatientEligibleTrial.scala  | 2 +-
 .../formats/json/patient/trial/ApiPatientCriterion.scala         | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala
index 033d73e..4136715 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala
@@ -43,7 +43,7 @@ object ApiPatientEligibleTrial {
     patientId = eligibleTrialWithTrial.group.patientId.toString,
     trialId = eligibleTrialWithTrial.group.trialId.id,
     trialTitle = eligibleTrialWithTrial.trial.title,
-    arms = eligibleTrialWithTrial.arms.map(_.name),
+    arms = eligibleTrialWithTrial.arms.map(_.armName),
     hypothesisId = eligibleTrialWithTrial.group.hypothesisId.id,
     eligibleTrialWithTrial.group.verifiedEligibilityStatus.map(FuzzyValue.valueToString),
     eligibleTrialWithTrial.group.isVerified
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala
index 7ac55f6..75347f4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPatientCriterion.scala
@@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.formats.json.patient.trial
 import java.time.{ZoneId, ZonedDateTime}
 
 import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId}
-import xyz.driver.pdsuidomain.entities.{Arm, Label, PatientCriterion}
+import xyz.driver.pdsuidomain.entities.{Label, PatientCriterion, PatientCriterionArm}
 import play.api.data.validation.ValidationError
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Format, JsPath, Reads, Writes}
@@ -53,8 +53,7 @@ object ApiPatientCriterion {
 
   def fromDomain(patientCriterion: PatientCriterion,
                  labelId: LongId[Label],
-                 arms: List[Arm],
-                 criterionIsCompound: Boolean) = ApiPatientCriterion(
+                 arms: List[PatientCriterionArm]) = ApiPatientCriterion(
     id = patientCriterion.id.id,
     labelId = labelId.id,
     nctId = patientCriterion.nctId.id,
@@ -64,8 +63,8 @@ object ApiPatientCriterion {
       FuzzyValue.valueToString(FuzzyValue.fromBoolean(x))
     },
     criterionIsDefining = patientCriterion.criterionIsDefining,
-    criterionIsCompound = criterionIsCompound,
-    arms = arms.map(_.name),
+    criterionIsCompound = patientCriterion.criterionValue.isEmpty,
+    arms = arms.map(_.armName),
     eligibilityStatus = patientCriterion.eligibilityStatus.map(FuzzyValue.valueToString),
     verifiedEligibilityStatus = patientCriterion.verifiedEligibilityStatus.map(FuzzyValue.valueToString),
     isVerified = patientCriterion.isVerified,
-- 
cgit v1.2.3