diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index ade6f53d..09176f8d 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -22,7 +22,7 @@ class DashboardController < SqmApplicationController end def presenter_for_measure(measure) - score = SurveyItemResponse.score(measure: measure, school: school, academic_year: academic_year) + score = SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: academic_year) MeasureGraphRowPresenter.new(measure: measure, score: score) end diff --git a/app/models/survey_item_response.rb b/app/models/survey_item_response.rb index 630b5255..8dfb6819 100644 --- a/app/models/survey_item_response.rb +++ b/app/models/survey_item_response.rb @@ -11,7 +11,7 @@ class SurveyItemResponse < ActiveRecord::Base scope :for_teacher_responses_for_measure, ->(measure) { for_measure(measure).where("survey_items.survey_item_id LIKE 't-%'") } scope :for_student_responses_for_measure, ->(measure) { for_measure(measure).where("survey_items.survey_item_id LIKE 's-%'") } - def self.score(measure:, school:, academic_year:) + def self.score_for_measure(measure:, school:, academic_year:) return nil unless SurveyItemResponse.sufficient_data?(measure: measure, school: school, academic_year: academic_year) SurveyItemResponse.for_measure(measure) diff --git a/spec/models/survey_item_response_spec.rb b/spec/models/survey_item_response_spec.rb index 3616c7b4..46bafa48 100644 --- a/spec/models/survey_item_response_spec.rb +++ b/spec/models/survey_item_response_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe SurveyItemResponse, type: :model do - describe '.sufficient_data?' do + describe '.score_for_measure' do let(:measure) { create(:measure) } let(:school) { create(:school) } let(:ay) { create(:academic_year) } @@ -23,7 +23,7 @@ describe SurveyItemResponse, type: :model do end it 'returns the average of the likert scores of the survey items' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to eq 4 + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to eq 4 end end @@ -35,7 +35,7 @@ describe SurveyItemResponse, type: :model do end it 'returns nil' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to be_nil + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to be_nil end end end @@ -55,7 +55,7 @@ describe SurveyItemResponse, type: :model do end it 'returns the average of the likert scores of the survey items' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to eq 3 + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to eq 3 end end @@ -67,7 +67,7 @@ describe SurveyItemResponse, type: :model do end it 'returns nil' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to be_nil + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to be_nil end end end @@ -87,7 +87,7 @@ describe SurveyItemResponse, type: :model do end it 'returns the average of the likert scores of the survey items' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to eq 5 + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to eq 5 end end @@ -102,7 +102,7 @@ describe SurveyItemResponse, type: :model do end it 'returns nil' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to be_nil + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to be_nil end end @@ -117,7 +117,7 @@ describe SurveyItemResponse, type: :model do end it 'returns nil' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to be_nil + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to be_nil end end @@ -132,7 +132,7 @@ describe SurveyItemResponse, type: :model do end it 'returns nil' do - expect(SurveyItemResponse.score(measure: measure, school: school, academic_year: ay)).to be_nil + expect(SurveyItemResponse.score_for_measure(measure: measure, school: school, academic_year: ay)).to be_nil end end end