diff options
author | vlad <vlad@driver.xyz> | 2017-10-09 12:24:59 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-10-09 12:24:59 -0700 |
commit | 7d8712a62d30b412717e1b730c0ad267cd207aa4 (patch) | |
tree | 76662e1b233943c1c840a658682aac9766aa64d7 /src/main/scala/xyz/driver/pdsuidomain/formats/json/label | |
parent | 52b5e1a5febc91aa316565fdea309df2b646481e (diff) | |
download | rest-query-7d8712a62d30b412717e1b730c0ad267cd207aa4.tar.gz rest-query-7d8712a62d30b412717e1b730c0ad267cd207aa4.tar.bz2 rest-query-7d8712a62d30b412717e1b730c0ad267cd207aa4.zip |
Getting rid of the FuzzyValues, Name as a string, and condition
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/label')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala | 6 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala index d486749..edb0603 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala @@ -1,11 +1,11 @@ package xyz.driver.pdsuidomain.formats.json.label -import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId} +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.{Criterion, CriterionLabel} import play.api.data.validation.ValidationError import play.api.libs.functional.syntax._ import play.api.libs.json._ -import xyz.driver.entities.labels.{Label, LabelCategory} +import xyz.driver.entities.labels.{Label, LabelCategory, LabelValue} /** * @param value Yes|No @@ -34,7 +34,7 @@ object ApiCriterionLabel { labelId = x.labelId.map(_.id), categoryId = x.categoryId.map(_.id), value = x.value.map { x => - FuzzyValue.valueToString(FuzzyValue.fromBoolean(x)) + LabelValue.fromBoolean(x).toString }, isDefining = x.isDefining ) diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala index f8161af..1497679 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiExtractedDataLabel.scala @@ -1,11 +1,11 @@ package xyz.driver.pdsuidomain.formats.json.label -import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId} +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.{ExtractedData, ExtractedDataLabel} import play.api.data.validation.ValidationError import play.api.libs.functional.syntax._ import play.api.libs.json._ -import xyz.driver.entities.labels.{Label, LabelCategory} +import xyz.driver.entities.labels.{Label, LabelCategory, LabelValue} final case class ApiExtractedDataLabel(id: Option[Long], categoryId: Option[Long], value: Option[String]) { @@ -14,7 +14,7 @@ final case class ApiExtractedDataLabel(id: Option[Long], categoryId: Option[Long dataId = dataId, labelId = id.map(LongId[Label]), categoryId = categoryId.map(LongId[LabelCategory]), - value = value.map(FuzzyValue.fromString) + value = value.flatMap(LabelValue.fromString) ) } @@ -27,8 +27,8 @@ object ApiExtractedDataLabel { Format(Reads .of[String] .filter(ValidationError("unknown value"))({ - case x if FuzzyValue.fromString.isDefinedAt(x) => true - case _ => false + case x if LabelValue.fromString(x).isDefined => true + case _ => false }), Writes.of[String])) )(ApiExtractedDataLabel.apply, unlift(ApiExtractedDataLabel.unapply)) @@ -36,6 +36,6 @@ object ApiExtractedDataLabel { def fromDomain(dataLabel: ExtractedDataLabel) = ApiExtractedDataLabel( id = dataLabel.labelId.map(_.id), categoryId = dataLabel.categoryId.map(_.id), - value = dataLabel.value.map(FuzzyValue.valueToString) + value = dataLabel.value.map(_.toString) ) } |