diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-10-24 11:35:29 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-10-24 11:35:29 +0700 |
| commit | a0fe954d3680541de1ff8e0e7a5d762352e90072 (patch) | |
| tree | 9fdeee0054f1fcf5c61407d29b1b2d24e4509f94 /src/main/scala/xyz/driver/pdsuidomain/formats/json | |
| parent | 3c2a7fdfccc87cb8ec9e8e48c31c622555078c54 (diff) | |
| parent | 5a6b7a7a3013035d692eb6d8ac369c1eb6dac0f3 (diff) | |
| download | rest-query-a0fe954d3680541de1ff8e0e7a5d762352e90072.tar.gz rest-query-a0fe954d3680541de1ff8e0e7a5d762352e90072.tar.bz2 rest-query-a0fe954d3680541de1ff8e0e7a5d762352e90072.zip | |
Merge branch 'master' into PDSUI-2330
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 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala | 1 |
2 files changed, 4 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) ) diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala index 09517e6..d00aa14 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala @@ -15,6 +15,7 @@ object record { import common._ implicit val recordStatusFormat = new EnumJsonFormat[Status]( + "PreCleaning" -> Status.PreCleaning, "Unprocessed" -> Status.Unprocessed, "PreOrganized" -> Status.PreOrganized, "New" -> Status.New, |