10 files changed, 80 insertions, 25 deletions
diff --git a/src/test/scala/xyz/driver/common/BaseSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala
index b4c3d03..78a9168 100644
--- a/src/test/scala/xyz/driver/common/BaseSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala
@@ -1,14 +1,14 @@
-package xyz.driver.common
+package xyz.driver.pdsuicommon
 
 import java.time.{LocalDateTime, ZoneId}
 
 import org.scalatest.FreeSpecLike
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.time.{Millis, Span}
-import xyz.driver.common.db.{MysqlQueryBuilder, SearchFilterExpr, SqlContext, Transactions}
-import xyz.driver.common.domain.{Email, LongId, PasswordHash, User}
-import xyz.driver.common.error.UnexpectedFilterException
-import xyz.driver.common.utils.DiffUtils
+import xyz.driver.pdsuicommon.db.{MysqlQueryBuilder, SearchFilterExpr, SqlContext, Transactions}
+import xyz.driver.pdsuicommon.domain.{Email, LongId, PasswordHash, User}
+import xyz.driver.pdsuicommon.error.UnexpectedFilterException
+import xyz.driver.pdsuicommon.utils.DiffUtils
 
 import scala.concurrent.ExecutionContext.Implicits._
 import scala.concurrent.Future
diff --git a/src/test/scala/xyz/driver/common/Mocks.scala b/src/test/scala/xyz/driver/pdsuicommon/Mocks.scala
index 480ab48..2154e3d 100644
--- a/src/test/scala/xyz/driver/common/Mocks.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/Mocks.scala
@@ -1,4 +1,4 @@
-package xyz.driver.common
+package xyz.driver.pdsuicommon
 
 import java.io.{Closeable, PrintWriter}
 import java.net.URL
@@ -7,8 +7,8 @@ import java.util.logging.Logger
 import javax.sql.DataSource
 
 import com.typesafe.config.ConfigFactory
-import xyz.driver.common.db._
-import xyz.driver.common.http.HttpFetcher
+import xyz.driver.pdsuicommon.db._
+import xyz.driver.pdsuicommon.http.HttpFetcher
 
 import scala.concurrent.{ExecutionContext, Future}
 
diff --git a/src/test/scala/xyz/driver/common/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala
index e81d0b3..c0bb1a2 100644
--- a/src/test/scala/xyz/driver/common/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/concurrent/BridgeUploadQueueRepositoryAdapterSuite.scala
@@ -1,13 +1,13 @@
-package xyz.driver.common.concurrent
+package xyz.driver.pdsuicommon.concurrent
 
 import java.util.concurrent.ThreadLocalRandom
 
-import xyz.driver.common.BaseSuite
-import xyz.driver.common.concurrent.BridgeUploadQueue.Item
-import xyz.driver.common.concurrent.BridgeUploadQueueRepositoryAdapter.Strategy
-import xyz.driver.common.concurrent.BridgeUploadQueueRepositoryAdapter.Strategy.{OnAttempt, OnComplete}
-import xyz.driver.common.db.repositories.BridgeUploadQueueRepository
-import xyz.driver.common.domain.LongId
+import xyz.driver.pdsuicommon.BaseSuite
+import xyz.driver.pdsuicommon.concurrent.BridgeUploadQueue.Item
+import xyz.driver.pdsuicommon.concurrent.BridgeUploadQueueRepositoryAdapter.Strategy
+import xyz.driver.pdsuicommon.concurrent.BridgeUploadQueueRepositoryAdapter.Strategy.{OnAttempt, OnComplete}
+import xyz.driver.pdsuicommon.db.repositories.BridgeUploadQueueRepository
+import xyz.driver.pdsuicommon.domain.LongId
 
 import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
diff --git a/src/test/scala/xyz/driver/common/db/QueryBuilderParametersSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/db/QueryBuilderParametersSuite.scala
index e49ccd9..0748e8a 100644
--- a/src/test/scala/xyz/driver/common/db/QueryBuilderParametersSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/db/QueryBuilderParametersSuite.scala
@@ -1,11 +1,11 @@
-package xyz.driver.common.db
+package xyz.driver.pdsuicommon.db
 
 import java.time.LocalDateTime
 
 import io.getquill.MysqlEscape
 import org.scalatest.FreeSpecLike
-import xyz.driver.common.db.QueryBuilder.TableData
-import xyz.driver.common.domain.{Email, LongId, User}
+import xyz.driver.pdsuicommon.db.QueryBuilder.TableData
+import xyz.driver.pdsuicommon.domain.{Email, LongId, User}
 
 class QueryBuilderParametersSuite extends FreeSpecLike {
 
diff --git a/src/test/scala/xyz/driver/common/db/SearchFilterExprSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/db/SearchFilterExprSuite.scala
index 3073b61..ee467af 100644
--- a/src/test/scala/xyz/driver/common/db/SearchFilterExprSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/db/SearchFilterExprSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.common.db
+package xyz.driver.pdsuicommon.db
 
 import org.scalatest.{FreeSpecLike, MustMatchers}
 
diff --git a/src/test/scala/xyz/driver/common/error/UnexpectedFilterException.scala b/src/test/scala/xyz/driver/pdsuicommon/error/UnexpectedFilterException.scala
index 0562b8e..567661a 100644
--- a/src/test/scala/xyz/driver/common/error/UnexpectedFilterException.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/error/UnexpectedFilterException.scala
@@ -1,3 +1,3 @@
-package xyz.driver.common.error
+package xyz.driver.pdsuicommon.error
 
 class UnexpectedFilterException(message: String) extends RuntimeException(message)
diff --git a/src/test/scala/xyz/driver/common/logging/PhiStringContextSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/logging/PhiStringContextSuite.scala
index de60cc9..f623b81 100644
--- a/src/test/scala/xyz/driver/common/logging/PhiStringContextSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/logging/PhiStringContextSuite.scala
@@ -1,4 +1,4 @@
-package xyz.driver.common.logging
+package xyz.driver.pdsuicommon.logging
 
 import org.scalatest.FreeSpecLike
 
diff --git a/src/test/scala/xyz/driver/common/pdf/MockPdfRenderer.scala b/src/test/scala/xyz/driver/pdsuicommon/pdf/MockPdfRenderer.scala
index c22817f..8dfd29c 100644
--- a/src/test/scala/xyz/driver/common/pdf/MockPdfRenderer.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/pdf/MockPdfRenderer.scala
@@ -1,8 +1,8 @@
-package xyz.driver.common.pdf
+package xyz.driver.pdsuicommon.pdf
 
 import java.nio.file.{Path, Paths}
 
-import xyz.driver.common.logging._
+import xyz.driver.pdsuicommon.logging._
 
 object MockPdfRenderer extends PdfRenderer with PhiLogging {
 
diff --git a/src/test/scala/xyz/driver/common/utils/DiffUtils.scala b/src/test/scala/xyz/driver/pdsuicommon/utils/DiffUtils.scala
index 06199bb..d42bca6 100644
--- a/src/test/scala/xyz/driver/common/utils/DiffUtils.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/utils/DiffUtils.scala
@@ -1,11 +1,11 @@
-package xyz.driver.common.utils
+package xyz.driver.pdsuicommon.utils
 
 import java.net.URI
 import java.time.{LocalDate, LocalDateTime}
 
 import ai.x.diff._
 import org.scalatest.Assertions
-import xyz.driver.common.domain.PasswordHash
+import xyz.driver.pdsuicommon.domain.PasswordHash
 
 import scala.io.AnsiColor
 
diff --git a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
new file mode 100644
index 0000000..7187400
--- /dev/null
+++ b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
@@ -0,0 +1,55 @@
+package xyz.driver.pdsuidomain
+
+import java.time.LocalDateTime
+import java.time.temporal.ChronoUnit
+
+import xyz.driver.pdsuicommon.BaseSuite
+import xyz.driver.pdsuicommon.domain.{LongId, TextJson}
+import xyz.driver.pdsuidomain.entities.Document
+
+class DocumentSuite extends BaseSuite {
+
+  "validation" - {
+    "can't submit invalid data" - {
+      val base = sampleDocument
+
+      val now = LocalDateTime.now()
+      val past1 = now.minus(2, ChronoUnit.DAYS)
+      val past2 = past1.plus(1, ChronoUnit.DAYS)
+      val future1 = now.plus(1, ChronoUnit.DAYS)
+      val future2 = future1.plus(1, ChronoUnit.DAYS)
+
+      Seq(
+        "startDate should be non-empty" -> base.copy(startDate = None),
+        "startDate should be greater, than endDate" -> base.copy(startDate = Some(past2), endDate = Some(past1)),
+        "startDate and endDate should be in the past" -> base.copy(startDate = Some(future1), endDate = Some(future2))
+      ).foreach { case (title, orig) =>
+        s"$title" in {
+          val r = Document.validator(orig)
+          assert(r.isLeft, s"should fail, but: ${r.right}")
+        }
+      }
+    }
+  }
+
+  private def sampleDocument = {
+    val lastUpdate = LocalDateTime.now()
+
+    Document(
+      id = LongId(2002),
+      status = Document.Status.New,
+      previousStatus = None,
+      assignee = None,
+      previousAssignee = None,
+      recordId = LongId(2003),
+      physician = None,
+      typeId = Some(LongId(123)),
+      providerName = Some("etst"),
+      providerTypeId = Some(LongId(123)),
+      startDate = Some(lastUpdate.minusDays(2)),
+      endDate = None,
+      lastUpdate = lastUpdate,
+      meta = Some(TextJson(Document.Meta(None, 1.1, 2.2)))
+    )
+  }
+}