dedup and filter patrons - closes #2108

app/controllers/Plan.scala

@@ -33,7 +33,7 @@ object Plan extends LilaController {
     }
 
   private def renderIndex(email: Option[String], patron: Option[lila.plan.Patron])(implicit ctx: Context): Fu[Result] =
-    Env.plan.api.recentChargeUserIds(40) zip
+    Env.plan.api.recentChargeUserIds(50) zip
       Env.plan.api.topPatronUserIds(120) map {
         case (recentIds, bestIds) =>
           Ok(html.plan.index(

modules/plan/src/main/PlanApi.scala

@@ -203,7 +203,9 @@ final class PlanApi(
   }
 
   private val recentChargeUserIdsCache = AsyncCache[Int, List[User.ID]](
-    f = nb => chargeColl.primitive[User.ID]($empty, sort = $doc("date" -> -1), nb = nb, "userId"),
+    f = nb => chargeColl.primitive[User.ID](
+      $empty, sort = $doc("date" -> -1), nb = nb, "userId"
+    ) flatMap filterUserIds,
     timeToLive = 1 hour)
 
   def recentChargeUserIds(nb: Int): Fu[List[User.ID]] = recentChargeUserIdsCache(nb)
@@ -218,11 +220,19 @@ final class PlanApi(
         Sort(Descending("total")),
         Limit(nb))).map {
         _.documents.flatMap { _.getAs[User.ID]("_id") }
-      },
+      } flatMap filterUserIds,
     timeToLive = 1 hour)
 
   def topPatronUserIds(nb: Int): Fu[List[User.ID]] = topPatronUserIdsCache(nb)
 
+  private def filterUserIds(ids: List[User.ID]): Fu[List[User.ID]] = {
+    val dedup = ids.distinct
+    UserRepo.filterByEnabled(dedup) map { enableds =>
+      val set = enableds.toSet
+      dedup filter set.contains
+    }
+  }
+
   private def addCharge(charge: Charge): Funit =
     chargeColl.insert(charge) >>
       recentChargeUserIdsCache.clear >>

modules/user/src/main/UserRepo.scala

@@ -343,7 +343,10 @@ object UserRepo {
       ).map(~_)
 
   def filterByEngine(userIds: List[String]): Fu[List[String]] =
-    coll.primitive[String]($inIds(userIds) ++ engineSelect(true), F.username)
+    coll.primitive[String]($inIds(userIds) ++ engineSelect(true), F.id)
+
+  def filterByEnabled(userIds: List[String]): Fu[List[String]] =
+    coll.primitive[String]($inIds(userIds) ++ enabledSelect, F.id)
 
   def countEngines(userIds: List[String]): Fu[Int] =
     coll.countSel($inIds(userIds) ++ engineSelect(true))