From 4583af5213b9f7b1e8a06f58321813556763f2d1 Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Nov 2017 14:11:14 -0700 Subject: Rolling back `eligibilityStatus` value type --- .../xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala | 4 +--- .../xyz/driver/pdsuidomain/services/PatientCriterionService.scala | 4 ++-- .../driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src') 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) -- cgit v1.2.3