Merge branch 'update-info-request-not-embargoed-query' into develop

mysociety · Oct 11, 2024 · 25142ac · 25142ac
2 parents e18e072 + 84ebf2c
commit 25142ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/app/models/info_request/prominence/not_embargoed_query.rb b/app/models/info_request/prominence/not_embargoed_query.rb
@@ -6,14 +6,7 @@ def initialize(relation = InfoRequest)
       end
 
       def call
-        # Specify an outer join as the default inner join
-        # will not retrieve NULL records which is what we want here
-        @relation
-          .select("info_requests.*")
-            .joins('LEFT OUTER JOIN embargoes
-                    ON embargoes.info_request_id = info_requests.id')
-              .where('embargoes.id IS NULL')
-                .references(:embargoes)
+        @relation.left_joins(:embargo).where(embargoes: { id: nil })
       end
     end
   end

diff --git a/app/models/statistics/leaderboard.rb b/app/models/statistics/leaderboard.rb
@@ -6,7 +6,7 @@ def all_time_requesters
                   joins(:user).
                   merge(User.active).
                   group(:user).
-                  order(count_info_requests_all: :desc).
+                  order(count_all: :desc).
                   limit(10).
                   count
     end
@@ -18,7 +18,7 @@ def last_28_day_requesters
                   joins(:user).
                   merge(User.active).
                   group(:user).
-                  order(count_info_requests_all: :desc).
+                  order(count_all: :desc).
                   limit(10).
                   count
     end