Getting rid of the FuzzyValues, Name as a string, and condition

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala
index 91d0a0e..d92872c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/label/ApiPartialPatientLabel.scala
@@ -6,15 +6,14 @@ import org.davidbild.tristate.contrib.play.ToJsPathOpsFromJsPath
 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
 
 final case class ApiPartialPatientLabel(primaryValue: Option[String], verifiedPrimaryValue: Tristate[String]) {
 
   def applyTo(orig: PatientLabel): PatientLabel = {
     orig.copy(
-      primaryValue = primaryValue.map(FuzzyValue.fromString).orElse(orig.primaryValue),
-      verifiedPrimaryValue =
-        verifiedPrimaryValue.cata(x => Some(FuzzyValue.fromString(x)), None, orig.verifiedPrimaryValue)
+      primaryValue = primaryValue.flatMap(LabelValue.fromString).orElse(orig.primaryValue),
+      verifiedPrimaryValue = verifiedPrimaryValue.cata(x => LabelValue.fromString(x), None, orig.verifiedPrimaryValue)
     )
   }
 }
@@ -26,8 +25,8 @@ object ApiPartialPatientLabel {
       Format(Reads
                .of[String]
                .filter(ValidationError("unknown primary value"))({
-                 case x if FuzzyValue.fromString.isDefinedAt(x) => true
-                 case _                                         => false
+                 case x if LabelValue.fromString(x).isDefined => true
+                 case _                                       => false
                }),
              Writes.of[String])) and
       (JsPath \ "verifiedPrimaryValue").formatTristate[String](
@@ -35,8 +34,8 @@ object ApiPartialPatientLabel {
           Reads
             .of[String]
             .filter(ValidationError("unknown verified primary value"))({
-              case x if FuzzyValue.fromString.isDefinedAt(x) => true
-              case _                                         => false
+              case x if LabelValue.fromString(x).isDefined => true
+              case _                                       => false
             }),
           Writes.of[String]
         ))