deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

inject light user API into notify JSON handlers

Browse source
This commit is contained in:
Thibault Duplessis 2016-05-31 22:54:05 +02:00
parent 33ebe4a10e
commit fc94564718
5 changed files with 54 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/Notify.scala
View file

@ -8,10 +8,10 @@ import views.html
object Notify extends LilaController { object Notify extends LilaController {
import lila.notify.JSONHandlers._
val env = Env.notifyModule val env = Env.notifyModule
import env.jsonHandlers._
val appMaxNotifications = 10 val appMaxNotifications = 10
def recent = Auth { implicit ctx => def recent = Auth { implicit ctx =>

14
modules/notify/src/main/Env.scala
View file

@ -3,7 +3,11 @@ package lila.notify
import akka.actor.ActorSystem import akka.actor.ActorSystem
import com.typesafe.config.Config import com.typesafe.config.Config
final class Env(db: lila.db.Env, config: Config, system: ActorSystem) { final class Env(
db: lila.db.Env,
config: Config,
getLightUser: lila.common.LightUser.Getter,
system: ActorSystem) {
val settings = new { val settings = new {
val collectionNotifications = config getString "collection.notify" val collectionNotifications = config getString "collection.notify"
@ -12,15 +16,21 @@ final class Env(db: lila.db.Env, config: Config, system: ActorSystem) {
import settings._ import settings._
val jsonHandlers = new JSONHandlers(getLightUser)
private lazy val repo = new NotificationRepo(coll = db(collectionNotifications)) private lazy val repo = new NotificationRepo(coll = db(collectionNotifications))
lazy val notifyApi = new NotifyApi(bus = system.lilaBus, repo = repo) lazy val notifyApi = new NotifyApi(
bus = system.lilaBus,
jsonHandlers = jsonHandlers,
repo = repo)
} }
object Env { object Env {
lazy val current = "notify" boot new Env(db = lila.db.Env.current, lazy val current = "notify" boot new Env(db = lila.db.Env.current,
config = lila.common.PlayApp loadConfig "notify", config = lila.common.PlayApp loadConfig "notify",
getLightUser = lila.user.Env.current.lightUser,
system = lila.common.PlayApp.system) system = lila.common.PlayApp.system)
} }

7
modules/notify/src/main/JsonHandlers.scala
View file

@ -1,11 +1,11 @@
package lila.notify package lila.notify
import play.api.libs.json.{JsValue, Json, Writes}
import lila.common.LightUser import lila.common.LightUser
import lila.user.User import lila.user.User
import play.api.libs.json.{ JsValue, Json, Writes }
final class JSONHandlers(
object JSONHandlers { getLightUser: LightUser.Getter) {
implicit val notificationWrites: Writes[Notification] = new Writes[Notification] { implicit val notificationWrites: Writes[Notification] = new Writes[Notification] {
def writeBody(notificationContent: NotificationContent) = { def writeBody(notificationContent: NotificationContent) = {
@ -44,4 +44,3 @@ object JSONHandlers {
} }
} }

4
modules/notify/src/main/NotificationRepo.scala
View file

@ -25,7 +25,7 @@ private final class NotificationRepo(val coll: Coll) {
"read" -> false, "read" -> false,
"content.type" -> "invitedStudy", "content.type" -> "invitedStudy",
"content.studyId" -> studyId, "content.studyId" -> studyId,
"created" -> $doc("$gt" ->DateTime.now.minusDays(7)) "created" -> $doc("$gt" -> DateTime.now.minusDays(3))
) )
coll.exists(query) coll.exists(query)
@ -37,7 +37,7 @@ private final class NotificationRepo(val coll: Coll) {
"read" -> false, "read" -> false,
"content.type" -> "mention", "content.type" -> "mention",
"content.topicId" -> topicId, "content.topicId" -> topicId,
"created" -> $doc("$gt" ->DateTime.now.minusDays(7)) "created" -> $doc("$gt" -> DateTime.now.minusDays(3))
) )
coll.exists(query) coll.exists(query)

9
modules/notify/src/main/NotifyApi.scala
View file

@ -1,16 +1,19 @@
package lila.notify package lila.notify
import scala.concurrent.Future
import lila.common.paginator.Paginator import lila.common.paginator.Paginator
import lila.db.dsl._ import lila.db.dsl._
import lila.db.paginator.Adapter import lila.db.paginator.Adapter
import lila.hub.actorApi.SendTo import lila.hub.actorApi.SendTo
import lila.memo.AsyncCache import lila.memo.AsyncCache
import scala.concurrent.Future
final class NotifyApi(bus: lila.common.Bus, repo: NotificationRepo) { final class NotifyApi(
bus: lila.common.Bus,
jsonHandlers: JSONHandlers,
repo: NotificationRepo) {
import BSONHandlers.NotificationBSONHandler import BSONHandlers.NotificationBSONHandler
import JSONHandlers._ import jsonHandlers._
def getNotifications(userId: Notification.Notifies, page: Int, perPage: Int): Fu[Paginator[Notification]] = Paginator( def getNotifications(userId: Notification.Notifies, page: Int, perPage: Int): Fu[Paginator[Notification]] = Paginator(
adapter = new Adapter( adapter = new Adapter(