diff options
| author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-10-12 08:48:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 08:48:35 -0700 |
| commit | f3b809659969ee29ab7f0a62ec1cff25a3e263dc (patch) | |
| tree | 6150d30086c7cfa9aac2cdbd33e755863b2a7e74 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala | |
| parent | 623289020c91dfd4cb38ce23cac77d735b31c3be (diff) | |
| parent | f49ba1bd0b14073dd263b5cce499250c8a4419b2 (diff) | |
| download | rest-query-f3b809659969ee29ab7f0a62ec1cff25a3e263dc.tar.gz rest-query-f3b809659969ee29ab7f0a62ec1cff25a3e263dc.tar.bz2 rest-query-f3b809659969ee29ab7f0a62ec1cff25a3e263dc.zip | |
Merge pull request #42 from drivergroup/PDSUI-list-responsev0.8.7
Fixed patientcriterion format; Added format for ListResponse
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala index 7e8c220..f41c846 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala @@ -12,17 +12,15 @@ object patientcriterion { def applyUpdateToPatientCriterion(json: JsValue, orig: PatientCriterion): PatientCriterion = json match { case JsObject(fields) => - val eligibilityStatus = if (fields.contains("eligibilityStatus")) { - fields - .get("eligibilityStatus") - .map(_.convertTo[LabelValue]) - } else orig.eligibilityStatus + val eligibilityStatus = fields + .get("eligibilityStatus") + .map(_.convertTo[Option[LabelValue]]) + .getOrElse(orig.eligibilityStatus) - val verifiedEligibilityStatus = if (fields.contains("verifiedEligibilityStatus")) { - fields - .get("verifiedEligibilityStatus") - .map(_.convertTo[LabelValue]) - } else orig.verifiedEligibilityStatus + val verifiedEligibilityStatus = fields + .get("verifiedEligibilityStatus") + .map(_.convertTo[Option[LabelValue]]) + .getOrElse(orig.verifiedEligibilityStatus) orig.copy( eligibilityStatus = eligibilityStatus, |