upgrade to latest reactive mongo
parent
e01c93c332
commit
e051f0a009
|
@ -6,7 +6,7 @@ import tube.bookmarkTube
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
import scala.concurrent.Future
|
import scala.concurrent.Future
|
||||||
|
|
|
@ -10,7 +10,7 @@ import lila.db.api._
|
||||||
import tube.bookmarkTube
|
import tube.bookmarkTube
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
|
|
||||||
final class PaginatorBuilder(maxPerPage: Int) {
|
final class PaginatorBuilder(maxPerPage: Int) {
|
||||||
|
|
|
@ -6,7 +6,7 @@ import play.api.libs.json._
|
||||||
import play.api.libs.functional.syntax._
|
import play.api.libs.functional.syntax._
|
||||||
import Reads.constraints._
|
import Reads.constraints._
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
trait InColl[A] { implicit def coll: Types.Coll }
|
trait InColl[A] { implicit def coll: Types.Coll }
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ import Types._
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import reactivemongo.core.commands.Count
|
import reactivemongo.core.commands.Count
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
object $count {
|
object $count {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Implicits._
|
import Implicits._
|
||||||
|
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import scalaz.{ OptionT, OptionTs }
|
import scalaz.{ OptionT, OptionTs }
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types.Coll
|
import Types.Coll
|
||||||
|
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
object $insert {
|
object $insert {
|
||||||
|
|
|
@ -5,6 +5,7 @@ import play.api.libs.json._
|
||||||
import Json.JsValueWrapper
|
import Json.JsValueWrapper
|
||||||
|
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
|
import play.modules.reactivemongo.json.BSONFormats
|
||||||
|
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
|
|
||||||
|
@ -31,8 +32,9 @@ trait $operator {
|
||||||
|
|
||||||
def $or[A: Writes](conditions: A) = Json.obj("$or" -> conditions)
|
def $or[A: Writes](conditions: A) = Json.obj("$or" -> conditions)
|
||||||
|
|
||||||
def $reg(value: String, flags: String = "") = BSONRegex(value, flags)
|
def $regex(value: String, flags: String = "") = BSONFormats toJSON BSONRegex(value, flags)
|
||||||
def $date(value: DateTime) = Json.obj("$date" -> value.getMillis)
|
|
||||||
|
def $date(value: DateTime) = BSONFormats toJSON BSONDateTime(value.getMillis)
|
||||||
|
|
||||||
private def wrap[K, V: Writes](pairs: Seq[(K, V)]): Seq[(K, JsValueWrapper)] = pairs map {
|
private def wrap[K, V: Writes](pairs: Seq[(K, V)]): Seq[(K, JsValueWrapper)] = pairs map {
|
||||||
case (k, v) ⇒ k -> Json.toJsFieldJsValueWrapper(v)
|
case (k, v) ⇒ k -> Json.toJsFieldJsValueWrapper(v)
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types._
|
import Types._
|
||||||
|
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
object $primitive {
|
object $primitive {
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types._
|
import Types._
|
||||||
|
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
object $projection {
|
object $projection {
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types._
|
import Types._
|
||||||
|
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
object $query {
|
object $query {
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types._
|
import Types._
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
object $remove {
|
object $remove {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types._
|
import Types._
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
object $save {
|
object $save {
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import Implicits._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import Json.JsValueWrapper
|
import Json.JsValueWrapper
|
||||||
|
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
import reactivemongo.api._
|
import reactivemongo.api._
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
|
|
|
@ -4,7 +4,7 @@ package api
|
||||||
import Types._
|
import Types._
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
object $update {
|
object $update {
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ class DateTest extends Specification {
|
||||||
|
|
||||||
val date = DateTime.now
|
val date = DateTime.now
|
||||||
import api.Free._
|
import api.Free._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
"date conversion" should {
|
"date conversion" should {
|
||||||
"js to bson" in {
|
"js to bson" in {
|
||||||
|
|
|
@ -6,7 +6,7 @@ import tube.pgnTube
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
object PgnRepo {
|
object PgnRepo {
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,8 @@ import lila.db.api._
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
import reactivemongo.api._
|
import reactivemongo.api._
|
||||||
import reactivemongo.bson._
|
|
||||||
import play.modules.reactivemongo.MongoJSONHelpers.RegEx
|
import scala.util.matching.Regex
|
||||||
|
|
||||||
private[lobby] object MessageRepo {
|
private[lobby] object MessageRepo {
|
||||||
|
|
||||||
|
@ -18,9 +18,9 @@ private[lobby] object MessageRepo {
|
||||||
def censorUsername(userId: String): Funit =
|
def censorUsername(userId: String): Funit =
|
||||||
$update(Json.obj("userId" -> userId), $set("text" -> ""), multi = true)
|
$update(Json.obj("userId" -> userId), $set("text" -> ""), multi = true)
|
||||||
|
|
||||||
def removeRegex(regex: scala.util.matching.Regex): Funit =
|
def removeRegex(regex: Regex): Funit =
|
||||||
$update(
|
$update(
|
||||||
Json.obj("text" -> RegEx(regex.toString)),
|
Json.obj("text" -> $regex(regex.toString)),
|
||||||
$set("text" -> ""),
|
$set("text" -> ""),
|
||||||
multi = true)
|
multi = true)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ package lila.monitor
|
||||||
import reactivemongo.core.commands.Status
|
import reactivemongo.core.commands.Status
|
||||||
import reactivemongo.api.DB
|
import reactivemongo.api.DB
|
||||||
import reactivemongo.bson._
|
import reactivemongo.bson._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
import play.api.libs.json.JsObject
|
import play.api.libs.json.JsObject
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import scala.concurrent.duration._
|
||||||
import play.api.mvc.{ RequestHeader, Handler, Action, Cookies }
|
import play.api.mvc.{ RequestHeader, Handler, Action, Cookies }
|
||||||
import play.api.mvc.Results.Redirect
|
import play.api.mvc.Results.Redirect
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
import spray.caching.{ LruCache, Cache }
|
import spray.caching.{ LruCache, Cache }
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
import ornicar.scalalib.Random
|
import ornicar.scalalib.Random
|
||||||
|
|
|
@ -9,7 +9,7 @@ import tube.storeTube
|
||||||
import play.api.mvc.RequestHeader
|
import play.api.mvc.RequestHeader
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
import scala.concurrent.Future
|
import scala.concurrent.Future
|
||||||
|
|
|
@ -7,7 +7,7 @@ import tube.historyTube
|
||||||
|
|
||||||
import play.api.libs.json._
|
import play.api.libs.json._
|
||||||
|
|
||||||
import play.modules.reactivemongo.Implicits._
|
import play.modules.reactivemongo.json.ImplicitBSONHandlers._
|
||||||
|
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
|
|
||||||
|
|
|
@ -7,9 +7,6 @@ import tube.userTube
|
||||||
import play.api.libs.json.Json
|
import play.api.libs.json.Json
|
||||||
|
|
||||||
import reactivemongo.api._
|
import reactivemongo.api._
|
||||||
import reactivemongo.bson._
|
|
||||||
|
|
||||||
import play.modules.reactivemongo.MongoJSONHelpers.RegEx
|
|
||||||
|
|
||||||
import com.roundeights.hasher.Implicits._
|
import com.roundeights.hasher.Implicits._
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
|
@ -99,7 +96,7 @@ object UserRepo {
|
||||||
val escaped = """^([\w-]*).*$""".r.replaceAllIn(normalize(username), m ⇒ quoteReplacement(m group 1))
|
val escaped = """^([\w-]*).*$""".r.replaceAllIn(normalize(username), m ⇒ quoteReplacement(m group 1))
|
||||||
val regex = "^" + escaped + ".*$"
|
val regex = "^" + escaped + ".*$"
|
||||||
$primitive(
|
$primitive(
|
||||||
Json.obj("_id" -> RegEx(regex)),
|
Json.obj("_id" -> $regex(regex)),
|
||||||
"username",
|
"username",
|
||||||
_ sort ("_id" -> $sort.desc) limit max
|
_ sort ("_id" -> $sort.desc) limit max
|
||||||
)(_.asOpt[String])
|
)(_.asOpt[String])
|
||||||
|
|
Loading…
Reference in New Issue