From 0359dae88a11668bb020591d178b1ba8a6d95083 Mon Sep 17 00:00:00 2001 From: Nelson Jovel Date: Mon, 18 Dec 2023 15:01:33 -0800 Subject: [PATCH] chore: rename counts_by_grade to enrollment_by_grade for clarity --- app/models/report/subcategory.rb | 2 +- app/models/respondent.rb | 4 ++-- app/models/school.rb | 2 +- app/models/student_response_rate_calculator.rb | 4 ++-- .../analyze/graph/column/grouped_bar_column_presenter.rb | 2 +- app/presenters/response_rate_presenter.rb | 4 ++-- app/services/survey_item_values.rb | 4 ++-- spec/models/respondent_spec.rb | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/report/subcategory.rb b/app/models/report/subcategory.rb index 65691233..9c3d1af0 100644 --- a/app/models/report/subcategory.rb +++ b/app/models/report/subcategory.rb @@ -31,7 +31,7 @@ module Report row = [response_rate, subcategory, school, academic_year] - all_grades = respondents.counts_by_grade.keys + all_grades = respondents.enrollment_by_grade.keys grades = "#{all_grades.first}-#{all_grades.last}" mutex.synchronize do data << [school.district.name, diff --git a/app/models/respondent.rb b/app/models/respondent.rb index aad72c21..fb5d3277 100644 --- a/app/models/respondent.rb +++ b/app/models/respondent.rb @@ -6,8 +6,8 @@ class Respondent < ApplicationRecord validates :school, uniqueness: { scope: :academic_year } - def counts_by_grade - @counts_by_grade ||= {}.tap do |row| + def enrollment_by_grade + @enrollment_by_grade ||= {}.tap do |row| attributes = %i[pk k one two three four five six seven eight nine ten eleven twelve] grades = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] attributes.zip(grades).each do |attribute, grade| diff --git a/app/models/school.rb b/app/models/school.rb index 98367218..da12d5e6 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -21,6 +21,6 @@ class School < ApplicationRecord end def grades(academic_year:) - Respondent.find_by(school: self, academic_year:)&.counts_by_grade&.keys || (-1..12).to_a + Respondent.find_by(school: self, academic_year:)&.enrollment_by_grade&.keys || (-1..12).to_a end end diff --git a/app/models/student_response_rate_calculator.rb b/app/models/student_response_rate_calculator.rb index b5068232..f3d928f3 100644 --- a/app/models/student_response_rate_calculator.rb +++ b/app/models/student_response_rate_calculator.rb @@ -30,11 +30,11 @@ class StudentResponseRateCalculator < ResponseRateCalculator end def enrollment_by_grade - @enrollment_by_grade ||= respondents.counts_by_grade + @enrollment_by_grade ||= respondents.enrollment_by_grade end def total_enrollment - respondents.counts_by_grade.sum + respondents.enrollment_by_grade.sum end def survey_items_have_sufficient_responses? diff --git a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb index 37713a6d..8b5736e1 100644 --- a/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb +++ b/app/presenters/analyze/graph/column/grouped_bar_column_presenter.rb @@ -146,7 +146,7 @@ module Analyze end def grades(year_index) - Respondent.find_by(school:, academic_year: academic_years[year_index]).counts_by_grade.keys + Respondent.find_by(school:, academic_year: academic_years[year_index]).enrollment_by_grade.keys end private diff --git a/app/presenters/response_rate_presenter.rb b/app/presenters/response_rate_presenter.rb index 5865ffc6..95d351b1 100644 --- a/app/presenters/response_rate_presenter.rb +++ b/app/presenters/response_rate_presenter.rb @@ -86,7 +86,7 @@ class ResponseRatePresenter .pluck(:grade) .reject(&:nil?) .map do |grade| - respondents.counts_by_grade[grade] + respondents.enrollment_by_grade[grade] end.sum.to_f end @@ -95,6 +95,6 @@ class ResponseRatePresenter end def grades - respondents.counts_by_grade.keys + respondents.enrollment_by_grade.keys end end diff --git a/app/services/survey_item_values.rb b/app/services/survey_item_values.rb index 5efe5626..7669aff0 100644 --- a/app/services/survey_item_values.rb +++ b/app/services/survey_item_values.rb @@ -288,8 +288,8 @@ class SurveyItemValues return true if respondent_type == :teacher respondents = Respondent.where(school:, academic_year:).first - if respondents.present? && respondents.counts_by_grade[grade].present? - enrollment = respondents.counts_by_grade[grade] + if respondents.present? && respondents.enrollment_by_grade[grade].present? + enrollment = respondents.enrollment_by_grade[grade] end return false if enrollment.nil? diff --git a/spec/models/respondent_spec.rb b/spec/models/respondent_spec.rb index 265e0f0c..d9277dcc 100644 --- a/spec/models/respondent_spec.rb +++ b/spec/models/respondent_spec.rb @@ -8,9 +8,9 @@ RSpec.describe Respondent, type: :model do context 'when the student respondents include one or more counts for the number of respondents' do it 'returns a hash with only the grades that have a non-zero count of students' do expect(single_grade_of_respondents.one).to eq(10) - expect(single_grade_of_respondents.counts_by_grade).to eq({ 1 => 10 }) - expect(two_grades_of_respondents.counts_by_grade).to eq({ -1 => 10, 0 => 5 }) - expect(three_grades_of_respondents.counts_by_grade).to eq({ 1 => 10, 2 => 5, 12 => 6 }) + expect(single_grade_of_respondents.enrollment_by_grade).to eq({ 1 => 10 }) + expect(two_grades_of_respondents.enrollment_by_grade).to eq({ -1 => 10, 0 => 5 }) + expect(three_grades_of_respondents.enrollment_by_grade).to eq({ 1 => 10, 2 => 5, 12 => 6 }) end end end