Using common request contexts and user objects

6 files changed, 25 insertions, 37 deletions

diff --git a/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala
deleted file mode 100644
index 29e7610..0000000
--- a/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-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.pdsuicommon.domain._
-import xyz.driver.pdsuicommon.utils.DiffUtils
-
-trait BaseSuite extends FreeSpecLike with DiffUtils with ScalaFutures {
-
-  implicit val defaultPatience = PatienceConfig(timeout = Span(1000, Millis), interval = Span(20, Millis))
-
-  def sampleUser(role: User.Role, email: String = "test@example.com", password: String = "123") = User(
-    id = StringId("2001"),
-    email = Email(email),
-    name = "Test",
-    roles = Set(role),
-    latestActivity = Some(LocalDateTime.now(ZoneId.of("Z"))),
-    deleted = None
-  )
-}
diff --git a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
index 915e4e7..63c4aa2 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
@@ -3,11 +3,17 @@ package xyz.driver.pdsuidomain
 import java.time.{LocalDate, LocalDateTime}
 import java.time.temporal.ChronoUnit
 
-import xyz.driver.pdsuicommon.BaseSuite
+import org.scalatest.FreeSpecLike
+import org.scalatest.concurrent.ScalaFutures
+import org.scalatest.time.{Millis, Span}
 import xyz.driver.pdsuicommon.domain.{LongId, TextJson}
+import xyz.driver.pdsuicommon.utils.DiffUtils
 import xyz.driver.pdsuidomain.entities.Document
 
-class DocumentSuite extends BaseSuite {
+class DocumentSuite extends FreeSpecLike with DiffUtils with ScalaFutures {
+
+  implicit val defaultPatience: PatienceConfig =
+    PatienceConfig(timeout = Span(1000, Millis), interval = Span(20, Millis))
 
   "validation" - {
     "can't submit invalid data" - {
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExportFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExportFormatSuite.scala
index c976243..9c53d3b 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExportFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ExportFormatSuite.scala
@@ -1,13 +1,14 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import java.time.{LocalDate, LocalDateTime}
-import java.util.UUID
 
 import org.scalatest.{FlatSpec, Matchers}
 import spray.json._
+import xyz.driver.core.Id
+import xyz.driver.entities.clinic.ClinicalRecord
 import xyz.driver.entities.labels.LabelValue
 import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
-import xyz.driver.pdsuidomain.entities.{DocumentType, ProviderType, RecordRequestId}
+import xyz.driver.pdsuidomain.entities.{DocumentType, ProviderType}
 
 class ExportFormatSuite extends FlatSpec with Matchers {
   import xyz.driver.pdsuidomain.formats.json.export._
@@ -16,7 +17,7 @@ class ExportFormatSuite extends FlatSpec with Matchers {
     import xyz.driver.pdsuidomain.entities.export.patient._
     val document = ExportPatientLabelEvidenceDocument(
       documentId = LongId(101),
-      requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
+      requestId = Id[ClinicalRecord]("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       documentType = DocumentType.OutpatientPhysicianNote,
       providerType = ProviderType.Surgery,
       date = LocalDate.parse("2017-08-10")
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/ListResponseFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ListResponseFormatSuite.scala
index c561412..e43e922 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/ListResponseFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/ListResponseFormatSuite.scala
@@ -1,10 +1,11 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
-import java.util.UUID
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.Id
+import xyz.driver.entities.clinic.ClinicalRecord
 import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
 import xyz.driver.pdsuidomain.ListResponse
 import xyz.driver.pdsuidomain.entities.MedicalRecord.Status
@@ -18,7 +19,7 @@ class ListResponseFormatSuite extends FlatSpec with Matchers {
   private val lastUpdate        = LocalDateTime.parse("2017-08-10T18:00:00")
   private val lastUpdateToLocal = "2017-08-10T18:00Z"
 
-  def metaJsonObjectAsString(meta: ListResponse.Meta) = {
+  def metaJsonObjectAsString(meta: ListResponse.Meta): String = {
     import meta._
     val lastUpdate = meta.lastUpdate
       .map(_ => s""","lastUpdate":"$lastUpdateToLocal"""")
@@ -74,7 +75,7 @@ class ListResponseFormatSuite extends FlatSpec with Matchers {
       physician = Some("physician"),
       meta = None,
       disease = "Breast",
-      requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
+      requestId = Id[ClinicalRecord]("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       caseId = None,
       patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
       totalPages = 10
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordFormatSuite.scala
index b4e37a2..86462b2 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordFormatSuite.scala
@@ -1,12 +1,13 @@
 package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
-import java.util.UUID
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.Id
+import xyz.driver.entities.clinic.ClinicalRecord
 import xyz.driver.pdsuicommon.domain.{LongId, TextJson, UuidId}
-import xyz.driver.pdsuidomain.entities.{MedicalRecord, RecordRequestId}
+import xyz.driver.pdsuidomain.entities.MedicalRecord
 
 class MedicalRecordFormatSuite extends FlatSpec with Matchers {
   import xyz.driver.pdsuidomain.formats.json.record._
@@ -98,7 +99,7 @@ class MedicalRecordFormatSuite extends FlatSpec with Matchers {
       physician = Some("physician"),
       meta = None,
       disease = "Breast",
-      requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
+      requestId = Id[ClinicalRecord]("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       caseId = None,
       patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
       totalPages = 10
@@ -120,7 +121,7 @@ class MedicalRecordFormatSuite extends FlatSpec with Matchers {
       previousAssignee = None,
       lastActiveUserId = None,
       patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
-      requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
+      requestId = Id[ClinicalRecord]("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       disease = "Breast",
       caseId = None,
       physician = None,
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientFormatSuite.scala
index c296f84..6cddb45 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientFormatSuite.scala
@@ -4,10 +4,12 @@ import java.time.{LocalDate, LocalDateTime}
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
+import xyz.driver.core.Id
+import xyz.driver.entities.clinic.TestOrder
 import xyz.driver.entities.common.FullName
 import xyz.driver.entities.patient.CancerType
 import xyz.driver.pdsuicommon.domain.UuidId
-import xyz.driver.pdsuidomain.entities.{Patient, PatientOrderId}
+import xyz.driver.pdsuidomain.entities.Patient
 
 class PatientFormatSuite extends FlatSpec with Matchers {
   import xyz.driver.pdsuidomain.formats.json.patient._
@@ -24,7 +26,7 @@ class PatientFormatSuite extends FlatSpec with Matchers {
       lastActiveUserId = None,
       isUpdateRequired = false,
       disease = CancerType.Breast,
-      orderId = PatientOrderId("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
+      orderId = Id[TestOrder]("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00")
     )
     val writtenJson = patientFormat.write(orig)