From 4e13dd7bc86b24ca0b71f46e4ee3115f563cf9bd Mon Sep 17 00:00:00 2001 From: kseniya Date: Mon, 25 Sep 2017 17:33:08 +0700 Subject: Fixed ACL for intervention --- .../formats/json/intervention/ApiPartialIntervention.scala | 1 + .../driver/pdsuidomain/formats/json/sprayformats/intervention.scala | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json') 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 e7f69a9..74f16e1 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 @@ -23,6 +23,7 @@ final case class ApiPartialIntervention(name: Option[String], val draftArmList = arms.map(_.map(x => InterventionArm(armId = LongId(x), interventionId = orig.intervention.id))) orig.copy( intervention = origIntervention.copy( + name = name.getOrElse(origIntervention.name), typeId = typeId.map(LongId(_)).orElse(origIntervention.typeId), dosage = dosage.getOrElse(origIntervention.dosage), isActive = isActive.getOrElse(origIntervention.isActive) diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala index 717c1a9..8651932 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala @@ -74,6 +74,10 @@ object intervention { def applyUpdateToInterventionWithArms(json: JsValue, orig: InterventionWithArms): InterventionWithArms = json match { case JsObject(fields) => + val name = fields + .get("name") + .map(_.convertTo[String]) + val typeId = fields .get("typeId") .map(_.convertTo[LongId[InterventionType]]) @@ -93,6 +97,7 @@ object intervention { orig.copy( intervention = origIntervention.copy( + name = name.getOrElse(origIntervention.name), typeId = typeId.orElse(origIntervention.typeId), dosage = dosage.getOrElse(origIntervention.dosage), isActive = isActive.getOrElse(origIntervention.isActive) -- cgit v1.2.3