3 files changed, 65 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/DbIo.scala b/src/main/scala/xyz/driver/pdsuicommon/db/DbIo.scala
new file mode 100644
index 0000000..7c290d1
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/DbIo.scala
@@ -0,0 +1,13 @@
+package xyz.driver.pdsuicommon.db
+
+import scala.concurrent.Future
+
+/**
+  * Where queries should run
+  */
+trait DbIo {
+  def runAsync[T](f: => T): Future[T]
+  def runSync[T](f: => T): T = f
+  def runAsyncTx[T](f: => T): Future[T]
+  def runSyncTx[T](f: => T): Unit
+}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/JdbcDbIo.scala b/src/main/scala/xyz/driver/pdsuicommon/db/JdbcDbIo.scala
new file mode 100644
index 0000000..44f177c
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/JdbcDbIo.scala
@@ -0,0 +1,28 @@
+package xyz.driver.pdsuicommon.db
+
+import xyz.driver.pdsuicommon.logging._
+
+import scala.concurrent.Future
+import scala.util.{Failure, Success, Try}
+
+class JdbcDbIo(sqlContext: TransactionalContext) extends DbIo with PhiLogging {
+
+  override def runAsync[T](f: => T): Future[T] = {
+    Future(f)(sqlContext.executionContext)
+  }
+
+  override def runAsyncTx[T](f: => T): Future[T] = {
+    import sqlContext.executionContext
+
+    Future(sqlContext.transaction(f)).andThen {
+      case Failure(e) => logger.error(phi"Can't run a transaction: $e")
+    }
+  }
+
+  override def runSyncTx[T](f: => T): Unit = {
+    Try(sqlContext.transaction(f)) match {
+      case Success(_) =>
+      case Failure(e) => logger.error(phi"Can't run a transaction: $e")
+    }
+  }
+}
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
index bb8d322..0098a64 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/db/PostgresContext.scala
@@ -1,12 +1,15 @@
 package xyz.driver.pdsuicommon.db
 
 import java.io.Closeable
+import java.time.{LocalDateTime, ZoneOffset}
+import java.util.UUID
 import java.util.concurrent.Executors
 import javax.sql.DataSource
 
 import io.getquill._
 import xyz.driver.pdsuicommon.concurrent.MdcExecutionContext
 import xyz.driver.pdsuicommon.db.PostgresContext.Settings
+import xyz.driver.pdsuicommon.domain.UuidId
 import xyz.driver.pdsuicommon.logging._
 
 import scala.concurrent.ExecutionContext
@@ -45,4 +48,25 @@ class PostgresContext(val dataSource: DataSource with Closeable, settings: Setti
     super.close()
     tpe.shutdownNow()
   }
+
+  /**
+    * Usable for QueryBuilder's extractors
+    */
+  def timestampToLocalDateTime(timestamp: java.sql.Timestamp): LocalDateTime = {
+    LocalDateTime.ofInstant(timestamp.toInstant, ZoneOffset.UTC)
+  }
+
+  implicit def encodeUuidId[T] = MappedEncoding[UuidId[T], String](_.toString)
+  implicit def decodeUuidId[T] = MappedEncoding[String, UuidId[T]] { uuid =>
+    UuidId[T](UUID.fromString(uuid))
+  }
+
+  def decodeOptUuidId[T] = MappedEncoding[Option[String], Option[UuidId[T]]] {
+    case Some(x) => Option(x).map(y => UuidId[T](UUID.fromString(y)))
+    case None    => None
+  }
+
+  implicit def decodeUuid[T] = MappedEncoding[String, UUID] { uuid =>
+    UUID.fromString(uuid)
+  }
 }