diff options
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json')
3 files changed, 14 insertions, 7 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala index 1f8c683..fd14f7c 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala @@ -22,7 +22,8 @@ final case class ApiCreateRecord(disease: String, patientId: String, requestId: caseId = None, physician = None, meta = None, - lastUpdate = LocalDateTime.now() + lastUpdate = LocalDateTime.now(), + totalPages = 0 ) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala index fc0a2e7..00441a1 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala @@ -41,7 +41,8 @@ object ApiRecord { (JsPath \ "requestId").format[UUID] and (JsPath \ "meta").format(Format(Reads { x => JsSuccess(Json.stringify(x)) - }, Writes[String](Json.parse))) + }, Writes[String](Json.parse))) and + (JsPath \ "totalPages").format[Int] )(ApiRecord.apply, unlift(ApiRecord.unapply)) def fromDomain(record: MedicalRecord) = ApiRecord( @@ -57,7 +58,8 @@ object ApiRecord { previousAssignee = record.previousAssignee.map(_.id), lastActiveUser = record.lastActiveUserId.map(_.id), requestId = record.requestId.id, - meta = record.meta.map(x => JsonSerializer.serialize(x.content)).getOrElse(emptyMeta) + meta = record.meta.map(x => JsonSerializer.serialize(x.content)).getOrElse(emptyMeta), + totalPages = record.totalPages ) } @@ -73,7 +75,8 @@ final case class ApiRecord(id: Long, previousAssignee: Option[String], lastActiveUser: Option[String], requestId: UUID, - meta: String) { + meta: String, + totalPages: Int) { private def extractStatus(status: String): Status = Status @@ -101,6 +104,7 @@ final case class ApiRecord(id: Long, Some(TextJson(JsonSerializer.deserialize[List[MedicalRecord.Meta]](this.meta))) } }, - lastUpdate = this.lastUpdate.toLocalDateTime() + lastUpdate = this.lastUpdate.toLocalDateTime, + totalPages = 0 ) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala index 65687c1..e8c0b94 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala @@ -172,7 +172,8 @@ object record { "requestId" -> record.requestId.toJson, "meta" -> record.meta.getOrElse(TextJson[List[Meta]](List.empty)).toJson, "lastActiveUser" -> record.lastActiveUserId.toJson, - "lastUpdate" -> record.lastUpdate.toJson + "lastUpdate" -> record.lastUpdate.toJson, + "totalPages" -> record.totalPages.toJson ) override def read(json: JsValue): MedicalRecord = json match { @@ -205,7 +206,8 @@ object record { caseId = None, physician = None, meta = None, - lastUpdate = LocalDateTime.now() + lastUpdate = LocalDateTime.now(), + totalPages = 0 ) case _ => deserializationError(s"Expected Json Object as MedicalRecord, but got $json") |