From a44956bd099983191251c7575129af281b6172dc Mon Sep 17 00:00:00 2001 From: Gabe Farrell Date: Wed, 10 Apr 2024 14:39:19 -0400 Subject: [PATCH] rename SurveyItemResponse method for clarity --- app/models/report/survey_item.rb | 2 +- app/models/student_response_rate_calculator.rb | 2 +- app/models/survey_item_response.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/report/survey_item.rb b/app/models/report/survey_item.rb index fd8043f1..8a432e98 100644 --- a/app/models/report/survey_item.rb +++ b/app/models/report/survey_item.rb @@ -8,7 +8,7 @@ module Report # Convert they keys in this hash to a hash where the key is the grade # and the value is a set of sufficient survey IDs survey_ids_to_grades = Hash.new - SurveyItemResponse.student_survey_items_with_sufficient_responses_by_grade( + SurveyItemResponse.student_survey_items_with_responses_by_grade( school:, academic_year: ).each do |key, count| diff --git a/app/models/student_response_rate_calculator.rb b/app/models/student_response_rate_calculator.rb index da563e8a..7ac543d7 100644 --- a/app/models/student_response_rate_calculator.rb +++ b/app/models/student_response_rate_calculator.rb @@ -43,7 +43,7 @@ class StudentResponseRateCalculator < ResponseRateCalculator quarter_of_grade = enrollment_by_grade[grade] / 4 threshold = threshold > quarter_of_grade ? quarter_of_grade : threshold - si = SurveyItemResponse.student_survey_items_with_sufficient_responses_by_grade(school:, + si = SurveyItemResponse.student_survey_items_with_responses_by_grade(school:, academic_year:) si = si.reject do |_key, value| value < threshold diff --git a/app/models/survey_item_response.rb b/app/models/survey_item_response.rb index 5e19d084..acdc9407 100644 --- a/app/models/survey_item_response.rb +++ b/app/models/survey_item_response.rb @@ -70,8 +70,8 @@ class SurveyItemResponse < ActiveRecord::Base @teacher_survey_items_with_sufficient_responses[[school, academic_year]] end - def self.student_survey_items_with_sufficient_responses_by_grade(school:, academic_year:) - @student_survey_items_with_sufficient_responses_by_grade ||= Hash.new do |memo, (school, academic_year)| + def self.student_survey_items_with_responses_by_grade(school:, academic_year:) + @student_survey_items_with_responses_by_grade ||= Hash.new do |memo, (school, academic_year)| hash = SurveyItem.joins("inner join survey_item_responses on survey_item_responses.survey_item_id = survey_items.id") .student_survey_items .where("survey_item_responses.school": school, "survey_item_responses.academic_year": academic_year) @@ -80,6 +80,6 @@ class SurveyItemResponse < ActiveRecord::Base memo[[school, academic_year]] = hash end - @student_survey_items_with_sufficient_responses_by_grade[[school, academic_year]] + @student_survey_items_with_responses_by_grade[[school, academic_year]] end end