From 351b139bdde3d47fb1f13e1f9f839f8d6cd23050 Mon Sep 17 00:00:00 2001
From: Kseniya Tomskikh <ktomskih@datamonsters.co>
Date: Thu, 12 Oct 2017 15:07:50 +0700
Subject: Revert "PDSUI-1088 Added labelVersion to documents"

---
 .../pdsuidomain/formats/json/document/ApiDocument.scala      | 12 ++++--------
 .../formats/json/document/ApiPartialDocument.scala           |  6 ++----
 .../pdsuidomain/formats/json/sprayformats/document.scala     |  6 ++----
 3 files changed, 8 insertions(+), 16 deletions(-)

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

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala
index 250e650..3f1ecfe 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala
@@ -25,8 +25,7 @@ final case class ApiDocument(id: Long,
                              assignee: Option[String],
                              previousAssignee: Option[String],
                              lastActiveUser: Option[String],
-                             meta: Option[String],
-                             labelVersion: Int) {
+                             meta: Option[String]) {
 
   private def extractStatus(status: String): Document.Status =
     Document.Status.fromString(status).getOrElse(throw new NoSuchElementException(s"Status $status unknown"))
@@ -51,8 +50,7 @@ final case class ApiDocument(id: Long,
     meta = this.meta.map(x => TextJson(JsonSerializer.deserialize[Document.Meta](x))),
     startDate = this.startDate,
     endDate = this.endDate,
-    lastUpdate = this.lastUpdate.toLocalDateTime(),
-    labelVersion = this.labelVersion
+    lastUpdate = this.lastUpdate.toLocalDateTime()
   )
 
 }
@@ -85,8 +83,7 @@ object ApiDocument {
       (JsPath \ "lastActiveUser").formatNullable[String] and
       (JsPath \ "meta").formatNullable(Format(Reads { x =>
         JsSuccess(Json.stringify(x))
-      }, Writes[String](Json.parse))) and
-      (JsPath \ "labelVersion").format[Int]
+      }, Writes[String](Json.parse)))
   )(ApiDocument.apply, unlift(ApiDocument.unapply))
 
   def fromDomain(document: Document): ApiDocument = {
@@ -107,8 +104,7 @@ object ApiDocument {
       assignee = document.assignee.map(_.id),
       previousAssignee = document.previousAssignee.map(_.id),
       lastActiveUser = document.lastActiveUserId.map(_.id),
-      meta = document.meta.map(meta => JsonSerializer.serialize(meta.content)),
-      labelVersion = document.labelVersion
+      meta = document.meta.map(meta => JsonSerializer.serialize(meta.content))
     )
   }
 }
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiPartialDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiPartialDocument.scala
index ecbdaed..032ddf6 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiPartialDocument.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiPartialDocument.scala
@@ -47,8 +47,7 @@ final case class ApiPartialDocument(recordId: Option[Long],
     meta = meta.cata(x => Some(TextJson(JsonSerializer.deserialize[Meta](x))), None, orig.meta),
     startDate = startDate.cata(Some(_), None, orig.startDate),
     endDate = endDate.cata(Some(_), None, orig.endDate),
-    lastUpdate = LocalDateTime.MIN, // Should update internally in a business logic module,
-    labelVersion = orig.labelVersion
+    lastUpdate = LocalDateTime.MIN // Should update internally in a business logic module
   )
 
   def toDomain: Try[Document] = Try {
@@ -76,8 +75,7 @@ final case class ApiPartialDocument(recordId: Option[Long],
         assignee = None,
         previousAssignee = None,
         lastActiveUserId = None,
-        lastUpdate = LocalDateTime.MIN,
-        labelVersion = 0
+        lastUpdate = LocalDateTime.MIN
       )
     } else {
       throw new JsonValidationException(validationErrors)
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala
index 795a996..69e8b75 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala
@@ -126,8 +126,7 @@ object document {
         "previousAssignee" -> document.previousAssignee.toJson,
         "meta"             -> document.meta.toJson,
         "lastActiveUser"   -> document.lastActiveUserId.toJson,
-        "lastUpdate"       -> document.lastUpdate.toJson,
-        "labelVersion"     -> document.labelVersion.toJson
+        "lastUpdate"       -> document.lastUpdate.toJson
       )
 
     override def read(json: JsValue): Document = json match {
@@ -186,8 +185,7 @@ object document {
           assignee = None,
           previousAssignee = None,
           lastActiveUserId = None,
-          lastUpdate = LocalDateTime.MIN,
-          labelVersion = 0
+          lastUpdate = LocalDateTime.MIN
         )
 
       case _ => deserializationError(s"Expected Json Object as Document, but got $json")
-- 
cgit v1.2.3