From 69e3209c00484c39440bff4e234e29f589d963cf Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Wed, 11 Oct 2017 19:39:17 +0700 Subject: PDSUI-1088 Added labelVersion to documents --- .../scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities') diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala index 0dadc41..cbaa792 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala @@ -67,7 +67,8 @@ object DocumentGen { meta = nextOption(nextDocumentMetaJson()), startDate = dates._1, endDate = dates._2, - lastUpdate = nextLocalDateTime + lastUpdate = nextLocalDateTime, + labelVersion = generators.nextInt(1, 10) ) } -- cgit v1.2.3 From 351b139bdde3d47fb1f13e1f9f839f8d6cd23050 Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Thu, 12 Oct 2017 15:07:50 +0700 Subject: Revert "PDSUI-1088 Added labelVersion to documents" --- .../scala/xyz/driver/pdsuidomain/entities/Document.scala | 3 +-- .../driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala | 3 +-- .../pdsuidomain/formats/json/document/ApiDocument.scala | 12 ++++-------- .../formats/json/document/ApiPartialDocument.scala | 6 ++---- .../pdsuidomain/formats/json/sprayformats/document.scala | 6 ++---- src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala | 3 +-- .../formats/json/sprayformats/DocumentFormatSuite.scala | 5 ++--- 7 files changed, 13 insertions(+), 25 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala index fa5f4ce..258aa03 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala @@ -456,8 +456,7 @@ final case class Document(id: LongId[Document] = LongId(0L), meta: Option[TextJson[Meta]], // not null startDate: Option[LocalDate], // not null endDate: Option[LocalDate], - lastUpdate: LocalDateTime, - labelVersion: Int) { + lastUpdate: LocalDateTime) { import Document.Status._ diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala index cbaa792..0dadc41 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/DocumentGen.scala @@ -67,8 +67,7 @@ object DocumentGen { meta = nextOption(nextDocumentMetaJson()), startDate = dates._1, endDate = dates._2, - lastUpdate = nextLocalDateTime, - labelVersion = generators.nextInt(1, 10) + lastUpdate = nextLocalDateTime ) } 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") diff --git a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala index 915e4e7..7d8a418 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/DocumentSuite.scala @@ -82,8 +82,7 @@ class DocumentSuite extends BaseSuite { startDate = Some(lastUpdate.toLocalDate.minusDays(2)), endDate = None, lastUpdate = lastUpdate, - meta = Some(TextJson(Document.Meta(1.1, 2.2))), - labelVersion = 1 + meta = Some(TextJson(Document.Meta(1.1, 2.2))) ) } } diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala index 111da6e..e6dd4a1 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/DocumentFormatSuite.scala @@ -28,15 +28,14 @@ class DocumentFormatSuite extends FlatSpec with Matchers { requiredType = Some(Document.RequiredType.OPN), meta = None, startDate = None, - endDate = None, - labelVersion = 0 + endDate = None ) val writtenJson = documentFormat.write(orig) writtenJson should be( """{"id":1,"recordId":101,"physician":"physician","typeId":10,"provider":"provider 21","providerTypeId":21, "requiredType":"OPN","institutionName":"institution name","startDate":null,"endDate":null,"status":"New","assignee":null,"previousStatus":null, - "previousAssignee":null,"lastActiveUser":null,"lastUpdate":"2017-08-10T18:00Z","meta":null,"labelVersion":0}""".parseJson) + "previousAssignee":null,"lastActiveUser":null,"lastUpdate":"2017-08-10T18:00Z","meta":null}""".parseJson) val createDocumentJson = """{"recordId":101,"physician":"physician","typeId":10,"provider":"provider 21","providerTypeId":21}""".parseJson -- cgit v1.2.3 From 623289020c91dfd4cb38ce23cac77d735b31c3be Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Thu, 12 Oct 2017 15:14:52 +0700 Subject: Fixed fake medical record entity error --- .../xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities') diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala index eb475b4..0ff0c3b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/rep/MedicalRecordGen.scala @@ -94,7 +94,7 @@ object MedicalRecordGen { physician = nextOption(generators.nextString()), meta = nextOption(nextMedicalRecordMetasJson()), lastUpdate = nextLocalDateTime, - totalPages = nextInt(1, 10) + totalPages = nextInt(10) ) } -- cgit v1.2.3