diff options
author | vlad <vlad@driver.xyz> | 2017-10-01 12:50:54 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-10-01 12:50:54 -0700 |
commit | b5e0d5f91b52013bc11ef3ea586a54bb001577bc (patch) | |
tree | 58d6ca321e1f9176d02e24fbde6321bddadb21ee /src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala | |
parent | 46b354b6a49c0843fefc5794f2351f52b98102bd (diff) | |
download | rest-query-0.5.1.tar.gz rest-query-0.5.1.tar.bz2 rest-query-0.5.1.zip |
Fixing IN in filters, Model from EVLS added to common, Reusing domain model labelsv0.5.1
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala index 0dfb33f..7f065d4 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala @@ -1,5 +1,6 @@ package xyz.driver.pdsuidomain.entities +import xyz.driver.entities.labels.{Label, LabelCategory} import xyz.driver.pdsuicommon.domain.{LongId, StringId} import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuidomain.entities.Criterion.Meta.Evidence @@ -10,7 +11,7 @@ final case class Criterion(id: LongId[Criterion], isCompound: Boolean, meta: String) { - def isValid(): Boolean = text.nonEmpty && Option(meta).isDefined + def isValid: Boolean = text.nonEmpty && Option(meta).isDefined } object Criterion { @@ -41,7 +42,7 @@ object CriterionArm { final case class CriterionLabel(id: LongId[CriterionLabel], labelId: Option[LongId[Label]], criterionId: LongId[Criterion], - categoryId: Option[LongId[Category]], + categoryId: Option[LongId[LabelCategory]], value: Option[Boolean], isDefining: Boolean) |