diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-23 19:40:57 +0700 |
---|---|---|
committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-23 19:40:57 +0700 |
commit | b99235a22bfabeb175c297660d9dccc27c7b4daf (patch) | |
tree | 26ec90d6f06ac0600aa31217e54e88a7774d7ec8 /src/main/scala/xyz/driver/pdsuidomain/formats/json | |
parent | 683bf697e0f6844202f7e61eea0ef67498ed6260 (diff) | |
download | rest-query-b99235a22bfabeb175c297660d9dccc27c7b4daf.tar.gz rest-query-b99235a22bfabeb175c297660d9dccc27c7b4daf.tar.bz2 rest-query-b99235a22bfabeb175c297660d9dccc27c7b4daf.zip |
Fixed update delivery methodv0.10.4
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala | 5 |
1 files changed, 3 insertions, 2 deletions
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 e557e47..fccdda4 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 @@ -99,7 +99,8 @@ object intervention { val deliveryMethod = fields .get("deliveryMethod") - .map(_.convertTo[String]) + .map(_.convertTo[Option[String]]) + .getOrElse(orig.intervention.deliveryMethod) val origIntervention = orig.intervention val arms = fields @@ -112,7 +113,7 @@ object intervention { typeId = typeId.orElse(origIntervention.typeId), dosage = dosage.getOrElse(origIntervention.dosage), isActive = isActive.getOrElse(origIntervention.isActive), - deliveryMethod = deliveryMethod.orElse(origIntervention.deliveryMethod) + deliveryMethod = deliveryMethod ), arms = arms.getOrElse(orig.arms) ) |