From 25ccda10b3b7f16f9fcee0b41c4abd035b3d1330 Mon Sep 17 00:00:00 2001 From: kseniya Date: Mon, 25 Sep 2017 14:10:31 +0700 Subject: Created json format for create intervention --- .../formats/json/intervention/ApiPartialIntervention.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention') 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) -- cgit v1.2.3