perf(reference timeline): improve performance of reference timeline e…

…ager loading
Coursemology · Apr 8, 2024 · 950c8ce · 950c8ce
1 parent 805ce69
commit 950c8ce
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/course/assessment/assessments_controller.rb b/app/controllers/course/assessment/assessments_controller.rb
@@ -19,7 +19,7 @@ def index
     @items_hash = @course.lesson_plan_items.where(actable_id: @assessments.pluck(:id),
                                                   actable_type: Course::Assessment.name).
                   preload(actable: :conditions).
-                  with_reference_times_for(current_course_user).
+                  with_reference_times_for(current_course_user, current_course).
                   with_personal_times_for(current_course_user).
                   to_h do |item|
       [item.actable_id, item]

diff --git a/app/controllers/course/courses_controller.rb b/app/controllers/course/courses_controller.rb
@@ -81,7 +81,7 @@ def load_items_with_timeline # rubocop:disable Metrics/CyclomaticComplexity
                 *@assessment_todos&.map { |todo| todo.item.id },
                 *@survey_todos&.map { |todo| todo.item.id }]
     @todo_items_with_timeline_hash = @course.lesson_plan_items.where(id: item_ids).
-                                     with_reference_times_for(current_course_user).
+                                     with_reference_times_for(current_course_user, current_course).
                                      with_personal_times_for(current_course_user).
                                      to_h do |item|
                                        [item.id, item]

diff --git a/app/controllers/course/personal_times_controller.rb b/app/controllers/course/personal_times_controller.rb
@@ -16,7 +16,7 @@ def index
         # Only show for assessments and videos
         @items = @course.lesson_plan_items.where(actable_type: [Course::Assessment.name, Course::Video.name]).
                  ordered_by_date_and_title.
-                 with_reference_times_for(@course_user).
+                 with_reference_times_for(@course_user, @course).
                  with_personal_times_for(@course_user)
 
         render 'index'

diff --git a/app/controllers/course/video/videos_controller.rb b/app/controllers/course/video/videos_controller.rb
@@ -88,7 +88,7 @@ def preload_video_item
     @video_items_hash = @course.lesson_plan_items.where(actable_id: @videos.pluck(:id),
                                                         actable_type: Course::Video.name).
                         preload(actable: :conditions).
-                        with_reference_times_for(current_course_user).
+                        with_reference_times_for(current_course_user, current_course).
                         with_personal_times_for(current_course_user).
                         to_h do |item|
       [item.actable_id, item]

diff --git a/app/models/course/lesson_plan/item.rb b/app/models/course/lesson_plan/item.rb
@@ -79,7 +79,7 @@ class Course::LessonPlan::Item < ApplicationRecord
   # Loads the reference times for `course_user`. If `course_user` is nil, then we load the default reference time for
   # `course`.
   scope :with_reference_times_for, (lambda do |course_user, course = nil|
-    # Can't eager-load if we have no idea who we are eager-loading for
+    # Even if there's no course user, we can eager load if the course is known.
     return if course_user.nil? && course.nil?
 
     default_reference_timeline_id = course_user&.course&.default_reference_timeline&.id ||