diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-11-27 21:48:11 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-11-27 21:48:11 -0800 |
| commit | 3f0aff9110ba1708b46dd916b196a4a7c25f9466 (patch) | |
| tree | 582daa4690741bb8e8312cedc45cf04056a8611a /src | |
| parent | 2fec2ae7ba051d0622e52c58c952b5f3c132cee0 (diff) | |
| download | rest-query-3f0aff9110ba1708b46dd916b196a4a7c25f9466.tar.gz rest-query-3f0aff9110ba1708b46dd916b196a4a7c25f9466.tar.bz2 rest-query-3f0aff9110ba1708b46dd916b196a4a7c25f9466.zip | |
Revert "Nest format"
This reverts commit 5c50fd8f9eb4588e8f2c7ea5b84822e224b222e5.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala | 5 | ||||
| -rw-r--r-- | src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala index f21b0cb..11253fc 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala @@ -14,8 +14,9 @@ object patienteligibletrial { def applyUpdateToTrialArmGroup(json: JsValue, orig: PatientTrialArmGroupView): PatientTrialArmGroupView = json match { case JsObject(fields) => - val isVerified = fields.get("group").map(_.asJsObject) - .flatMap(_.fields.get("isVerified")).map(_.convertTo[Boolean]) + val isVerified = fields + .get("isVerified") + .map(_.convertTo[Boolean]) .getOrElse(orig.isVerified) orig.copy(isVerified = isVerified) diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala index 9695c2d..0a83c62 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala @@ -59,7 +59,7 @@ class PatientEligibleTrialFormatSuite extends FlatSpec with Matchers { "verifiedEligibilityStatus":"Yes","trialId":"NCT000001","eligibilityStatus":"Yes","id":1}, "arms":[{"patientCriterionId":1,"armId":31,"armName":"arm 31"},{"patientCriterionId":1,"armId":32,"armName":"arm 32"}]}""".parseJson) - val updatePatientEligibleTrialJson = """{"group":{"isVerified":true}}""".parseJson + val updatePatientEligibleTrialJson = """{"isVerified":true}""".parseJson val expectedUpdatedPatientTrialArmGroup = group.copy(isVerified = true) val parsedUpdatePatientTrialArmGroup = applyUpdateToTrialArmGroup(updatePatientEligibleTrialJson, group) parsedUpdatePatientTrialArmGroup should be(expectedUpdatedPatientTrialArmGroup) |