Merge pull request #1815 from codidact/art/category-ordering

Fix ordering of cached collections upon revive

Author: ArtOfCode-

app/controllers/application_controller.rb

@@ -256,9 +256,9 @@ def pull_pinned_links_and_hot_questions
             .joins(:category).where(categories: { use_for_hot_posts: true })
             .where('score >= ?', SiteSetting['HotPostsScoreThreshold'])
             .where.not(id: pinned_post_ids)
-            .order('score DESC').limit(SiteSetting['HotQuestionsCount']).all
+            .limit(SiteSetting['HotQuestionsCount'])
       end
-    end
+    end.order('score DESC')
 
     # eager loading revived collections' used relation to prevent N+1 queries
     @pinned_links = @pinned_links.list_includes
@@ -267,8 +267,8 @@ def pull_pinned_links_and_hot_questions
 
   def pull_categories
     @header_categories = Rails.cache.fetch_collection('header_categories') do
-      Category.all.order(sequence: :asc, id: :asc)
-    end
+      Category.all
+    end.order(sequence: :asc, id: :asc)
   end
 
   def check_if_warning_or_suspension_pending

app/models/post_type.rb

@@ -15,8 +15,8 @@ def reactions
         ReactionType.active.where(post_type: self)
       else
         ReactionType.active.where(post_type: self).or(ReactionType.active.where(post_type: nil))
-      end.order(position: :asc).all
-    end
+      end
+    end.order(position: :asc)
   end
 
   # @return [Boolean] whether the post type is a system type

test/controllers/categories_controller_test.rb

@@ -9,6 +9,22 @@ class CategoriesControllerTest < ActionController::TestCase
     assert_not_nil assigns(:categories)
   end
 
+  test 'homepage should show categories in the correct order' do
+    get :homepage
+    assert_not_nil assigns(:header_categories)
+    seq = 0
+    id = 0
+    assigns(:header_categories).each do |category|
+      if category.sequence.nil?
+        assert category.id > id, "Category #{category.id} not after #{id}"
+      else
+        assert category.sequence >= seq, "Category #{category.id} sequence #{category.sequence} not greater than #{seq}"
+      end
+      seq = category.sequence || seq
+      id = category.id
+    end
+  end
+
   test ':homepage should correctly show the homepage category' do
     get :homepage
     assert_response(:success)

test/fixtures/categories.yml

@@ -7,6 +7,7 @@ main:
     - <%= Article.post_type_id %>
   tag_set: main
   license: cc_by_sa
+  sequence: 1
 
 meta:
   community: sample
@@ -16,6 +17,7 @@ meta:
     - <%= Question.post_type_id %>
   tag_set: meta
   license: cc_by_sa
+  sequence: 2
 
 high_trust:
   community: sample
@@ -26,6 +28,7 @@ high_trust:
   tag_set: main
   min_trust_level: 3
   license: cc_by_sa
+  sequence: 3
 
 admin_only:
   community: sample
@@ -37,6 +40,7 @@ admin_only:
   min_trust_level: 5
   min_view_trust_level: 5
   license: cc_by_sa
+  sequence: 99
 
 articles_only:
   community: sample