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/recordissue/ApiPartialRecordIssue.scala       | 18 ++++--------------
 .../formats/json/recordissue/ApiRecordIssue.scala      | 14 +++-----------
 2 files changed, 7 insertions(+), 25 deletions(-)

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

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiPartialRecordIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiPartialRecordIssue.scala
index 07a88aa..890ad69 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiPartialRecordIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiPartialRecordIssue.scala
@@ -10,16 +10,12 @@ import xyz.driver.pdsuidomain.entities.{MedicalRecord, MedicalRecordIssue}
 final case class ApiPartialRecordIssue(startPage: Option[Double],
                                        endPage: Option[Double],
                                        text: String,
-                                       evidence: String,
-                                       archiveRequired: Boolean,
-                                       meta: String) {
+                                       archiveRequired: Boolean) {
   def applyTo(x: MedicalRecordIssue): MedicalRecordIssue = x.copy(
     startPage = startPage,
     endPage = endPage,
     text = text,
-    evidence = evidence,
-    archiveRequired = archiveRequired,
-    meta = meta
+    archiveRequired = archiveRequired
   )
 
   def toDomain(userId: StringId[User], recordId: LongId[MedicalRecord]) =
@@ -32,9 +28,7 @@ final case class ApiPartialRecordIssue(startPage: Option[Double],
       lastUpdate = LocalDateTime.MIN,
       isDraft = true,
       text = text,
-      evidence = evidence,
-      archiveRequired = false,
-      meta = meta
+      archiveRequired = false
     )
 }
 
@@ -43,10 +37,6 @@ object ApiPartialRecordIssue {
     (JsPath \ "startPage").formatNullable[Double] and
       (JsPath \ "endPage").formatNullable[Double] and
       (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]
   )(ApiPartialRecordIssue.apply, unlift(ApiPartialRecordIssue.unapply))
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiRecordIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiRecordIssue.scala
index adab72e..45bc469 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiRecordIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/recordissue/ApiRecordIssue.scala
@@ -13,9 +13,7 @@ final case class ApiRecordIssue(id: Long,
                                 lastUpdate: ZonedDateTime,
                                 userId: String,
                                 isDraft: Boolean,
-                                evidence: String,
-                                archiveRequired: Boolean,
-                                meta: String)
+                                archiveRequired: Boolean)
 
 object ApiRecordIssue {
   implicit val format: Format[ApiRecordIssue] = (
@@ -26,11 +24,7 @@ object ApiRecordIssue {
       (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]
   )(ApiRecordIssue.apply, unlift(ApiRecordIssue.unapply))
 
   def fromDomain(x: MedicalRecordIssue) = ApiRecordIssue(
@@ -41,8 +35,6 @@ object ApiRecordIssue {
     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