diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-02 18:37:52 +0700 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-02 18:37:52 +0700 |
| commit | d0e3c6f37347142a3ef5eab871dde47ea70af304 (patch) | |
| tree | a87d24b1b5d6489576f00fe446f05b5110d62cc0 /src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala | |
| parent | 283ca02360949143ffe7ee8ad87d51902426b450 (diff) | |
| parent | 1913870abec9e31d080f6858d0fc296445852cc6 (diff) | |
| download | rest-query-d0e3c6f37347142a3ef5eab871dde47ea70af304.tar.gz rest-query-d0e3c6f37347142a3ef5eab871dde47ea70af304.tar.bz2 rest-query-d0e3c6f37347142a3ef5eab871dde47ea70af304.zip | |
Merge branch 'master' into synch-refactor
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/label/ApiCriterionLabel.scala | 5 |
1 files changed, 3 insertions, 2 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 7a65af8..d486749 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,10 +1,11 @@ package xyz.driver.pdsuidomain.formats.json.label import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId} -import xyz.driver.pdsuidomain.entities.{Category, Criterion, CriterionLabel, Label} +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} /** * @param value Yes|No @@ -18,7 +19,7 @@ final case class ApiCriterionLabel(labelId: Option[Long], id = LongId(0L), labelId = labelId.map(LongId[Label]), criterionId = criterionId, - categoryId = categoryId.map(LongId[Category]), + categoryId = categoryId.map(LongId[LabelCategory]), value = value.map { case "Yes" => true case "No" => false |