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/intervention/ApiInterventionType.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/intervention/ApiInterventionType.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala index ebef225..3db8bfa 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala @@ -2,23 +2,25 @@ package xyz.driver.pdsuidomain.formats.json.intervention import play.api.libs.functional.syntax._ import play.api.libs.json.{Format, JsPath} -import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.InterventionType +import xyz.driver.pdsuidomain.entities.InterventionType.DeliveryMethod -final case class ApiInterventionType(id: Long, name: String) { +final case class ApiInterventionType(id: Long, name: String, deliveryMethods: List[String]) { - def toDomain = InterventionType(id = LongId[InterventionType](id), name = name) + def toDomain = InterventionType.typeFromString(name) } object ApiInterventionType { implicit val format: Format[ApiInterventionType] = ( (JsPath \ "id").format[Long] and - (JsPath \ "name").format[String] + (JsPath \ "name").format[String] and + (JsPath \ "deliveryMethods").format[List[String]] )(ApiInterventionType.apply, unlift(ApiInterventionType.unapply)) def fromDomain(interventionType: InterventionType) = ApiInterventionType( id = interventionType.id.id, - name = interventionType.name + name = interventionType.name, + deliveryMethods = interventionType.deliveryMethods.map(DeliveryMethod.methodToString).toList ) } |