All PDS UI domain models, API case classes, service traits and necessary utils moved to pdsui-commonv0.1.11

3 files changed, 34 insertions, 1 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala b/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala
new file mode 100644
index 0000000..115163c
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/validation/AdditionalConstraints.scala
@@ -0,0 +1,25 @@
+package xyz.driver.pdsuicommon.validation
+
+import org.davidbild.tristate.Tristate
+import play.api.data.validation._
+
+object AdditionalConstraints {
+
+  val optionNonEmptyConstraint: Constraint[Option[Any]] = {
+    Constraint("option.nonEmpty") {
+      case Some(x) => Valid
+      case None => Invalid("is empty")
+    }
+  }
+
+  val tristateSpecifiedConstraint: Constraint[Tristate[Any]] = {
+    Constraint("tristate.specified") {
+      case Tristate.Unspecified => Invalid("unspecified")
+      case _ => Valid
+    }
+  }
+
+  val uuid: Constraint[String] = {
+    Constraints.pattern("""[\da-z]{8}-[\da-z]{4}-[\da-z]{4}-[\da-z]{4}-[\da-z]{12}""".r, "uuid", "invalid uuid")
+  }
+}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/validation/Validators.scala b/src/main/scala/xyz/driver/pdsuicommon/validation/Validators.scala
index fca726c..a41f87a 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/validation/Validators.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/validation/Validators.scala
@@ -1,7 +1,7 @@
 package xyz.driver.pdsuicommon.validation
 
+import xyz.driver.pdsuicommon.json.JsonSerializer
 import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuicommon.utils.JsonSerializer
 
 import scala.util.control.NonFatal
 
diff --git a/src/main/scala/xyz/driver/pdsuicommon/validation/package.scala b/src/main/scala/xyz/driver/pdsuicommon/validation/package.scala
new file mode 100644
index 0000000..9a31a93
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/validation/package.scala
@@ -0,0 +1,8 @@
+package xyz.driver.pdsuicommon
+
+import play.api.data.validation.{ValidationError => PlayValidationError}
+import play.api.libs.json.JsPath
+
+package object validation {
+  type JsonValidationErrors = Seq[(JsPath, Seq[PlayValidationError])]
+}