From d9bb907bc15445dd2db14be8c033fcfce2fd59c1 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Thu, 5 Oct 2017 17:31:52 -0700
Subject: Removing "predicted" stuff, Refining EligibilityVerificationService

---
 .../xyz/driver/pdsuidomain/entities/Document.scala |  8 +-----
 .../pdsuidomain/entities/MedicalRecord.scala       | 30 +++++++---------------
 2 files changed, 10 insertions(+), 28 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/entities')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index 168eb38..258aa03 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -308,13 +308,7 @@ object DocumentType {
 
 object Document {
 
-  final case class Meta(predicted: Option[Boolean], startPage: Double, endPage: Double) {
-
-    /**
-      * Return a regular meta: this meta is considered as not predicted
-      */
-    def confirmed: Meta = copy(predicted = predicted.map(_ => false))
-  }
+  final case class Meta(startPage: Double, endPage: Double)
 
   class DocumentStatusSerializer extends JsonSerializer[Status] {
     def serialize(value: Status, gen: JsonGenerator, serializers: SerializerProvider): Unit = {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
index 9b33af4..ed35db4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
@@ -22,55 +22,45 @@ object MedicalRecord {
     ))
   trait Meta {
     @JsonProperty("type") def metaType: String
-    def predicted: Option[Boolean]
-
-    /**
-      * Return a regular meta: this meta is considered as not predicted
-      */
-    def confirmed: Meta
   }
 
   object Meta {
 
-    final case class Duplicate(predicted: Option[Boolean],
-                               startPage: Double,
+    final case class Duplicate(startPage: Double,
                                endPage: Double,
                                startOriginalPage: Double,
                                endOriginalPage: Option[Double])
         extends Meta {
-      override val metaType             = "duplicate"
-      override def confirmed: Duplicate = copy(predicted = predicted.map(_ => false))
+      override val metaType = "duplicate"
     }
 
     object Duplicate {
       implicit def toPhiString(x: Duplicate): PhiString = {
         import x._
-        phi"Duplicate(predicted=${x.predicted}, startPage=${Unsafe(startPage)}, endPage=${Unsafe(endPage)}, " +
+        phi"Duplicate(startPage=${Unsafe(startPage)}, endPage=${Unsafe(endPage)}, " +
           phi"startOriginalPage=${Unsafe(startOriginalPage)}, endOriginalPage=${Unsafe(endOriginalPage)}"
       }
     }
 
-    final case class Reorder(predicted: Option[Boolean], items: Seq[Int]) extends Meta {
-      override val metaType           = "reorder"
-      override def confirmed: Reorder = copy(predicted = predicted.map(_ => false))
+    final case class Reorder(items: Seq[Int]) extends Meta {
+      override val metaType = "reorder"
     }
 
     object Reorder {
       implicit def toPhiString(x: Reorder): PhiString = {
         import x._
-        phi"Reorder(predicted=${x.predicted}, items=${Unsafe(items.toString)})"
+        phi"Reorder(items=${Unsafe(items.toString)})"
       }
     }
 
-    final case class Rotation(predicted: Option[Boolean], items: Map[String, Int]) extends Meta {
-      override val metaType            = "rotation"
-      override def confirmed: Rotation = copy(predicted = predicted.map(_ => false))
+    final case class Rotation(items: Map[String, Int]) extends Meta {
+      override val metaType = "rotation"
     }
 
     object Rotation {
       implicit def toPhiString(x: Rotation): PhiString = {
         import x._
-        phi"Rotation(predicted=${x.predicted}, items=${Unsafe(items.toString)})"
+        phi"Rotation(items=${Unsafe(items.toString)})"
       }
     }
 
@@ -166,8 +156,6 @@ final case class MedicalRecord(id: LongId[MedicalRecord],
                                caseId: Option[CaseId],
                                physician: Option[String],
                                meta: Option[TextJson[List[Meta]]],
-                               predictedMeta: Option[TextJson[List[Meta]]],
-                               predictedDocuments: Option[TextJson[List[Document]]],
                                lastUpdate: LocalDateTime) {
 
   import MedicalRecord.Status._
-- 
cgit v1.2.3