diff options
author | vlad <vlad@driver.xyz> | 2017-07-01 04:50:38 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-07-01 04:50:38 -0700 |
commit | 05543fd8a5a4fb9a63843bde9ec124d623f1c094 (patch) | |
tree | fd70fe49053d91592e05f63a7664166e4dad063f /src/main/scala/xyz/driver/pdsuidomain/formats | |
parent | 6a198a9da5a4fbdc94b008b743246c1b0ab2c3dc (diff) | |
download | rest-query-05543fd8a5a4fb9a63843bde9ec124d623f1c094.tar.gz rest-query-05543fd8a5a4fb9a63843bde9ec124d623f1c094.tar.bz2 rest-query-05543fd8a5a4fb9a63843bde9ec124d623f1c094.zip |
Moving storages back and adding ListResponse herev0.1.17
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/ListResponse.scala | 54 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala | 2 |
2 files changed, 55 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/ListResponse.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/ListResponse.scala new file mode 100644 index 0000000..9faa77f --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/ListResponse.scala @@ -0,0 +1,54 @@ +package xyz.driver.pdsuidomain.formats.json + +import java.time.LocalDateTime + +import xyz.driver.pdsuicommon.db.Pagination +import xyz.driver.pdsuicommon.json.Serialization.seqJsonFormat +import play.api.libs.functional.syntax._ +import play.api.libs.json._ + +case class ListResponse[+T](items: Seq[T], meta: ListResponse.Meta) + +object ListResponse { + + case class Meta(itemsCount: Int, pageNumber: Int, pageSize: Int, lastUpdate: Option[LocalDateTime]) + + object Meta { + def apply(itemsCount: Int, pagination: Pagination, lastUpdate: Option[LocalDateTime]): Meta = { + Meta(itemsCount, pagination.pageNumber, pagination.pageSize, lastUpdate) + } + } + + private val listResponseMetaJsonReads: Reads[Meta] = { + ((JsPath \ "itemsCount").read[Int] and + (JsPath \ "pageNumber").read[Int] and + (JsPath \ "pageSize").read[Int] and + (JsPath \ "lastUpdate").readNullable[LocalDateTime] + ).apply { (itemsCount: Int, pageNumber: Int, pageSize: Int, lastUpdate: Option[LocalDateTime]) => + Meta(itemsCount, pageNumber, pageSize, lastUpdate) + } + } + + implicit val listResponseMetaJsonWrites: Writes[Meta] = ( + (JsPath \ "itemsCount").write[Int] and + (JsPath \ "pageNumber").write[Int] and + (JsPath \ "pageSize").write[Int] and + (JsPath \ "lastUpdate").write[Option[LocalDateTime]] + ) (unlift(Meta.unapply)) + + implicit val listResponseMetaJsonFormat: Format[Meta] = Format( + listResponseMetaJsonReads, + listResponseMetaJsonWrites + ) + + implicit def listResponseJsonWrites[T](implicit f: Writes[T]): Writes[ListResponse[T]] = ( + (JsPath \ "items").write[Seq[T]] and + (JsPath \ "meta").write[Meta] + ) (unlift(ListResponse.unapply[T])) + + implicit def listResponseJsonFormat[T](implicit f: Format[T]): Format[ListResponse[T]] = ( + (JsPath \ "items").format(seqJsonFormat[T]) and + (JsPath \ "meta").format[Meta] + ) (ListResponse.apply[T], unlift(ListResponse.unapply[T])) + +} diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala index dde5fd2..859972c 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocument.scala @@ -30,7 +30,7 @@ object ApiDocument { private val statusFormat = Format( Reads.StringReads.filter(ValidationError("unknown status")) { case x if Document.Status.fromString.isDefinedAt(x) => true - case _ => false + case _ => false }, Writes.StringWrites ) |