diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala | 21 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala | 4 |
2 files changed, 11 insertions, 14 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala b/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala index b0ee436..36c3de7 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/domain/FuzzyValue.scala @@ -14,25 +14,22 @@ object FuzzyValue { private val no = "No" private val maybe = "Maybe" - val All: Set[FuzzyValue] = { + val All: Set[FuzzyValue] = Set(Yes, No, Maybe) - } - def fromBoolean(x: Boolean): FuzzyValue = { + def fromBoolean(x: Boolean): FuzzyValue = if (x) Yes else No - } - implicit def toPhiString(x: FuzzyValue): PhiString = { + implicit def toPhiString(x: FuzzyValue): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) - } - val fromString: PartialFunction[String, FuzzyValue] = { - case fuzzy => fuzzy.toLowerCase.capitalize match { - 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 { diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala index 6e85021..e7b58cd 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala @@ -42,7 +42,7 @@ object ApiRecord { (JsPath \ "meta").format(Format(Reads { x => JsSuccess(Json.stringify(x)) }, Writes[String](Json.parse))) - )(ApiRecord.apply, unlift(ApiRecord.unapply)) + )(ApiRecord.apply, unlift(ApiRecord.unapply)) def fromDomain(record: MedicalRecord) = ApiRecord( id = record.id.id, @@ -105,4 +105,4 @@ final case class ApiRecord(id: Long, predictedDocuments = None, lastUpdate = this.lastUpdate.toLocalDateTime() ) -}
\ No newline at end of file +} |