From 9bf738070a6588cd731adef5173f586fa52611c8 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 16 Dec 2016 21:04:50 -0500 Subject: Extract Dal traits into new file --- src/main/scala/xyz/driver/core/database/Dal.scala | 59 ++++++++++++++++++++ .../scala/xyz/driver/core/database/database.scala | 63 +--------------------- 2 files changed, 60 insertions(+), 62 deletions(-) create mode 100644 src/main/scala/xyz/driver/core/database/Dal.scala (limited to 'src/main/scala/xyz') diff --git a/src/main/scala/xyz/driver/core/database/Dal.scala b/src/main/scala/xyz/driver/core/database/Dal.scala new file mode 100644 index 0000000..b476c0d --- /dev/null +++ b/src/main/scala/xyz/driver/core/database/Dal.scala @@ -0,0 +1,59 @@ +package xyz.driver.core.database + +import scala.concurrent.{ExecutionContext, Future} + +import scalaz.{ListT, Monad, OptionT} +import scalaz.std.scalaFuture._ + +trait Dal { + protected type T[D] + protected implicit val monadT: Monad[T] + + protected def execute[D](operations: T[D]): Future[D] + protected def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] + protected def execute[D](readOperations: ListT[T, D]): ListT[Future, D] + protected def noAction[V](v: V): T[V] + protected def customAction[R](action: => Future[R]): T[R] +} + +class FutureDal(executionContext: ExecutionContext) extends Dal { + implicit val exec = executionContext + override type T[D] = Future[D] + implicit val monadT = implicitly[Monad[Future]] + + def execute[D](operations: T[D]): Future[D] = operations + def execute[D](operations: OptionT[T, D]): OptionT[Future, D] = OptionT(operations.run) + def execute[D](operations: ListT[T, D]): ListT[Future, D] = ListT(operations.run) + def noAction[V](v: V): T[V] = Future.successful(v) + def customAction[R](action: => Future[R]): T[R] = action +} + +class SlickDal(database: Database, executionContext: ExecutionContext) extends Dal { + import database.profile.api._ + implicit val exec = executionContext + override type T[D] = slick.dbio.DBIO[D] + + implicit protected class QueryOps[+E, U](query: Query[E, U, Seq]) { + def resultT: ListT[T, U] = ListT[T, U](query.result.map(_.toList)) + } + + override implicit val monadT: Monad[T] = new Monad[T] { + override def point[A](a: => A): T[A] = DBIO.successful(a) + override def bind[A, B](fa: T[A])(f: A => T[B]): T[B] = fa.flatMap(f) + } + + override def execute[D](readOperations: T[D]): Future[D] = { + database.database.run(readOperations.transactionally) + } + + override def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] = { + OptionT(database.database.run(readOperations.run.transactionally)) + } + + override def execute[D](readOperations: ListT[T, D]): ListT[Future, D] = { + ListT(database.database.run(readOperations.run.transactionally)) + } + + override def noAction[V](v: V): T[V] = DBIO.successful(v) + override def customAction[R](action: => Future[R]): T[R] = DBIO.from(action) +} diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala index 55b0708..54518c5 100644 --- a/src/main/scala/xyz/driver/core/database/database.scala +++ b/src/main/scala/xyz/driver/core/database/database.scala @@ -1,8 +1,7 @@ package xyz.driver.core -import scala.concurrent.{ExecutionContext, Future} +import scala.concurrent.Future -import scalaz.{Monad, ListT, OptionT} import slick.backend.DatabaseConfig import slick.driver.JdbcProfile import xyz.driver.core.time.Time @@ -62,7 +61,6 @@ package database { } trait DatabaseObject extends ColumnTypes { - def createTables(): Future[Unit] def disconnect(): Unit } @@ -71,63 +69,4 @@ package database { def createTables(): Future[Unit] = Future.successful(()) def disconnect(): Unit = {} } - - trait Dal { - - protected type T[D] - protected implicit val monadT: Monad[T] - - protected def execute[D](operations: T[D]): Future[D] - protected def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] - protected def execute[D](readOperations: ListT[T, D]): ListT[Future, D] - - protected def noAction[V](v: V): T[V] - protected def customAction[R](action: => Future[R]): T[R] - } - - class FutureDal(executionContext: ExecutionContext) extends Dal { - import scalaz.std.scalaFuture._ - - implicit val exec = executionContext - - override type T[D] = Future[D] - implicit val monadT = implicitly[Monad[Future]] - - def execute[D](operations: T[D]): Future[D] = operations - def execute[D](operations: OptionT[T, D]): OptionT[Future, D] = OptionT(operations.run) - def execute[D](operations: ListT[T, D]): ListT[Future, D] = ListT(operations.run) - def noAction[V](v: V): T[V] = Future.successful(v) - def customAction[R](action: => Future[R]): T[R] = action - } - - class SlickDal(database: Database, executionContext: ExecutionContext) extends Dal { - - import database.profile.api._ - implicit val exec = executionContext - override type T[D] = slick.dbio.DBIO[D] - - implicit protected class QueryOps[+E, U](query: Query[E, U, Seq]) { - def resultT: ListT[T, U] = ListT[T, U](query.result.map(_.toList)) - } - - override implicit val monadT: Monad[T] = new Monad[T] { - override def point[A](a: => A): T[A] = DBIO.successful(a) - override def bind[A, B](fa: T[A])(f: A => T[B]): T[B] = fa.flatMap(f) - } - - override def execute[D](readOperations: T[D]): Future[D] = { - database.database.run(readOperations.transactionally) - } - - override def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] = { - OptionT(database.database.run(readOperations.run.transactionally)) - } - - override def execute[D](readOperations: ListT[T, D]): ListT[Future, D] = { - ListT(database.database.run(readOperations.run.transactionally)) - } - - override def noAction[V](v: V): T[V] = DBIO.successful(v) - override def customAction[R](action: => Future[R]): T[R] = DBIO.from(action) - } } -- cgit v1.2.3