diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-05 14:56:08 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 14:56:08 +0700 |
commit | 98dd8b171aee84c88754ea1a8ec20524ad579d7c (patch) | |
tree | 8d6983473c12c4bbdff3fdc1b22e64feb82b0993 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats | |
parent | 7d6376873a5bdeca2c9a67f0a0db99faa78b5967 (diff) | |
parent | 6f4de1ccfb6efe8f9ddbaec6551a9138a6efa6f8 (diff) | |
download | rest-query-98dd8b171aee84c88754ea1a8ec20524ad579d7c.tar.gz rest-query-98dd8b171aee84c88754ea1a8ec20524ad579d7c.tar.bz2 rest-query-98dd8b171aee84c88754ea1a8ec20524ad579d7c.zip |
Merge pull request #39 from drivergroup/PDSUI-2268
PDSUI-2268 Added institution field to document
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/document.scala | 12 |
1 files changed, 12 insertions, 0 deletions
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 99ec749..6c33fe5 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 @@ -73,6 +73,11 @@ object document { .map(_.convertTo[Option[LongId[ProviderType]]]) .getOrElse(orig.providerTypeId) + val institutionName = fields + .get("institutionName") + .map(_.convertTo[Option[String]]) + .getOrElse(orig.institutionName) + val meta = fields .get("meta") .map(_.convertTo[Option[TextJson[Meta]]]) @@ -93,6 +98,7 @@ object document { typeId = typeId, providerName = provider, providerTypeId = providerTypeId, + institutionName = institutionName, meta = meta, startDate = startDate, endDate = endDate @@ -111,6 +117,7 @@ object document { "provider" -> document.providerName.toJson, "providerTypeId" -> document.providerTypeId.toJson, "requiredType" -> document.requiredType.toJson, + "institutionName" -> document.institutionName.toJson, "startDate" -> document.startDate.toJson, "endDate" -> document.endDate.toJson, "status" -> document.status.toJson, @@ -145,6 +152,10 @@ object document { .get("providerTypeId") .map(_.convertTo[LongId[ProviderType]]) + val institutionName = fields + .get("institutionName") + .map(_.convertTo[String]) + val meta = fields .get("meta") .map(_.convertTo[TextJson[Meta]]) @@ -168,6 +179,7 @@ object document { providerName = provider, providerTypeId = providerTypeId, requiredType = None, + institutionName = institutionName, meta = meta, previousStatus = None, assignee = None, |