aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats
diff options
context:
space:
mode:
authorKseniya Tomskikh <ktomskih@datamonsters.co>2017-10-11 11:32:02 +0700
committerGitHub <noreply@github.com>2017-10-11 11:32:02 +0700
commitbbbcaf35a6081dba24dbb9a9aeb9d25fc2ca60be (patch)
treeb6536d1d2b1730a357ab57fa3b17ec6b53f559c9 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats
parent5943f6c0fc71ebc4717eb6212b3dfcc35711665c (diff)
parent3ad026d3de39a0e04f5f1ea32081d49d9cda21fa (diff)
downloadrest-query-bbbcaf35a6081dba24dbb9a9aeb9d25fc2ca60be.tar.gz
rest-query-bbbcaf35a6081dba24dbb9a9aeb9d25fc2ca60be.tar.bz2
rest-query-bbbcaf35a6081dba24dbb9a9aeb9d25fc2ca60be.zip
Merge pull request #43 from drivergroup/PDSUI-2265v0.8.0
PDSUI-2265 Added info about total pages to medical record
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/record.scala6
1 files changed, 4 insertions, 2 deletions
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")