From 8916779b404b18b874785660603bfcd556405181 Mon Sep 17 00:00:00 2001 From: Gabe Farrell Date: Fri, 10 May 2024 14:00:31 -0400 Subject: [PATCH] Chore: Reduce queries --- app/models/measure.rb | 6 +++--- app/presenters/category_presenter.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/measure.rb b/app/models/measure.rb index 433a6a9e..417c9e5f 100644 --- a/app/models/measure.rb +++ b/app/models/measure.rb @@ -45,15 +45,15 @@ class Measure < ActiveRecord::Base end def includes_teacher_survey_items? - @includes_teacher_survey_items ||= teacher_survey_items.any? + @includes_teacher_survey_items ||= teacher_survey_items.length.positive? end def includes_student_survey_items? - @includes_student_survey_items ||= student_survey_items.any? + @includes_student_survey_items ||= student_survey_items.length.positive? end def includes_admin_data_items? - @includes_admin_data_items ||= admin_data_items.any? + @includes_admin_data_items ||= admin_data_items.length.positive? end def score(school:, academic_year:) diff --git a/app/presenters/category_presenter.rb b/app/presenters/category_presenter.rb index eaaac965..707db708 100644 --- a/app/presenters/category_presenter.rb +++ b/app/presenters/category_presenter.rb @@ -36,7 +36,7 @@ class CategoryPresenter end def subcategories(academic_year:, school:) - @category.subcategories.includes([:measures]).sort_by(&:subcategory_id).map do |subcategory| + @category.subcategories.sort_by(&:subcategory_id).map do |subcategory| SubcategoryPresenter.new( subcategory:, academic_year:,