Removing "predicted" stuff, Refining EligibilityVerificationServicev0.6.4v0.6.3

4 files changed, 11 insertions, 21 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
index 9fc3388..7d8a418 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala
@@ -82,7 +82,7 @@ class DocumentSuite extends BaseSuite {
       startDate = Some(lastUpdate.toLocalDate.minusDays(2)),
       endDate = None,
       lastUpdate = lastUpdate,
-      meta = Some(TextJson(Document.Meta(None, 1.1, 2.2)))
+      meta = Some(TextJson(Document.Meta(1.1, 2.2)))
     )
   }
 }
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala
index cc1832c..193e066 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala
@@ -49,28 +49,24 @@ class DocumentFormatSuite extends FlatSpec with Matchers {
     parsedCreatedDocument should be(expectedCreatedDocument)
 
     val updateDocumentJson =
-      """{"startDate":"2017-08-10","endDate":"2018-08-10","meta":{"predicted":true,"startPage":1.0,"endPage":2.0}}""".parseJson
+      """{"startDate":"2017-08-10","endDate":"2018-08-10","meta":{"startPage":1.0,"endPage":2.0}}""".parseJson
     val expectedUpdatedDocument = orig.copy(
       startDate = Some(LocalDate.parse("2017-08-10")),
       endDate = Some(LocalDate.parse("2018-08-10")),
-      meta = Some(TextJson(Document.Meta(predicted = Some(true), startPage = 1.0, endPage = 2.0)))
+      meta = Some(TextJson(Document.Meta(startPage = 1.0, endPage = 2.0)))
     )
     val parsedUpdatedDocument = applyUpdateToDocument(updateDocumentJson, orig)
     parsedUpdatedDocument should be(expectedUpdatedDocument)
   }
 
   "Json format for Document.Meta" should "read and write correct JSON" in {
-    val meta = Document.Meta(predicted = None, startPage = 1.0, endPage = 2.0)
+    val meta = Document.Meta(startPage = 1.0, endPage = 2.0)
     val writtenJson = documentMetaFormat.write(meta)
     writtenJson should be ("""{"startPage":1.0,"endPage":2.0}""".parseJson)
 
-    val metaJsonWithoutPredicted = """{"startPage":1.0,"endPage":2.0}""".parseJson
-    val parsedMetaWithoutPredicted = documentMetaFormat.read(metaJsonWithoutPredicted)
-    parsedMetaWithoutPredicted should be(meta)
-
-    val metaJsonWithPredicted = """{"predicted":true,"startPage":1.0,"endPage":2.0}""".parseJson
-    val parsedMetaWithPredicted = documentMetaFormat.read(metaJsonWithPredicted)
-    parsedMetaWithPredicted should be(meta.copy(predicted = Some(true)))
+    val metaJson = """{"startPage":1.0,"endPage":2.0}""".parseJson
+    val parsedMeta = documentMetaFormat.read(metaJson)
+    parsedMeta should be(meta)
   }
 
 }
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
index 52b2324..2e7481a 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
@@ -80,8 +80,6 @@ class ListResponseSuite extends FlatSpec with Matchers {
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       physician = Some("physician"),
       meta = None,
-      predictedMeta = None,
-      predictedDocuments = None,
       disease = "Breast",
       requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
       caseId = None,
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordFormatSuite.scala
index 899e5c9..dd074e5 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/MedicalRecordFormatSuite.scala
@@ -23,8 +23,6 @@ class MedicalRecordFormatSuite extends FlatSpec with Matchers {
       lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00"),
       physician = Some("physician"),
       meta = None,
-      predictedMeta = None,
-      predictedDocuments = None,
       disease = "Breast",
       requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
       caseId = None,
@@ -52,22 +50,20 @@ class MedicalRecordFormatSuite extends FlatSpec with Matchers {
       caseId = None,
       physician = None,
       meta = None,
-      predictedMeta = None,
-      predictedDocuments = None,
       lastUpdate = LocalDateTime.now()
     )
     val parsedCreatedRecord = recordFormat.read(createRecordJson).copy(lastUpdate = expectedCreatedRecord.lastUpdate)
     parsedCreatedRecord should be(expectedCreatedRecord)
 
     val updateRecordJson =
-      """{"meta":[{"type":"duplicate","predicted":true,"startPage":1.0,"endPage":2.0,"startOriginalPage":1.0},
+      """{"meta":[{"type":"duplicate","startPage":1.0,"endPage":2.0,"startOriginalPage":1.0},
         {"type":"reorder","items":[1,2]},
         {"type":"rotation","items":{"item1":1,"item2":2}}]}""".parseJson
     val expectedUpdatedRecord = orig.copy(
       meta = Some(TextJson(List(
-        Meta.Duplicate(predicted = Some(true), startPage = 1.0, endPage = 2.0, startOriginalPage = 1.0, endOriginalPage = None),
-        Meta.Reorder(predicted = None, items = Seq(1, 2)),
-        Meta.Rotation(predicted = None, items = Map("item1" -> 1, "item2" -> 2))
+        Meta.Duplicate(startPage = 1.0, endPage = 2.0, startOriginalPage = 1.0, endOriginalPage = None),
+        Meta.Reorder(Seq(1, 2)),
+        Meta.Rotation(Map("item1" -> 1, "item2" -> 2))
       )))
     )
     val parsedUpdatedRecord = applyUpdateToMedicalRecord(updateRecordJson, orig)