diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-09 11:58:03 +0700 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-09 11:58:03 +0700 |
| commit | 4513c8913d72736a0133d95503cf17df9190b1e7 (patch) | |
| tree | 3beac03642939333238e71f3d3a4c748c9c90e0f /src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala | |
| parent | 52b5e1a5febc91aa316565fdea309df2b646481e (diff) | |
| download | rest-query-4513c8913d72736a0133d95503cf17df9190b1e7.tar.gz rest-query-4513c8913d72736a0133d95503cf17df9190b1e7.tar.bz2 rest-query-4513c8913d72736a0133d95503cf17df9190b1e7.zip | |
TRIAL-52 Fixed check of intervention for null value of delivery method
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Intervention.scala')
| -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 |