diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
commit | 4c22afe6a34641f5b35ff4953a5821a2bc940255 (patch) | |
tree | 4f77275d4460a184cf64085e9d7597841a50fbc9 /src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala | |
parent | c32f965212481e4d26c2ae1ae5616f2d4b3e22ae (diff) | |
parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
download | rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.gz rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.bz2 rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.zip |
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala index 4136715..55c8149 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/eligible/ApiPatientEligibleTrial.scala @@ -5,7 +5,7 @@ import java.util.UUID import play.api.data.validation.ValidationError import play.api.libs.functional.syntax._ import play.api.libs.json._ -import xyz.driver.pdsuicommon.domain.FuzzyValue +import xyz.driver.entities.labels.LabelValue import xyz.driver.pdsuidomain.services.PatientEligibleTrialService.RichPatientEligibleTrial final case class ApiPatientEligibleTrial(id: Long, @@ -30,8 +30,8 @@ object ApiPatientEligibleTrial { Reads .of[String] .filter(ValidationError("unknown eligibility status"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false + case x if LabelValue.fromString(x).isDefined => true + case _ => false }), Writes.of[String] )) and @@ -45,7 +45,7 @@ object ApiPatientEligibleTrial { trialTitle = eligibleTrialWithTrial.trial.title, arms = eligibleTrialWithTrial.arms.map(_.armName), hypothesisId = eligibleTrialWithTrial.group.hypothesisId.id, - eligibleTrialWithTrial.group.verifiedEligibilityStatus.map(FuzzyValue.valueToString), + eligibleTrialWithTrial.group.verifiedEligibilityStatus.map(_.toString), eligibleTrialWithTrial.group.isVerified ) } |