From b5e0d5f91b52013bc11ef3ea586a54bb001577bc Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Sun, 1 Oct 2017 12:50:54 -0700
Subject: Fixing IN in filters, Model from EVLS added to common, Reusing domain
 model labels

---
 src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Criterion.scala')

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)
 
-- 
cgit v1.2.3