Merge branch 'master' into PDSUI-2330

1 files changed, 12 insertions, 17 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseFormatSuite.scala
index 40739f6..d6752d6 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseFormatSuite.scala
@@ -6,16 +6,19 @@ import java.util.UUID
 import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
 import xyz.driver.pdsuicommon.domain.{LongId, UuidId}
+import xyz.driver.pdsuidomain.ListResponse
 import xyz.driver.pdsuidomain.entities.MedicalRecord.Status
 import xyz.driver.pdsuidomain.entities._
 import xyz.driver.pdsuidomain.formats.json.sprayformats.record.recordFormat
+import xyz.driver.pdsuidomain.formats.json.sprayformats.listresponse._
 
-class ListResponseSuite extends FlatSpec with Matchers {
+
+class ListResponseFormatSuite extends FlatSpec with Matchers {
 
   private val lastUpdate        = LocalDateTime.parse("2017-08-10T18:00:00")
   private val lastUpdateToLocal = "2017-08-10T18:00Z"
 
-  private def metaJsonObjectAsString(meta: ListResponse.Meta) = {
+  def metaJsonObjectAsString(meta: ListResponse.Meta) = {
     import meta._
     val lastUpdate = meta.lastUpdate
       .map(_ => s""","lastUpdate":"$lastUpdateToLocal"""")
@@ -33,13 +36,11 @@ class ListResponseSuite extends FlatSpec with Matchers {
         lastUpdate = None
       )
 
-    val writtenJson1 =
-      ListResponse.listResponseMetaFormat.write(meta1)
+    val writtenJson1 = listResponseMetaFormat.write(meta1)
 
     writtenJson1 should be(metaJsonObjectAsString(meta1).parseJson)
 
-    val parsedItem1: ListResponse.Meta =
-      ListResponse.listResponseMetaFormat.read(writtenJson1)
+    val parsedItem1: ListResponse.Meta = listResponseMetaFormat.read(writtenJson1)
 
     meta1 shouldBe parsedItem1
 
@@ -51,13 +52,11 @@ class ListResponseSuite extends FlatSpec with Matchers {
         lastUpdate = Some(lastUpdate)
       )
 
-    val writtenJson2 =
-      ListResponse.listResponseMetaFormat.write(meta2)
+    val writtenJson2 = listResponseMetaFormat.write(meta2)
 
     writtenJson2 should be(metaJsonObjectAsString(meta2).parseJson)
 
-    val parsedItem2: ListResponse.Meta =
-      ListResponse.listResponseMetaFormat.read(writtenJson2)
+    val parsedItem2: ListResponse.Meta = listResponseMetaFormat.read(writtenJson2)
 
     meta2 shouldBe parsedItem2
   }
@@ -81,10 +80,7 @@ class ListResponseSuite extends FlatSpec with Matchers {
       totalPages = 10
     )
 
-    val recordJsonAsString =
-      """{"id":1,"status":"New","assignee":null,"previousStatus":null,"previousAssignee":null,"lastActiveUser":null,
-        "lastUpdate":"2017-08-10T18:00Z","meta":[],"patientId":"748b5884-3528-4cb9-904b-7a8151d6e343","caseId":null,
-        "requestId":"7b54a75d-4197-4b27-9045-b9b6cb131be9","disease":"Breast","physician":"physician","totalPages":10}"""
+    val recordJsonAsString = recordFormat.write(orig)
 
     val meta =
       ListResponse.Meta(
@@ -96,9 +92,8 @@ class ListResponseSuite extends FlatSpec with Matchers {
 
     val listResponse = ListResponse(Seq(orig), meta)
 
-
-    val writtenJson = ListResponse.listResponseWriter.write(listResponse)
-    val expectedJson = s"""{"items":[$recordJsonAsString],"meta":${metaJsonObjectAsString(meta)}}"""
+    val writtenJson = listResponseWriter[MedicalRecord].write(listResponse)
+    val expectedJson = s"""{"items":[$recordJsonAsString],"meta":${listResponseMetaFormat.write(meta)}}"""
 
     writtenJson should be(expectedJson.parseJson)
   }