diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2018-01-09 16:30:20 +0700 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2018-01-09 16:30:20 +0700 |
| commit | 307488eaa7d725979688b26ffbbc57b938870bb7 (patch) | |
| tree | e193a8a98a00eead3aac04ca52b2ba74473d7de0 | |
| parent | ed1ad48ac9f5a03839bbe176b363af6c84220e6b (diff) | |
| parent | d01a88b78638e4638216e0469c11a68a9e57effe (diff) | |
| download | rest-query-307488eaa7d725979688b26ffbbc57b938870bb7.tar.gz rest-query-307488eaa7d725979688b26ffbbc57b938870bb7.tar.bz2 rest-query-307488eaa7d725979688b26ffbbc57b938870bb7.zip | |
Merge branch 'master' into support-service-exceptions
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala | 12 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala index d17a45c..037a3ad 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala @@ -24,14 +24,14 @@ object documentissue { .map(_.convertTo[Boolean]) .getOrElse(deserializationError(s"DocumentIssue json object does not contain `archiveRequired` field: $json")) - val startPage = fields.get("startPage").map(_.convertTo[Double]) - val endPage = fields.get("endPage").map(_.convertTo[Double]) + val startPage = fields.get("startPage").map(_.convertTo[Option[Double]]) + val endPage = fields.get("endPage").map(_.convertTo[Option[Double]]) orig.copy( text = text, archiveRequired = archiveRequired, - startPage = startPage, - endPage = endPage + startPage = startPage.getOrElse(orig.startPage), + endPage = endPage.getOrElse(orig.endPage) ) case _ => deserializationError(s"Expected Json Object as partial DocumentIssue, but got $json") @@ -49,8 +49,8 @@ object documentissue { .getOrElse(deserializationError(s"DocumentIssue json object does not contain `text` field: $json")) val id = fields.get("id").map(_.convertTo[LongId[DocumentIssue]]) - val startPage = fields.get("startPage").map(_.convertTo[Double]) - val endPage = fields.get("endPage").map(_.convertTo[Double]) + val startPage = fields.get("startPage").flatMap(_.convertTo[Option[Double]]) + val endPage = fields.get("endPage").flatMap(_.convertTo[Option[Double]]) DocumentIssue( id = id.getOrElse(LongId(0)), diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala index 300091e..8e67627 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala @@ -125,6 +125,9 @@ trait EligibilityArmService { def getByEligibilityId(armId: LongId[EligibilityArm])( implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetByIdReply] + def deleteByEligibilityIdSlotArmId(armId: LongId[EligibilityArm], slotArmId: LongId[SlotArm])( + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[DeleteReply] + def getBySlotId(armId: LongId[SlotArm], filter: SearchFilterExpr = SearchFilterExpr.Empty, sorting: Option[Sorting] = None, |