diff options
author | vlad <vlad@driver.xyz> | 2017-06-30 19:38:37 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-06-30 19:38:37 -0700 |
commit | 96d81a36286e41035ff4068859a3b0f9da924fbc (patch) | |
tree | 8d9f0014140d1f07ca449b56adaba8ccb3d2fc59 /src/main/scala/xyz/driver/pdsuidomain/formats/json/record | |
parent | a997aa6539d1f0af4ab4fc395ff2033335da312a (diff) | |
download | rest-query-96d81a36286e41035ff4068859a3b0f9da924fbc.tar.gz rest-query-96d81a36286e41035ff4068859a3b0f9da924fbc.tar.bz2 rest-query-96d81a36286e41035ff4068859a3b0f9da924fbc.zip |
Latest PDS UI utils including all the domain stuffv0.1.12
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/record')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiCreateRecord.scala | 1 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/record/ApiRecord.scala | 3 |
2 files changed, 4 insertions, 0 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 cee67b2..e96bc81 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 @@ -15,6 +15,7 @@ final case class ApiCreateRecord(disease: String, patientId: String, requestId: previousStatus = None, assignee = None, previousAssignee = None, + lastActiveUserId = None, patientId = UuidId(patientId), requestId = RecordRequestId(requestId), disease = disease, 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 de54a9e..dca441b 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 @@ -17,6 +17,7 @@ final case class ApiRecord(id: Long, previousStatus: Option[String], assignee: Option[Long], previousAssignee: Option[Long], + lastActiveUser: Option[Long], meta: String) object ApiRecord { @@ -39,6 +40,7 @@ object ApiRecord { (JsPath \ "previousStatus").formatNullable(statusFormat) and (JsPath \ "assignee").formatNullable[Long] and (JsPath \ "previousAssignee").formatNullable[Long] and + (JsPath \ "lastActiveUser").formatNullable[Long] and (JsPath \ "meta").format(Format(Reads { x => JsSuccess(Json.stringify(x)) }, Writes[String](Json.parse))) @@ -54,6 +56,7 @@ object ApiRecord { previousStatus = record.previousStatus.map(MedicalRecordStatus.statusToString), assignee = record.assignee.map(_.id), previousAssignee = record.previousAssignee.map(_.id), + lastActiveUser = record.lastActiveUserId.map(_.id), meta = record.meta.map(x => JsonSerializer.serialize(x.content)).getOrElse("[]") ) } |