PDSUI-2187 Dropped unnecessary fields from issue tables

9 files changed, 24 insertions, 82 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
index 380e27d..0ec8b00 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentIssue.scala
@@ -13,9 +13,7 @@ final case class DocumentIssue(id: LongId[DocumentIssue],
                                lastUpdate: LocalDateTime,
                                isDraft: Boolean,
                                text: String,
-                               evidence: String,
-                               archiveRequired: Boolean,
-                               meta: String)
+                               archiveRequired: Boolean)
 
 object DocumentIssue {
   implicit def toPhiString(x: DocumentIssue): PhiString = {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
index 0a5ecc4..0d5a498 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordIssue.scala
@@ -13,9 +13,7 @@ final case class MedicalRecordIssue(id: LongId[MedicalRecordIssue],
                                     lastUpdate: LocalDateTime,
                                     isDraft: Boolean,
                                     text: String,
-                                    evidence: String,
-                                    archiveRequired: Boolean,
-                                    meta: String)
+                                    archiveRequired: Boolean)
 
 object MedicalRecordIssue {
   implicit def toPhiString(x: MedicalRecordIssue): PhiString = {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
index 070fc74..f616754 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientIssue.scala
@@ -11,9 +11,7 @@ final case class PatientIssue(id: LongId[PatientIssue],
                               lastUpdate: LocalDateTime,
                               isDraft: Boolean,
                               text: String,
-                              evidence: String,
-                              archiveRequired: Boolean,
-                              meta: String)
+                              archiveRequired: Boolean)
 
 object PatientIssue {
   implicit def toPhiString(x: PatientIssue): PhiString = {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiDocumentIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiDocumentIssue.scala
index fab2546..f157bb2 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiDocumentIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiDocumentIssue.scala
@@ -13,9 +13,7 @@ final case class ApiDocumentIssue(id: Long,
                                   lastUpdate: ZonedDateTime,
                                   userId: String,
                                   isDraft: Boolean,
-                                  evidence: String,
-                                  archiveRequired: Boolean,
-                                  meta: String)
+                                  archiveRequired: Boolean)
 
 object ApiDocumentIssue {
   implicit val format: Format[ApiDocumentIssue] = (
@@ -26,11 +24,7 @@ object ApiDocumentIssue {
       (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]
   )(ApiDocumentIssue.apply, unlift(ApiDocumentIssue.unapply))
 
   def fromDomain(x: DocumentIssue) = ApiDocumentIssue(
@@ -41,8 +35,6 @@ object ApiDocumentIssue {
     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
   )
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiPartialDocumentIssue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiPartialDocumentIssue.scala
index 7a5dbe5..c29b703 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiPartialDocumentIssue.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue/ApiPartialDocumentIssue.scala
@@ -10,16 +10,12 @@ import xyz.driver.pdsuidomain.entities.{Document, DocumentIssue}
 final case class ApiPartialDocumentIssue(startPage: Option[Double],
                                          endPage: Option[Double],
                                          text: String,
-                                         evidence: String,
-                                         archiveRequired: Boolean,
-                                         meta: String) {
+                                         archiveRequired: Boolean) {
   def applyTo(x: DocumentIssue): DocumentIssue = x.copy(
     startPage = startPage,
     endPage = endPage,
     text = text,
-    evidence = evidence,
-    archiveRequired = archiveRequired,
-    meta = meta
+    archiveRequired = archiveRequired
   )
 
   def toDomain(userId: StringId[User], documentId: LongId[Document]) =
@@ -32,9 +28,7 @@ final case class ApiPartialDocumentIssue(startPage: Option[Double],
       lastUpdate = LocalDateTime.MIN,
       isDraft = true,
       text = text,
-      evidence = evidence,
-      archiveRequired = false,
-      meta = meta
+      archiveRequired = false
     )
 }
 
@@ -43,10 +37,6 @@ object ApiPartialDocumentIssue {
     (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]
   )(ApiPartialDocumentIssue.apply, unlift(ApiPartialDocumentIssue.unapply))
 }
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
   )
 }
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
   )
 }