diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:36:39 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:36:39 +0700 |
| commit | c32f965212481e4d26c2ae1ae5616f2d4b3e22ae (patch) | |
| tree | 83256b9ede9cab2b54c2f2b2987e77c7d8959515 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/patientcriterion.scala | |
| parent | d9bb907bc15445dd2db14be8c033fcfce2fd59c1 (diff) | |
| download | rest-query-c32f965212481e4d26c2ae1ae5616f2d4b3e22ae.tar.gz rest-query-c32f965212481e4d26c2ae1ae5616f2d4b3e22ae.tar.bz2 rest-query-c32f965212481e4d26c2ae1ae5616f2d4b3e22ae.zip | |
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 | 20 |
1 files changed, 9 insertions, 11 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 affb346..87e2a3a 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 @@ -11,17 +11,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[FuzzyValue]) - } else orig.eligibilityStatus - - val verifiedEligibilityStatus = if (fields.contains("verifiedEligibilityStatus")) { - fields - .get("verifiedEligibilityStatus") - .map(_.convertTo[FuzzyValue]) - } else orig.verifiedEligibilityStatus + val eligibilityStatus = fields + .get("eligibilityStatus") + .map(_.convertTo[Option[FuzzyValue]]) + .getOrElse(orig.eligibilityStatus) + + val verifiedEligibilityStatus = fields + .get("verifiedEligibilityStatus") + .map(_.convertTo[Option[FuzzyValue]]) + .getOrElse(orig.verifiedEligibilityStatus) orig.copy( eligibilityStatus = eligibilityStatus, |