From a8714cbcf0c19639bc33418e7d3a06b3d0b857ef Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Tue, 21 Nov 2017 16:08:30 +0700 Subject: TRIAL-126 Fixed intervention update format --- src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention.scala index 14edd5d..bf528e6 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention.scala @@ -87,7 +87,7 @@ object intervention { val typeId = fields .get("typeId") - .map(_.convertTo[LongId[InterventionType]]) + .map(_.convertTo[Option[LongId[InterventionType]]]) val dosage = fields .get("dosage") @@ -110,7 +110,7 @@ object intervention { orig.copy( intervention = origIntervention.copy( name = name.getOrElse(origIntervention.name), - typeId = typeId.orElse(origIntervention.typeId), + typeId = typeId.getOrElse(origIntervention.typeId), dosage = dosage.getOrElse(origIntervention.dosage), isActive = isActive.getOrElse(origIntervention.isActive), deliveryMethod = deliveryMethod -- cgit v1.2.3