diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-12-14 14:52:16 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-14 14:52:16 +0700 |
commit | e082afc2e525c39c4cc5947df5cc1c1be09e0d4b (patch) | |
tree | ea2670f784d5f125894658ebad100354befd1f83 /src/main/scala/xyz/driver | |
parent | 51d5d1ddba83f539405c6d395933e1f8a456c871 (diff) | |
parent | 06a3e067871b436748d0382e4296965ecd32204a (diff) | |
download | rest-query-e082afc2e525c39c4cc5947df5cc1c1be09e0d4b.tar.gz rest-query-e082afc2e525c39c4cc5947df5cc1c1be09e0d4b.tar.bz2 rest-query-e082afc2e525c39c4cc5947df5cc1c1be09e0d4b.zip |
PDSUI-2455 'startPage' and 'endPage' must be Option
Diffstat (limited to 'src/main/scala/xyz/driver')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/documentissue.scala | 12 |
1 files changed, 6 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)), |