Getting rid of the FuzzyValues, Name as a string, and condition

1 files changed, 7 insertions, 4 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientFormatSuite.scala
index 2761d6a..443c8e8 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientFormatSuite.scala
@@ -4,6 +4,8 @@ import java.time.{LocalDate, LocalDateTime}
 
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
+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}
 
@@ -14,23 +16,24 @@ class PatientFormatSuite extends FlatSpec with Matchers {
     val orig = Patient(
       id = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
       status = Patient.Status.New,
-      name = "John Doe",
+      name = FullName.fromStrings("John", "", "Doe"),
       dob = LocalDate.parse("1980-06-30"),
       assignee = None,
       previousStatus = None,
       previousAssignee = None,
       lastActiveUserId = None,
       isUpdateRequired = false,
-      condition = "breast",
+      cancerType = CancerType.Breast,
       orderId = PatientOrderId("7b54a75d-4197-4b27-9045-b9b6cb131be9"),
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00")
     )
     val writtenJson = patientWriter.write(orig)
 
     writtenJson should be (
-      """{"id":"748b5884-3528-4cb9-904b-7a8151d6e343","dob":"1980-06-30","name":"John Doe","status":"New","assignee":null,
+      """{"id":"748b5884-3528-4cb9-904b-7a8151d6e343","dob":"1980-06-30",
+         "name":{"firstName":"John","middleName":"","lastName":"Doe"},"status":"New","assignee":null,
          "previousStatus":null,"previousAssignee":null,"lastActiveUser":null,"lastUpdate":"2017-08-10T18:00Z",
-         "orderId":"7b54a75d-4197-4b27-9045-b9b6cb131be9","condition":"breast"}""".parseJson)
+         "orderId":"7b54a75d-4197-4b27-9045-b9b6cb131be9","condition":"Breast"}""".parseJson)
   }
 
 }