Improved dashboard querying for TA data in overview graph

Changelog.md

@@ -37,6 +37,7 @@
 - Update Python version to 3.13 in seed autotest schemas (#7388)
 - Rename jupyter notebook content functions and files to generalize to html content (#7391)
 - Update to React v18 (#7392)
+- Fix inefficient TA querying in dashboard graphs (#7420)
 
 ## [v2.6.1]
 

app/controllers/assignments_controller.rb

@@ -374,11 +374,12 @@ def grade_distribution
     grade_distribution = { labels: assignment_labels, datasets: assignment_datasets }
     ta_labels = (0..intervals - 1).map { |i| "#{5 * i}-#{5 * i + 5}" }
     ta_datasets = assignment.tas.map do |ta|
+      grade_distribution_arr = ta.grade_distribution_array(assignment, intervals)
       num_marked_label = t('submissions.how_many_marked',
-                           num_marked: assignment.get_num_marked(ta.id),
-                           num_assigned: assignment.get_num_assigned(ta.id))
+                           num_marked: ta.get_num_marked_from_cache(assignment),
+                           num_assigned: ta.get_num_assigned_from_cache(assignment))
       { label: "#{ta.display_name} (#{num_marked_label})",
-        data: ta.grade_distribution_array(assignment, intervals) }
+        data: grade_distribution_arr }
     end
     json_data = {
       summary: summary,

app/models/ta.rb

@@ -24,14 +24,25 @@ def get_groupings_by_assignment(assignment)
              .includes(:students, :tas, :group, :assignment)
   end
 
+  def marked_result_ids_for(assignment)
+    @total_results ||= {}
+    @total_results[assignment.id] ||= assignment.current_results
+                                                .joins(grouping: :tas)
+                                                .where('roles.id': self.id).to_a
+    @marked_result_ids ||= {}
+    @marked_result_ids[assignment.id] ||= @total_results[assignment.id]
+                                          .select do |result|
+      result.marking_state == Result::MARKING_STATES[:complete]
+    end
+                                            .map(&:id)
+    [@total_results, @marked_result_ids]
+  end
+
   # An array of all the grades for an assignment for this TA.
   # If TAs are assigned to grade criteria, returns just the subtotal
   # for the criteria the TA was assigned.
   def percentage_grades_array(assignment)
-    result_ids = assignment.current_results
-                           .joins(grouping: :tas)
-                           .where(marking_state: Result::MARKING_STATES[:complete], 'roles.id': self.id)
-                           .ids
+    result_ids = marked_result_ids_for(assignment)[1][assignment.id]
 
     if assignment.assign_graders_to_criteria
       criterion_ids = self.criterion_ta_associations.where(assessment_id: assignment.id).pluck(:criterion_id)
@@ -61,6 +72,14 @@ def grade_distribution_array(assignment, intervals = 20)
     distribution
   end
 
+  def get_num_marked_from_cache(assignment)
+    marked_result_ids_for(assignment)[1][assignment.id].size
+  end
+
+  def get_num_assigned_from_cache(assignment)
+    marked_result_ids_for(assignment)[0][assignment.id].size
+  end
+
   private
 
   def create_grader_permission

spec/models/ta_spec.rb

@@ -60,6 +60,83 @@
     end
   end
 
+  describe '#get_num_marked_from_cache' do
+    let(:instructor) { create(:instructor) }
+    let(:ta) { create(:ta) }
+    let(:assignment) { create(:assignment) }
+    let(:grouping1) { create(:grouping_with_inviter_and_submission, assignment: assignment, is_collected: true) }
+    let(:grouping2) { create(:grouping_with_inviter_and_submission, assignment: assignment, is_collected: true) }
+
+    before do
+      create(:complete_result, submission: grouping1.submissions.first)
+      create(:incomplete_result, submission: grouping2.submissions.first)
+      create(:ta_membership, role: ta, grouping: grouping1)
+      create(:ta_membership, role: ta, grouping: grouping2)
+    end
+
+    context 'When user is a TA' do
+      it 'should return the number of marked submissions for groupings associated to them' do
+        expect(ta.get_num_marked_from_cache(assignment)).to eq(assignment.get_num_marked(ta.id))
+      end
+
+      context 'when they are assigned a remark request that is incomplete' do
+        before do
+          create(:remark_result,
+                 submission: grouping1.submissions.first,
+                 marking_state: Result::MARKING_STATES[:incomplete])
+        end
+
+        it 'does not count the remark request as marked' do
+          expect(ta.get_num_marked_from_cache(assignment)).to eq(0)
+        end
+      end
+
+      context 'when they are assigned a remark request that is complete' do
+        before do
+          create(:remark_result,
+                 submission: grouping1.submissions.first,
+                 marking_state: Result::MARKING_STATES[:complete])
+        end
+
+        it 'counts the remark request as marked' do
+          expect(ta.get_num_marked_from_cache(assignment)).to eq(1)
+        end
+      end
+    end
+  end
+
+  describe '#get_num_assigned_from_cache' do
+    let(:instructor) { create(:instructor) }
+    let(:ta) { create(:ta) }
+    let(:ta2) { create(:ta) }
+    let(:assignment) { create(:assignment) }
+    let(:grouping1) { create(:grouping_with_inviter_and_submission, assignment: assignment, is_collected: true) }
+    let(:grouping2) { create(:grouping_with_inviter_and_submission, assignment: assignment, is_collected: true) }
+    let(:grouping3) { create(:grouping_with_inviter_and_submission, assignment: assignment, is_collected: true) }
+    let(:grouping4) { create(:grouping_with_inviter_and_submission, assignment: assignment, is_collected: false) }
+
+    before do
+      create(:complete_result, submission: grouping1.submissions.first)
+      create(:incomplete_result, submission: grouping2.submissions.first)
+      create(:complete_result, submission: grouping3.submissions.first)
+      create(:incomplete_result, submission: grouping4.submissions.first)
+      create(:ta_membership, role: ta, grouping: grouping1)
+      create(:ta_membership, role: ta, grouping: grouping2)
+      create(:ta_membership, role: ta2, grouping: grouping3)
+      create(:ta_membership, role: ta2, grouping: grouping4)
+    end
+
+    context 'When user is a TA' do
+      it 'should return the number of submissions assigned to them' do
+        expect(ta.get_num_assigned_from_cache(assignment)).to eq(assignment.get_num_assigned(ta.id))
+      end
+
+      it 'should not count submissions assigned to another ta' do
+        expect(ta.get_num_assigned_from_cache(assignment)).to eq(2)
+      end
+    end
+  end
+
   context 'Associated grader permission validation' do
     subject { create(:ta) }