Merge pull request #90 from drivergroup/zsmith/users-searchv1.6.7

Add slick GetResult type-class instances for core types and offset method to Pagination

2 files changed, 33 insertions, 1 deletions

diff --git a/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala b/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala
new file mode 100644
index 0000000..8293371
--- /dev/null
+++ b/src/main/scala/xyz/driver/core/database/SlickGetResultSupport.scala
@@ -0,0 +1,30 @@
+package xyz.driver.core.database
+
+import slick.jdbc.GetResult
+import xyz.driver.core.date.Date
+import xyz.driver.core.time.Time
+import xyz.driver.core.{Id, Name}
+
+trait SlickGetResultSupport {
+  implicit def GetId[U]: GetResult[Id[U]] =
+    GetResult(r => Id[U](r.nextString()))
+  implicit def GetIdOption[U]: GetResult[Option[Id[U]]] =
+    GetResult(_.nextStringOption().map(Id.apply[U]))
+
+  implicit def GetName[U]: GetResult[Name[U]] =
+    GetResult(r => Name[U](r.nextString()))
+  implicit def GetNameOption[U]: GetResult[Option[Name[U]]] =
+    GetResult(_.nextStringOption().map(Name.apply[U]))
+
+  implicit val GetTime: GetResult[Time] =
+    GetResult(r => Time(r.nextTimestamp.getTime))
+  implicit val GetTimeOption: GetResult[Option[Time]] =
+    GetResult(_.nextTimestampOption().map(t => Time(t.getTime)))
+
+  implicit val GetDate: GetResult[Date] =
+    GetResult(r => sqlDateToDate(r.nextDate()))
+  implicit val GetDateOption: GetResult[Option[Date]] =
+    GetResult(_.nextDateOption().map(sqlDateToDate))
+}
+
+object SlickGetResultSupport extends SlickGetResultSupport
diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala
index 3697d93..03313d1 100644
--- a/src/main/scala/xyz/driver/core/rest/package.scala
+++ b/src/main/scala/xyz/driver/core/rest/package.scala
@@ -33,7 +33,9 @@ trait ServiceTransport {
           implicit mat: Materializer): Future[Unmarshal[ResponseEntity]]
 }
 
-final case class Pagination(pageSize: Int, pageNumber: Int)
+final case class Pagination(pageSize: Int, pageNumber: Int) {
+  def offset: Int = pageSize * pageNumber
+}
 
 object `package` {
   implicit class OptionTRestAdditions[T](optionT: OptionT[Future, T]) {