diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-09-27 17:23:30 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-27 17:23:30 +0700 |
commit | 2d72ce34d6ea12cd863ae0a8747e65bd1d2a1487 (patch) | |
tree | 370967f105524266dc94770863645c314b3c7a03 /src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala | |
parent | 68b02317d9a296da8c4b8e389b726c1a122a5b5e (diff) | |
parent | f10c767bf16f14921a194936188c47dd138ffee7 (diff) | |
download | rest-query-2d72ce34d6ea12cd863ae0a8747e65bd1d2a1487.tar.gz rest-query-2d72ce34d6ea12cd863ae0a8747e65bd1d2a1487.tar.bz2 rest-query-2d72ce34d6ea12cd863ae0a8747e65bd1d2a1487.zip |
Merge pull request #31 from drivergroup/PDSUI-2275v0.3.23
PDSUI-2275 Added delivery methods to intervention type entrypoint
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala index daa28e4..62cb9fa 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/intervention.scala @@ -2,6 +2,7 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats import spray.json._ import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import xyz.driver.pdsuidomain.entities.InterventionType.DeliveryMethod import xyz.driver.pdsuidomain.entities._ object intervention { @@ -119,6 +120,25 @@ object intervention { case _ => deserializationError(s"Expected Json Object as partial Intervention, but got $json") } - implicit val interventionTypeFormat: RootJsonFormat[InterventionType] = jsonFormat2(InterventionType.apply) + implicit val interventionTypeFormat: JsonFormat[InterventionType] = new RootJsonFormat[InterventionType] { + override def read(json: JsValue) = json match { + case JsObject(fields) => + val name = fields + .get("name") + .map(_.convertTo[String]) + .getOrElse(deserializationError(s"Intervention type json object does not contain `name` field: $json")) + + InterventionType.typeFromString(name) + + case _ => deserializationError(s"Expected Json Object as Intervention type, but got $json") + } + + override def write(obj: InterventionType) = + JsObject( + "id" -> obj.id.toJson, + "name" -> obj.name.toJson, + "deliveryMethods" -> obj.deliveryMethods.map(DeliveryMethod.methodToString).toJson + ) + } } |