From 979d16d518b05c9f702bb526388bd278b9c51cee Mon Sep 17 00:00:00 2001 From: Sergey Nastich Date: Tue, 17 Apr 2018 17:22:13 -0400 Subject: ListResponse and Unmarshallers improvements * Add an alternative `ListResponse` constructor allowing optional pagination * Unmarshal JsStrings from query parameters --- src/main/scala/xyz/driver/core/json.scala | 6 ++++++ src/main/scala/xyz/driver/core/rest/package.scala | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala index 2d912d8..aeb3453 100644 --- a/src/main/scala/xyz/driver/core/json.scala +++ b/src/main/scala/xyz/driver/core/json.scala @@ -34,6 +34,12 @@ object json { } } + implicit def paramUnmarshaller[T](implicit reader: JsonReader[T]): Unmarshaller[String, T] = + Unmarshaller.firstOf( + Unmarshaller.strict((JsString(_: String)) andThen reader.read), + stringToValueUnmarshaller[T] + ) + implicit def idFormat[T]: RootJsonFormat[Id[T]] = new RootJsonFormat[Id[T]] { def write(id: Id[T]) = JsString(id.value) diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala index 385a313..d8f004e 100644 --- a/src/main/scala/xyz/driver/core/rest/package.scala +++ b/src/main/scala/xyz/driver/core/rest/package.scala @@ -44,6 +44,11 @@ final case class ListResponse[+T](items: Seq[T], meta: ListResponse.Meta) object ListResponse { + def apply[T](items: Seq[T], size: Int, pagination: Option[Pagination]): ListResponse[T] = + ListResponse( + items = items, + meta = ListResponse.Meta(size, pagination.fold(1)(_.pageNumber), pagination.fold(size)(_.pageSize))) + final case class Meta(itemsCount: Int, pageNumber: Int, pageSize: Int) object Meta { -- cgit v1.2.3