aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention
diff options
context:
space:
mode:
authorkseniya <ktomskih@datamonsters.co>2017-09-25 14:10:31 +0700
committerkseniya <ktomskih@datamonsters.co>2017-09-25 14:10:31 +0700
commit25ccda10b3b7f16f9fcee0b41c4abd035b3d1330 (patch)
treebc784fbf5301ecb5569a07128619f6daed8e7c72 /src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention
parent49cda2524a2537cb9330af488ca9c30e435f5849 (diff)
downloadrest-query-25ccda10b3b7f16f9fcee0b41c4abd035b3d1330.tar.gz
rest-query-25ccda10b3b7f16f9fcee0b41c4abd035b3d1330.tar.bz2
rest-query-25ccda10b3b7f16f9fcee0b41c4abd035b3d1330.zip
Created json format for create intervention
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala
index 09e0b23..e7f69a9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiPartialIntervention.scala
@@ -20,7 +20,7 @@ final case class ApiPartialIntervention(name: Option[String],
def applyTo(orig: InterventionWithArms): InterventionWithArms = {
val origIntervention = orig.intervention
- val draftArmList = arms.map(_.map(x => InterventionArm(LongId(x), orig.intervention.id)))
+ val draftArmList = arms.map(_.map(x => InterventionArm(armId = LongId(x), interventionId = orig.intervention.id)))
orig.copy(
intervention = origIntervention.copy(
typeId = typeId.map(LongId(_)).orElse(origIntervention.typeId),
@@ -31,7 +31,6 @@ final case class ApiPartialIntervention(name: Option[String],
)
}
- //TODO: need to discuss
def toDomain: Try[InterventionWithArms] = Try {
val validation = Map(JsPath \ "trialId" -> AdditionalConstraints.optionNonEmptyConstraint(trialId))
@@ -52,7 +51,8 @@ final case class ApiPartialIntervention(name: Option[String],
originalDosage = dosage.getOrElse(""),
isActive = isActive.getOrElse(false)
),
- arms = arms.map(_.map(x => InterventionArm(LongId(x), LongId(0)))).getOrElse(List.empty)
+ arms =
+ arms.map(_.map(x => InterventionArm(armId = LongId(x), interventionId = LongId(0)))).getOrElse(List.empty)
)
} else {
throw new JsonValidationException(validationErrors)