aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala41
1 files changed, 24 insertions, 17 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala
index b68dad5..399bc7d 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/trial/ApiPartialPatientCriterion.scala
@@ -9,16 +9,13 @@ import play.api.libs.json.{Format, JsPath, Reads, Writes}
import xyz.driver.pdsuicommon.domain.FuzzyValue
final case class ApiPartialPatientCriterion(eligibilityStatus: Option[String],
- verifiedEligibilityStatus: Tristate[String]) {
+ verifiedEligibilityStatus: Tristate[String]) {
def applyTo(orig: PatientCriterion): PatientCriterion = {
orig.copy(
eligibilityStatus = eligibilityStatus.map(FuzzyValue.fromString).orElse(orig.eligibilityStatus),
- verifiedEligibilityStatus = verifiedEligibilityStatus.cata(x =>
- Some(FuzzyValue.fromString(x)),
- None,
- orig.verifiedEligibilityStatus
- )
+ verifiedEligibilityStatus =
+ verifiedEligibilityStatus.cata(x => Some(FuzzyValue.fromString(x)), None, orig.verifiedEligibilityStatus)
)
}
}
@@ -26,15 +23,25 @@ final case class ApiPartialPatientCriterion(eligibilityStatus: Option[String],
object ApiPartialPatientCriterion {
implicit val format: Format[ApiPartialPatientCriterion] = (
- (JsPath \ "eligibilityStatus").formatNullable[String](Format(
- Reads.of[String].filter(ValidationError("unknown eligibility status"))({
- case x if FuzzyValue.fromString.isDefinedAt(x) => true
- case _ => false
- }), Writes.of[String])) and
- (JsPath \ "verifiedEligibilityStatus").formatTristate[String](Format(
- Reads.of[String].filter(ValidationError("unknown verified eligibility status"))({
- case x if FuzzyValue.fromString.isDefinedAt(x) => true
- case _ => false
- }), Writes.of[String]))
- ) (ApiPartialPatientCriterion.apply, unlift(ApiPartialPatientCriterion.unapply))
+ (JsPath \ "eligibilityStatus").formatNullable[String](
+ Format(
+ Reads
+ .of[String]
+ .filter(ValidationError("unknown eligibility status"))({
+ case x if FuzzyValue.fromString.isDefinedAt(x) => true
+ case _ => false
+ }),
+ Writes.of[String]
+ )) and
+ (JsPath \ "verifiedEligibilityStatus").formatTristate[String](
+ Format(
+ Reads
+ .of[String]
+ .filter(ValidationError("unknown verified eligibility status"))({
+ case x if FuzzyValue.fromString.isDefinedAt(x) => true
+ case _ => false
+ }),
+ Writes.of[String]
+ ))
+ )(ApiPartialPatientCriterion.apply, unlift(ApiPartialPatientCriterion.unapply))
}