more DB code rewrite WIP

app/controllers/Account.scala

@@ -5,7 +5,7 @@ import play.api.mvc._, Results._
 import lila.api.Context
 import lila.app._
 import lila.common.LilaCookie
-import lila.db.api.$find
+import lila.db.dsl.$find
 import lila.security.Permission
 import lila.user.tube.userTube
 import lila.user.{ User => UserModel, UserRepo }

app/controllers/User.scala

@@ -7,7 +7,7 @@ import lila.api.{ Context, BodyContext }
 import lila.app._
 import lila.app.mashup.GameFilterMenu
 import lila.common.LilaCookie
-import lila.db.api.$find
+import lila.db.dsl.$find
 import lila.evaluation.{ PlayerAggregateAssessment }
 import lila.game.{ GameRepo, Pov }
 import lila.rating.PerfType

app/mashup/GameFilter.scala

@@ -2,7 +2,7 @@ package lila.app
 package mashup
 
 import lila.common.paginator.Paginator
-import lila.db.api.SortOrder
+import lila.db.dsl.SortOrder
 import lila.game.{ Game, Query, GameRepo }
 import lila.user.User
 

app/mashup/TeamInfo.scala

@@ -3,7 +3,7 @@ package mashup
 
 import scala.concurrent.duration._
 
-import lila.db.api._
+import lila.db.dsl._
 import lila.forum.MiniForumPost
 import lila.game.{ GameRepo, Game }
 import lila.team.tube._

modules/api/src/main/GameApi.scala

@@ -7,7 +7,7 @@ import chess.format.pgn.Pgn
 import lila.analyse.{ AnalysisRepo, Analysis }
 import lila.common.paginator.{ Paginator, PaginatorJson }
 import lila.common.PimpedJson._
-import lila.db.api._
+import lila.db.dsl._
 import lila.db.Implicits._
 import lila.db.paginator.{ BSONAdapter, CachedAdapter }
 import lila.game.BSONHandlers._

modules/api/src/main/PgnDump.scala

@@ -1,7 +1,7 @@
 package lila.api
 
 import chess.format.pgn.{ Pgn, Parser }
-import lila.db.api.$query
+import lila.db.dsl.$query
 import lila.db.Implicits._
 import lila.game.Game
 import lila.game.{ GameRepo, Query }

modules/api/src/main/RatingFest.scala

@@ -4,7 +4,7 @@ import play.api.libs.iteratee._
 import play.api.libs.json.Json
 import reactivemongo.bson._
 
-import lila.db.api._
+import lila.db.dsl._
 import lila.db.Implicits._
 import lila.game.BSONHandlers.gameBSONHandler
 import lila.game.Game.{ BSONFields => G }

modules/api/src/main/UserApi.scala

@@ -3,7 +3,7 @@ package lila.api
 import play.api.libs.json._
 
 import lila.common.PimpedJson._
-import lila.db.api._
+import lila.db.dsl._
 import lila.db.Implicits._
 import lila.game.GameRepo
 import lila.hub.actorApi.{ router => R }

modules/bookmark/src/main/BookmarkApi.scala

@@ -1,6 +1,6 @@
 package lila.bookmark
 
-import lila.db.api._
+import lila.db.dsl._
 import lila.game.tube.gameTube
 import lila.game.{ Game, GameRepo }
 import lila.user.User

modules/bookmark/src/main/BookmarkRepo.scala

@@ -4,7 +4,7 @@ import org.joda.time.DateTime
 import play.api.libs.json._
 import reactivemongo.bson._
 
-import lila.db.api._
+import lila.db.dsl._
 import lila.db.Implicits._
 import tube.bookmarkTube
 

modules/bookmark/src/main/PaginatorBuilder.scala

@@ -5,7 +5,7 @@ import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
 import lila.common.paginator._
 import lila.common.PimpedJson._
-import lila.db.api._
+import lila.db.dsl._
 import lila.db.Implicits._
 import lila.db.paginator._
 import lila.game.{ Game, GameRepo }

modules/coordinate/src/main/CoordinateApi.scala

@@ -1,6 +1,6 @@
 package lila.coordinate
 
-import lila.db.Types.Coll
+import lila.db.dsl.Coll
 import reactivemongo.bson._
 
 final class CoordinateApi(scoreColl: Coll) {

modules/explorer/src/main/Env.scala

@@ -5,13 +5,15 @@ import com.typesafe.config.Config
 
 final class Env(
  config: Config,
+ gameColl: lila.db.dsl.Coll,
  system: ActorSystem) {
 
  private val Endpoint = config getString "endpoint"
  private val MassImportEndpoint = config getString "mass_import.endpoint"
  private val IndexFlow = config getBoolean "index_flow"
 
  private lazy val indexer = new ExplorerIndexer(
+ gameColl = gameColl,
  endpoint = Endpoint,
  massImportEndpoint = MassImportEndpoint)
 
@@ -41,5 +43,6 @@ object Env {
 
  lazy val current = "explorer" boot new Env(
  config = lila.common.PlayApp loadConfig "explorer",
+ gameColl = lila.game.Env.current.gameColl,
  system = lila.common.PlayApp.system)
 }

modules/explorer/src/main/ExplorerIndexer.scala

@@ -10,14 +10,13 @@ import play.api.libs.iteratee._
 import play.api.libs.ws.WS
 import play.api.Play.current
 
-import lila.db.api._
-import lila.db.Implicits._
+import lila.db.dsl._
 import lila.game.BSONHandlers.gameBSONHandler
-import lila.game.tube.gameTube
 import lila.game.{ Game, GameRepo, Query, PgnDump, Player }
 import lila.user.UserRepo
 
 private final class ExplorerIndexer(
+ gameColl: Coll,
  endpoint: String,
  massImportEndpoint: String) {
 
@@ -40,16 +39,15 @@ private final class ExplorerIndexer(
  def apply(sinceStr: String): Funit =
  parseDate(sinceStr).fold(fufail[Unit](s"Invalid date $sinceStr")) { since =>
  logger.info(s"Start indexing since $since")
- val query = $query(
+ val query =
  Query.createdSince(since) ++
  Query.rated ++
  Query.finished ++
  Query.turnsMoreThan(8) ++
  Query.noProvisional ++
  Query.bothRatingsGreaterThan(1501)
- )
  import reactivemongo.api._
- pimpQB(query)
+ gameColl.find($empty)
  .sort(Query.sortChronological)
  .cursor[Game](ReadPreference.secondaryPreferred)
  .enumerate(maxGames, stopOnError = true) &>

modules/forum/src/main/BSONHandlers.scala

@@ -0,0 +1,9 @@
+package lila.forum
+
+private object BSONHandlers {
+
+ import lila.db.BSON.BSONJodaDateTimeHandler
+ implicit val CategBSONHandler = reactivemongo.bson.Macros.handler[Categ]
+ implicit val TopicBSONHandler = reactivemongo.bson.Macros.handler[Topic]
+ implicit val PostBSONHandler = reactivemongo.bson.Macros.handler[Post]
+}

modules/forum/src/main/Categ.scala

@@ -1,7 +1,7 @@
 package lila.forum
 
 case class Categ(
- id: String, // slug
+ _id: String, // slug
  name: String,
  desc: String,
  pos: Int,
@@ -13,6 +13,8 @@ case class Categ(
  nbPostsTroll: Int,
  lastPostIdTroll: String) {
 
+ def id = _id
+
  def nbTopics(troll: Boolean): Int = troll.fold(nbTopicsTroll, nbTopics)
  def nbPosts(troll: Boolean): Int = troll.fold(nbPostsTroll, nbPosts)
  def lastPostId(troll: Boolean): String = troll.fold(lastPostIdTroll, lastPostId)
@@ -31,19 +33,3 @@ case class Categ(
 
  def slug = id
 }
-
-object Categ {
-
- import lila.db.JsTube
- import JsTube.Helpers._
- import play.api.libs.json._
-
- private implicit def topicTube = Topic.tube
-
- private def defaults = Json.obj("team" -> none[String])
-
- private[forum] lazy val tube = JsTube(
- reader = (__.json update merge(defaults)) andThen Json.reads[Categ],
- writer = Json.writes[Categ]
- )
-}

modules/forum/src/main/CategApi.scala

@@ -1,14 +1,14 @@
 package lila.forum
 
 import lila.common.paginator._
-import lila.db.api._
-import lila.db.Implicits._
+import lila.db.dsl._
 import lila.db.paginator._
 import lila.user.{ User, UserContext }
-import tube._
 
 private[forum] final class CategApi(env: Env) {
 
+ import BSONHandlers._
+
  def list(teams: Set[String], troll: Boolean): Fu[List[CategView]] = for {
  categs ← CategRepo withTeams teams
  views ← (categs map { categ =>
@@ -27,7 +27,7 @@ private[forum] final class CategApi(env: Env) {
  def makeTeam(slug: String, name: String): Funit =
  CategRepo.nextPosition flatMap { position =>
  val categ = Categ(
- id = teamSlug(slug),
+ _id = teamSlug(slug),
  name = name,
  desc = "Forum of the team " + name,
  pos = position,
@@ -55,10 +55,10 @@ private[forum] final class CategApi(env: Env) {
  hidden = topic.hidden,
  lang = "en".some,
  categId = categ.id)
- $insert(categ) >>
- $insert(post) >>
- $insert(topic withPost post) >>
- $update(categ withTopic post)
+ env.categColl.insert(categ).void >>
+ env.postColl.insert(post).void >>
+ env.topicColl.insert(topic withPost post).void >>
+ env.categColl.update($id(categ.id), categ withTopic post).void
  }
 
  def show(slug: String, page: Int, troll: Boolean): Fu[Option[(Categ, Paginator[TopicView])]] =
@@ -75,17 +75,17 @@ private[forum] final class CategApi(env: Env) {
  topicIdsTroll = topicsTroll map (_.id)
  nbPostsTroll ← PostRepoTroll countByTopics topicIdsTroll
  lastPostTroll ← PostRepoTroll lastByTopics topicIdsTroll
- _ ← $update(categ.copy(
+ _ ← env.categColl.update($id(categ.id), categ.copy(
  nbTopics = topics.size,
  nbPosts = nbPosts,
  lastPostId = lastPost ?? (_.id),
  nbTopicsTroll = topicsTroll.size,
  nbPostsTroll = nbPostsTroll,
  lastPostIdTroll = lastPostTroll ?? (_.id)
- ))
+ )).void
  } yield ()
 
- def denormalize: Funit = $find.all[Categ] flatMap { categs =>
+ def denormalize: Funit = env.categColl.list[Categ]($empty) flatMap { categs =>
  categs.map(denormalize).sequenceFu
  } void
 }

modules/forum/src/main/CategRepo.scala

@@ -1,27 +1,25 @@
 package lila.forum
 
-import play.api.libs.json.Json
-
-import lila.db.api._
-import lila.db.Implicits._
-import tube.categTube
+import lila.db.dsl._
 
 object CategRepo {
 
- def bySlug(slug: String) = $find byId slug
+ import BSONHandlers.CategBSONHandler
+
+ // dirty
+ private val coll = Env.current.categColl
+
+ def bySlug(slug: String) = coll.byId[Categ](slug)
 
  def withTeams(teams: Set[String]): Fu[List[Categ]] =
- $find($query($or(Seq(
- Json.obj("team" -> $exists(false)),
- Json.obj("team" -> $in(teams))
- ))) sort $sort.asc("pos"))
+ coll.find($or(
+ "team" $exists false,
+ "team" $in teams
+ )).sort($sort asc "pos").cursor[Categ].collect[List]()
 
- def nextPosition: Fu[Int] = $primitive.one(
- $select.all,
- "pos",
- _ sort $sort.desc("pos")
- )(_.asOpt[Int]) map (~_ + 1)
+ def nextPosition: Fu[Int] =
+ coll.primitiveOne[Int]($empty, $sort desc "pos", "pos") map (~_ + 1)
 
  def nbPosts(id: String): Fu[Int] =
- $primitive.one($select(id), "nbPosts")(_.asOpt[Int]) map (~_)
+ coll.primitiveOne[Int]($id(id), "nbPosts") map (~_)
 }

modules/forum/src/main/Env.scala

@@ -55,7 +55,6 @@ final class Env(
  lazy val recent = new Recent(postApi, RecentTtl, RecentNb, PublicCategIds)
 
  def cli = new lila.common.Cli {
- import tube._
  def process = {
  case "forum" :: "denormalize" :: Nil =>
  topicApi.denormalize >> categApi.denormalize inject "Forum denormalized"

modules/forum/src/main/Post.scala

@@ -6,7 +6,7 @@ import ornicar.scalalib.Random
 import lila.user.User
 
 case class Post(
- id: String,
+ _id: String,
  topicId: String,
  categId: String,
  author: Option[String],
@@ -19,6 +19,8 @@ case class Post(
  lang: Option[String],
  createdAt: DateTime) {
 
+ def id = _id
+
  def showAuthor = (author map (_.trim) filter ("" !=)) | User.anonymous
 
  def showUserIdOrAuthor = userId | showAuthor
@@ -43,7 +45,7 @@ object Post {
  lang: Option[String],
  troll: Boolean,
  hidden: Boolean): Post = Post(
- id = Random nextStringUppercase idSize,
+ _id = Random nextStringUppercase idSize,
  topicId = topicId,
  author = author,
  userId = userId,
@@ -55,13 +57,4 @@ object Post {
  hidden = hidden,
  createdAt = DateTime.now,
  categId = categId)
-
- import lila.db.JsTube
- import JsTube.Helpers._
- import play.api.libs.json._
-
- private[forum] lazy val tube = JsTube(
- (__.json update readDate('createdAt)) andThen Json.reads[Post],
- Json.writes[Post] andThen (__.json update writeDate('createdAt))
- )
 }