diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-11 11:22:47 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 11:22:47 +0700 |
| commit | 5943f6c0fc71ebc4717eb6212b3dfcc35711665c (patch) | |
| tree | 881948e29231b0485b06b9c7ddd64f85ba606731 | |
| parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
| parent | 4513c8913d72736a0133d95503cf17df9190b1e7 (diff) | |
| download | rest-query-5943f6c0fc71ebc4717eb6212b3dfcc35711665c.tar.gz rest-query-5943f6c0fc71ebc4717eb6212b3dfcc35711665c.tar.bz2 rest-query-5943f6c0fc71ebc4717eb6212b3dfcc35711665c.zip | |
Merge pull request #41 from drivergroup/TRIAL-52
TRIAL-52 Make default 'null' delivery method as 'Unknown'
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala index 9ccc267..cc831cd 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala @@ -208,8 +208,7 @@ final case class Intervention(id: LongId[Intervention], isActive: Boolean, deliveryMethod: Option[String]) { def deliveryMethodIsCorrect: Boolean = { - if (this.typeId.nonEmpty) { - this.deliveryMethod.nonEmpty && + if (this.typeId.nonEmpty && this.deliveryMethod.nonEmpty) { InterventionType.All .getOrElse(this.typeId.get, throw new IllegalArgumentException(s"Not found Intervention type ${this.typeId}")) .deliveryMethods |