extract order form TreePreloader

Author: santiagoguridi

app/controllers/approvals_controller.rb

@@ -22,7 +22,7 @@ def render_turbo_stream
     if params[:subject_show] == "true"
       @subject = @approvable.subject
     else
-      @subjects = TreePreloader.new.preload.select do |subject|
+      @subjects = TreePreloader.new(Subject.ordered_by_category_and_name).preload.select do |subject|
         current_student.approved?(subject.course) ||
           (!subject.hidden_by_default? && current_student.available?(subject.course))
       end

app/controllers/subject_plans_controller.rb

@@ -26,7 +26,8 @@ def ensure_feature_enabled!
   end
 
   def set_planned_and_not_planned_subjects
-    @planned_subjects, @not_planned_subjects = TreePreloader.new.preload.partition do |subject|
+    @planned_subjects, @not_planned_subjects =
+      TreePreloader.new(Subject.ordered_by_category_and_name).preload.partition do |subject|
       current_student.approved?(subject) || current_user.planned?(subject)
     end
   end

app/controllers/subjects_controller.rb

@@ -1,6 +1,6 @@
 class SubjectsController < ApplicationController
   def index
-    @subjects = TreePreloader.new.preload.select do |subject|
+    @subjects = TreePreloader.new(Subject.ordered_by_category_and_name).preload.select do |subject|
       current_student.approved?(subject.course) ||
         (!subject.hidden_by_default? && current_student.available?(subject.course))
     end
@@ -21,6 +21,7 @@ def all
           .where("lower(unaccent(name)) LIKE lower(unaccent(?))", "%#{params[:search].strip}%")
           .or(Subject.where("lower(unaccent(short_name)) LIKE lower(unaccent(?))", "%#{params[:search].strip}%"))
           .or(Subject.where("lower(code) LIKE lower(?)", "%#{params[:search].strip}%"))
+          .ordered_by_category_and_name
       end
 
     @subjects = TreePreloader.new(subjects).preload

app/services/tree_preloader.rb

@@ -6,7 +6,6 @@ def initialize(subjects = nil)
   def preload
     # rubocop:disable Rails/FindEach
     subjects
-      .ordered_by_category_and_name
       .includes(
         course: :prerequisite_tree,
         exam: :prerequisite_tree