diff options
author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-09-22 10:57:07 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-22 10:57:07 -0700 |
commit | 07602feb5da0914a09103e1f1775e718ab768445 (patch) | |
tree | 6e0c8d050cf3942e13b9f7c45fb5b10975378473 /src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala | |
parent | f1c217d2e6ff2e195e7374605878c7a347a074c7 (diff) | |
parent | 722ee2a778f4e7f541e0704b2bd83225db607697 (diff) | |
download | rest-query-07602feb5da0914a09103e1f1775e718ab768445.tar.gz rest-query-07602feb5da0914a09103e1f1775e718ab768445.tar.bz2 rest-query-07602feb5da0914a09103e1f1775e718ab768445.zip |
Merge pull request #26 from drivergroup/pds-MedicalRecord-Fix
Fixed MedicalRecord and FuzzyValue classes
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala b/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala index 4e98f40..36c3de7 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala @@ -10,21 +10,31 @@ object FuzzyValue { case object No extends FuzzyValue case object Maybe extends FuzzyValue - val All: Set[FuzzyValue] = Set(Yes, No, Maybe) + private val yes = "Yes" + private val no = "No" + private val maybe = "Maybe" - def fromBoolean(x: Boolean): FuzzyValue = if (x) Yes else No + val All: Set[FuzzyValue] = + Set(Yes, No, Maybe) - implicit def toPhiString(x: FuzzyValue): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) + def fromBoolean(x: Boolean): FuzzyValue = + if (x) Yes else No + + implicit def toPhiString(x: FuzzyValue): PhiString = + Unsafe(Utils.getClassSimpleName(x.getClass)) val fromString: PartialFunction[String, FuzzyValue] = { - case "Yes" => Yes - case "No" => No - case "Maybe" => Maybe + case fuzzy => + fuzzy.toLowerCase.capitalize match { + case `yes` => Yes + case `no` => No + case `maybe` => Maybe + } } def valueToString(x: FuzzyValue): String = x match { - case Yes => "Yes" - case No => "No" - case Maybe => "Maybe" + case Yes => `yes` + case No => `no` + case Maybe => `maybe` } } |