Merge branch 'reindex-user-content' into develop

mysociety · Nov 12, 2021 · f2e5123 · f2e5123
2 parents ab0080e + 2776b0d
commit f2e5123
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -320,17 +320,21 @@ def reindex_referencing_models
     return if no_xapian_reindex == true
     return unless saved_change_to_attribute?(:url_name)
 
+    expire_comments
+    expire_requests
+  end
+
+  def expire_requests
+    info_requests.find_each(&:expire)
+  end
+
+  def expire_comments
     comments.find_each do |comment|
+      # TODO: Extract to Comment#expire
       comment.info_request_events.find_each do |info_request_event|
         info_request_event.xapian_mark_needs_index
       end
     end
-
-    info_requests.find_each do |info_request|
-      info_request.info_request_events.find_each do |info_request_event|
-        info_request_event.xapian_mark_needs_index
-      end
-    end
   end
 
   def locale
@@ -453,10 +457,6 @@ def exceeded_limit?
     recent_requests >= AlaveteliConfiguration.max_requests_per_user_per_day
   end
 
-  def expire_requests
-    info_requests.find_each(&:expire)
-  end
-
   def next_request_permitted_at
     return nil if no_limit