1 files changed, 5 insertions, 4 deletions
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,