diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-09-27 15:50:35 +0700 |
---|---|---|
committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-09-27 15:57:47 +0700 |
commit | 3a9ba980e6ce08361f6f3cdaf6ab2a401101b35c (patch) | |
tree | 19e39abe46b33ab9f0be3731541e77a5df0ce849 /src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention | |
parent | c0ffb2a34240876c16f9ce62205cf257aa6d5991 (diff) | |
download | rest-query-3a9ba980e6ce08361f6f3cdaf6ab2a401101b35c.tar.gz rest-query-3a9ba980e6ce08361f6f3cdaf6ab2a401101b35c.tar.bz2 rest-query-3a9ba980e6ce08361f6f3cdaf6ab2a401101b35c.zip |
PDSUI-2275 Added delivery methods to intervention type entrypoint
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/intervention/ApiInterventionType.scala | 18 |
1 files changed, 12 insertions, 6 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..c28c5b4 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 @@ -4,8 +4,9 @@ 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) } @@ -14,11 +15,16 @@ 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 - ) + def fromDomain(interventionType: InterventionType) = { + val typeMethods = InterventionType.deliveryMethodGroups.getOrElse(interventionType.id, Set.empty[DeliveryMethod]) + ApiInterventionType( + id = interventionType.id.id, + name = interventionType.name, + deliveryMethods = typeMethods.map(DeliveryMethod.methodToString).toList + ) + } } |