From 91c4944e7cbe8ad254c10d53037011989240c3ae Mon Sep 17 00:00:00 2001
From: Kseniya Tomskikh <ktomskih@datamonsters.co>
Date: Wed, 2 Aug 2017 17:12:59 +0600
Subject: PDSUI-2187 Dropped unnecessary fields from issue tables

---
 .../json/patientissue/ApiPartialPatientIssue.scala       | 16 ++++------------
 .../formats/json/patientissue/ApiPatientIssue.scala      | 14 +++-----------
 2 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPartialPatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPartialPatientIssue.scala
index 1d97b48..eadd1f8 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPartialPatientIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPartialPatientIssue.scala
@@ -7,12 +7,10 @@ import play.api.libs.json._
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuidomain.entities.{Patient, PatientIssue}
 
-final case class ApiPartialPatientIssue(text: String, evidence: String, archiveRequired: Boolean, meta: String) {
+final case class ApiPartialPatientIssue(text: String, archiveRequired: Boolean) {
   def applyTo(x: PatientIssue): PatientIssue = x.copy(
     text = text,
-    evidence = evidence,
-    archiveRequired = archiveRequired,
-    meta = meta
+    archiveRequired = archiveRequired
   )
 
   def toDomain(userId: StringId[User], patientId: UuidId[Patient]) =
@@ -23,19 +21,13 @@ final case class ApiPartialPatientIssue(text: String, evidence: String, archiveR
       lastUpdate = LocalDateTime.MIN,
       isDraft = true,
       text = text,
-      evidence = evidence,
-      archiveRequired = false,
-      meta = meta
+      archiveRequired = false
     )
 }
 
 object ApiPartialPatientIssue {
   implicit val format: Format[ApiPartialPatientIssue] = (
     (JsPath \ "text").format[String] and
-      (JsPath \ "evidence").format[String] and
-      (JsPath \ "archiveRequired").format[Boolean] and
-      (JsPath \ "meta").format[String](Format(Reads { x =>
-        JsSuccess(Json.stringify(x))
-      }, Writes[String](Json.parse)))
+      (JsPath \ "archiveRequired").format[Boolean]
   )(ApiPartialPatientIssue.apply, unlift(ApiPartialPatientIssue.unapply))
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPatientIssue.scala
index 7e0b174..d1a216c 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPatientIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientissue/ApiPatientIssue.scala
@@ -11,9 +11,7 @@ final case class ApiPatientIssue(id: Long,
                                  lastUpdate: ZonedDateTime,
                                  userId: String,
                                  isDraft: Boolean,
-                                 evidence: String,
-                                 archiveRequired: Boolean,
-                                 meta: String)
+                                 archiveRequired: Boolean)
 
 object ApiPatientIssue {
   implicit val format: Format[ApiPatientIssue] = (
@@ -22,11 +20,7 @@ object ApiPatientIssue {
       (JsPath \ "lastUpdate").format[ZonedDateTime] and
       (JsPath \ "userId").format[String] and
       (JsPath \ "isDraft").format[Boolean] and
-      (JsPath \ "evidence").format[String] and
-      (JsPath \ "archiveRequired").format[Boolean] and
-      (JsPath \ "meta").format[String](Format(Reads { x =>
-        JsSuccess(Json.stringify(x))
-      }, Writes[String](Json.parse)))
+      (JsPath \ "archiveRequired").format[Boolean]
   )(ApiPatientIssue.apply, unlift(ApiPatientIssue.unapply))
 
   def fromDomain(x: PatientIssue) = ApiPatientIssue(
@@ -35,8 +29,6 @@ object ApiPatientIssue {
     lastUpdate = ZonedDateTime.of(x.lastUpdate, ZoneId.of("Z")),
     userId = x.userId.id,
     isDraft = x.isDraft,
-    evidence = x.evidence,
-    archiveRequired = x.archiveRequired,
-    meta = x.meta
+    archiveRequired = x.archiveRequired
   )
 }
-- 
cgit v1.2.3