stats subscriptions rusers.status = 1, 4

publiclab · Jun 3, 2020 · 8b0b3d5 · 8b0b3d5
1 parent 9b469ee
commit 8b0b3d5
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
@@ -1,12 +1,16 @@
 class StatsController < ApplicationController
   def subscriptions
-    @tags = TagSelection
-      .select("DISTINCT tag_selections.tid, tag_selections.user_id")
-      .where(following: true)
-      .joins("INNER JOIN community_tags ON community_tags.tid = tag_selections.tid")
-      .joins("INNER JOIN term_data ON term_data.tid = community_tags.tid")
-      .group("term_data.name")
-      .count
+    @tags = Rails.cache.fetch("stats-subscriptions-query", expires_in: 24.hours) do
+      TagSelection
+        .select("DISTINCT tag_selections.tid, tag_selections.user_id")
+        .where(following: true)
+        .joins("INNER JOIN community_tags ON community_tags.tid = tag_selections.tid")
+        .joins("INNER JOIN term_data ON term_data.tid = community_tags.tid")
+        .group("term_data.name")
+        .joins("INNER JOIN rusers ON rusers.id = tag_selections.user_id")
+        .where("rusers.status = 1 OR rusers.status = 4")
+        .count
+    end
     @tags = @tags.group_by { |_k, v| v / 10 }.sort_by { |k, _v| -k }
   end