diff options
| author | vlad <vlad@driver.xyz> | 2017-11-02 14:11:14 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-11-02 14:11:14 -0700 |
| commit | 4583af5213b9f7b1e8a06f58321813556763f2d1 (patch) | |
| tree | b2951e3745e22f671d14977dfc30b2e1567d4bdc /src | |
| parent | 144d8da225d18584dbc19589ba735b84cf3b6637 (diff) | |
| download | rest-query-4583af5213b9f7b1e8a06f58321813556763f2d1.tar.gz rest-query-4583af5213b9f7b1e8a06f58321813556763f2d1.tar.bz2 rest-query-4583af5213b9f7b1e8a06f58321813556763f2d1.zip | |
Rolling back `eligibilityStatus` value typev0.12.4
Diffstat (limited to 'src')
3 files changed, 4 insertions, 6 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala index 713c711..f350f0f 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala @@ -93,9 +93,7 @@ object treatmentmatching { def nextDraftPatientCriterion(): DraftPatientCriterion = DraftPatientCriterion( id = nextLongId[PatientCriterion], - eligibilityStatus = generators.nextOption( - generators.nextOption(fakes.entities.labels.nextLabelValue()) - ), + eligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()), isVerified = generators.nextOption(generators.nextBoolean()) ) diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala index f2b4434..bec0c65 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientCriterionService.scala @@ -15,11 +15,11 @@ import scala.concurrent.Future object PatientCriterionService { final case class DraftPatientCriterion(id: LongId[PatientCriterion], - eligibilityStatus: Option[Option[LabelValue]], + eligibilityStatus: Option[LabelValue], isVerified: Option[Boolean]) { def applyTo(orig: PatientCriterion) = { orig.copy( - eligibilityStatus = eligibilityStatus.getOrElse(orig.eligibilityStatus), + eligibilityStatus = eligibilityStatus.orElse(orig.eligibilityStatus), isVerified = isVerified.getOrElse(orig.isVerified) ) } diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala index 60e0fff..e0f96bb 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala @@ -51,7 +51,7 @@ class PatientCriterionFormatSuite extends FlatSpec with Matchers { val updateBulkPatientCriterionJson = """[{"id":1,"eligibilityStatus":"No"},{"id":2,"isVerified":false}]""".parseJson val expectedDraftPatientCriterionList = List( - DraftPatientCriterion(id = LongId(1), eligibilityStatus = Some(Some(LabelValue.No)), isVerified = None), + DraftPatientCriterion(id = LongId(1), eligibilityStatus = Some(LabelValue.No), isVerified = None), DraftPatientCriterion(id = LongId(2), eligibilityStatus = None, isVerified = Some(false)) ) val parsedDraftPatientCriterionList = draftPatientCriterionListReader.read(updateBulkPatientCriterionJson) |