From dfdb1c689615ab79bafa4e904dc61a15db3bbffe Mon Sep 17 00:00:00 2001 From: Kseniya Tomskikh Date: Fri, 10 Nov 2017 20:48:44 +0700 Subject: Fixed calculation of eligibility status with "Unknown" value (instead of NULL) --- src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala index 471d345..e9085ec 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala @@ -7,7 +7,6 @@ import com.fasterxml.jackson.core.{JsonGenerator, JsonParser} import com.fasterxml.jackson.databind._ import com.fasterxml.jackson.databind.annotation.{JsonDeserialize, JsonSerialize} import xyz.driver.core.auth.User -import xyz.driver.pdsuicommon.compat.Implicits._ import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils -- cgit v1.2.3 From eae48b0256db8efc6417bede691bf7a1e33ab351 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 13 Nov 2017 20:45:04 -0800 Subject: Fixing Validators --- .../xyz/driver/pdsuidomain/entities/Document.scala | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala index e9085ec..95710be 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala @@ -410,31 +410,31 @@ object Document { val validator: Validator[Document, Document] = { input => for { - typeId <- Validators.nonEmpty("typeId")(input.typeId) + typeId <- Validators.nonEmpty("typeId")(input.typeId).right - providerTypeId <- Validators.nonEmpty("providerTypeId")(input.providerTypeId) + providerTypeId <- Validators.nonEmpty("providerTypeId")(input.providerTypeId).right - institutionName <- Validators.nonEmpty("institutionName")(input.institutionName) + institutionName <- Validators.nonEmpty("institutionName")(input.institutionName).right - meta <- Validators.nonEmpty("meta")(input.meta) + meta <- Validators.nonEmpty("meta")(input.meta).right - startDate <- Validators.nonEmpty("startDate")(input.startDate) + startDate <- Validators.nonEmpty("startDate")(input.startDate).right - isOrderRight <- input.endDate match { + isOrderRight <- (input.endDate match { case Some(endDate) if startDate.isAfter(endDate) => Validators.fail("The start date should be less, than the end one") case _ => Validators.success(true) - } + }).right areDatesInThePast <- { - val dates = List(input.startDate, input.endDate).flatten - val now = LocalDate.now() + val dates = List(input.startDate, input.endDate).flatten + val now = LocalDate.now() val hasInvalid = dates.exists(_.isAfter(now)) if (hasInvalid) Validators.fail("Dates should be in the past") else Validators.success(true) - } + }.right } yield input } -- cgit v1.2.3