Adjust valid duration threshold of short form items

app/services/survey_item_values.rb

@@ -117,7 +117,7 @@ class SurveyItemValues
     valid_duration? && valid_progress? && valid_grade? && valid_sd?
   end
 
-  def survey_type
+  def respondent_type
     return :teacher if headers
                        .filter(&:present?)
                        .filter { |header| header.start_with? 't-' }.count > 0
@@ -125,10 +125,20 @@ class SurveyItemValues
     :student
   end
 
+  def survey_type
+    survey_item_ids = headers
+                      .filter(&:present?)
+                      .filter { |header| header.start_with?('t-', 's-') }
+
+    SurveyItem.survey_type(survey_item_ids:)
+  end
+
   def valid_duration?
     return duration >= 300 if survey_type == :teacher
+    return duration >= 240 if survey_type == :standard
+    return duration >= 100 if survey_type == :short_form
 
-    duration >= 240
+    true
   end
 
   def valid_progress?
@@ -138,7 +148,7 @@ class SurveyItemValues
   def valid_grade?
     return true if grade.nil?
 
-    return true if survey_type == :teacher
+    return true if respondent_type == :teacher
 
     respondents = Respondent.where(school:, academic_year:).first
     if respondents.present? && respondents.counts_by_grade[grade].present?

spec/services/survey_item_values_spec.rb

@@ -1,9 +1,9 @@
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe SurveyItemValues, type: :model do
   let(:headers) do
-    ["StartDate", "EndDate", "Status", "IPAddress", "Progress", "Duration (in seconds)", "Finished", "RecordedDate",
+    ['StartDate', 'EndDate', 'Status', 'IPAddress', 'Progress', 'Duration (in seconds)', 'Finished', 'RecordedDate',
-      "ResponseId", "RecipientLastName", "RecipientFirstName", "RecipientEmail", "ExternalReference", "LocationLatitude", "LocationLongitude", "DistributionChannel", "UserLanguage", "District", "School- Lee", "School- Maynard", "LASID", "Grade", "s-emsa-q1", "s-emsa-q2", "s-emsa-q3", "s-tint-q1", "s-tint-q2", "s-tint-q3", "s-tint-q4", "s-tint-q5", "s-acpr-q1", "s-acpr-q2", "s-acpr-q3", "s-acpr-q4", "s-cure-q1", "s-cure-q2", "s-cure-q3", "s-cure-q4", "s-sten-q1", "s-sten-q2", "s-sten-q3", "s-sper-q1", "s-sper-q2", "s-sper-q3", "s-sper-q4", "s-civp-q1", "s-civp-q2", "s-civp-q3", "s-civp-q4", "s-grmi-q1", "s-grmi-q2", "s-grmi-q3", "s-grmi-q4", "s-appa-q1", "s-appa-q2", "s-appa-q3", "s-peff-q1", "s-peff-q2", "s-peff-q3", "s-peff-q4", "s-peff-q5", "s-peff-q6", "s-sbel-q1", "s-sbel-q2", "s-sbel-q3", "s-sbel-q4", "s-sbel-q5", "s-phys-q1", "s-phys-q2", "s-phys-q3", "s-phys-q4", "s-vale-q1", "s-vale-q2", "s-vale-q3", "s-vale-q4", "s-acst-q1", "s-acst-q2", "s-acst-q3", "s-sust-q1", "s-sust-q2", "s-grit-q1", "s-grit-q2", "s-grit-q3", "s-grit-q4", "s-expa-q1", "s-poaf-q1", "s-poaf-q2", "s-poaf-q3", "s-poaf-q4", "s-tint-q1-1", "s-tint-q2-1", "s-tint-q3-1", "s-tint-q4-1", "s-tint-q5-1", "s-acpr-q1-1", "s-acpr-q2-1", "s-acpr-q3-1", "s-acpr-q4-1", "s-peff-q1-1", "s-peff-q2-1", "s-peff-q3-1", "s-peff-q4-1", "s-peff-q5-1", "s-peff-q6-1", "Gender", "Race"]
+     'ResponseId', 'RecipientLastName', 'RecipientFirstName', 'RecipientEmail', 'ExternalReference', 'LocationLatitude', 'LocationLongitude', 'DistributionChannel', 'UserLanguage', 'District', 'School- Lee', 'School- Maynard', 'LASID', 'Grade', 's-emsa-q1', 's-emsa-q2', 's-emsa-q3', 's-tint-q1', 's-tint-q2', 's-tint-q3', 's-tint-q4', 's-tint-q5', 's-acpr-q1', 's-acpr-q2', 's-acpr-q3', 's-acpr-q4', 's-cure-q1', 's-cure-q2', 's-cure-q3', 's-cure-q4', 's-sten-q1', 's-sten-q2', 's-sten-q3', 's-sper-q1', 's-sper-q2', 's-sper-q3', 's-sper-q4', 's-civp-q1', 's-civp-q2', 's-civp-q3', 's-civp-q4', 's-grmi-q1', 's-grmi-q2', 's-grmi-q3', 's-grmi-q4', 's-appa-q1', 's-appa-q2', 's-appa-q3', 's-peff-q1', 's-peff-q2', 's-peff-q3', 's-peff-q4', 's-peff-q5', 's-peff-q6', 's-sbel-q1', 's-sbel-q2', 's-sbel-q3', 's-sbel-q4', 's-sbel-q5', 's-phys-q1', 's-phys-q2', 's-phys-q3', 's-phys-q4', 's-vale-q1', 's-vale-q2', 's-vale-q3', 's-vale-q4', 's-acst-q1', 's-acst-q2', 's-acst-q3', 's-sust-q1', 's-sust-q2', 's-grit-q1', 's-grit-q2', 's-grit-q3', 's-grit-q4', 's-expa-q1', 's-poaf-q1', 's-poaf-q2', 's-poaf-q3', 's-poaf-q4', 's-tint-q1-1', 's-tint-q2-1', 's-tint-q3-1', 's-tint-q4-1', 's-tint-q5-1', 's-acpr-q1-1', 's-acpr-q2-1', 's-acpr-q3-1', 's-acpr-q4-1', 's-peff-q1-1', 's-peff-q2-1', 's-peff-q3-1', 's-peff-q4-1', 's-peff-q5-1', 's-peff-q6-1', 'Gender', 'Race']
   end
   let(:genders) do
     create(:gender, qualtrics_code: 1)
@@ -16,177 +16,267 @@ RSpec.describe SurveyItemValues, type: :model do
   end
   let(:survey_items) { [] }
   let(:attleboro) do
-    create(:school, name: "Attleboro", dese_id: 1234)
+    create(:school, name: 'Attleboro', dese_id: 1234)
   end
   let(:attleboro_respondents) do
     create(:respondent, school: attleboro, academic_year: ay_2022_23, nine: 40, ten: 40, eleven: 40, twelve: 40)
   end
   let(:schools) { School.school_hash }
-  let(:recorded_date) { "2023-04-01" }
+  let(:recorded_date) { '2023-04-01' }
   let(:ay_2022_23) do
-    create(:academic_year, range: "2022-23")
+    create(:academic_year, range: '2022-23')
   end
 
-  context ".response_date" do
+  let(:common_headers) do
-    it "returns the recorded date" do
+    ['Recorded Date', 'DeseID', 'ResponseID', 'Duration (in seconds)', 'Gender', 'Grade']
-      row = {"RecordedDate" => "2017-01-01"}
+  end
+
+  let(:standard_survey_items) do
+    survey_item_ids = %w[s-peff-q1 s-peff-q2 s-peff-q3 s-peff-q4 s-peff-q5 s-peff-q6 s-phys-q1 s-phys-q2 s-phys-q3 s-phys-q4
+                         s-emsa-q1 s-emsa-q2 s-emsa-q3 s-sbel-q1 s-sbel-q2 s-sbel-q3 s-sbel-q4 s-sbel-q5 s-tint-q1 s-tint-q2
+                         s-tint-q3 s-tint-q4 s-tint-q5 s-vale-q1 s-vale-q2 s-vale-q3 s-vale-q4 s-acpr-q1 s-acpr-q2 s-acpr-q3
+                         s-acpr-q4 s-sust-q1 s-sust-q2 s-cure-q1 s-cure-q2 s-cure-q3 s-cure-q4 s-sten-q1 s-sten-q2 s-sten-q3
+                         s-sper-q1 s-sper-q2 s-sper-q3 s-sper-q4 s-civp-q1 s-civp-q2 s-civp-q3 s-civp-q4 s-grit-q1 s-grit-q2
+                         s-grit-q3 s-grit-q4 s-grmi-q1 s-grmi-q2 s-grmi-q3 s-grmi-q4 s-expa-q1 s-appa-q1 s-appa-q2 s-appa-q3
+                         s-acst-q1 s-acst-q2 s-acst-q3 s-poaf-q1 s-poaf-q2 s-poaf-q3 s-poaf-q4]
+    survey_item_ids.map do |survey_item_id|
+      create(:survey_item, survey_item_id:)
+    end
+    (survey_item_ids << common_headers).flatten
+  end
+
+  let(:short_form_survey_items) do
+    survey_item_ids = [create(:survey_item, survey_item_id: 's-phys-q1', on_short_form: true),
+                       create(:survey_item, survey_item_id: 's-phys-q2', on_short_form: true),
+                       create(:survey_item, survey_item_id: 's-phys-q3',
+                                            on_short_form: true)].map(&:survey_item_id)
+    survey_item_ids.map do |survey_item_id|
+      create(:survey_item, survey_item_id:)
+    end
+    (survey_item_ids << common_headers).flatten
+  end
+
+  let(:early_education_survey_items) do
+    survey_item_ids = [create(:survey_item, survey_item_id: 's-emsa-es1'),
+                       create(:survey_item, survey_item_id: 's-emsa-es2'),
+                       create(:survey_item, survey_item_id: 's-emsa-es3')].map(&:survey_item_id)
+    survey_item_ids.map do |survey_item_id|
+      create(:survey_item, survey_item_id:)
+    end
+    (survey_item_ids << common_headers).flatten
+  end
+
+  let(:teacher_survey_items) do
+    survey_item_ids = %w[t-prep-q1 t-prep-q2 t-prep-q3 t-ieff-q1 t-ieff-q2 t-ieff-q3 t-ieff-q4 t-pcom-q1 t-pcom-q2 t-pcom-q3
+                         t-pcom-q4 t-pcom-q5 t-inle-q1 t-inle-q2 t-inle-q3 t-prtr-q1 t-prtr-q2 t-prtr-q3 t-coll-q1 t-coll-q2
+                         t-coll-q3 t-qupd-q1 t-qupd-q2 t-qupd-q3 t-qupd-q4 t-pvic-q1 t-pvic-q2 t-pvic-q3 t-psup-q1 t-psup-q2
+                         t-psup-q3 t-psup-q4 t-acch-q1 t-acch-q2 t-acch-q3 t-reso-q1 t-reso-q2 t-reso-q3 t-reso-q4 t-reso-q5
+                         t-sust-q1 t-sust-q2 t-sust-q3 t-sust-q4 t-curv-q1 t-curv-q2 t-curv-q3 t-curv-q4 t-cure-q1 t-cure-q2
+                         t-cure-q3 t-cure-q4 t-peng-q1 t-peng-q2 t-peng-q3 t-peng-q4 t-ceng-q1 t-ceng-q2 t-ceng-q3 t-ceng-q4
+                         t-sach-q1 t-sach-q2 t-sach-q3 t-psol-q1 t-psol-q2 t-psol-q3 t-expa-q2 t-expa-q3 t-phya-q2 t-phya-q3]
+
+    survey_item_ids.map do |survey_item_id|
+      create(:survey_item, survey_item_id:)
+    end
+    (survey_item_ids << common_headers).flatten
+  end
+  context '.response_date' do
+    it 'returns the recorded date' do
+      row = { 'RecordedDate' => '2017-01-01' }
       values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-      expect(values.response_date).to eq Date.parse("2017-01-01")
+      expect(values.response_date).to eq Date.parse('2017-01-01')
     end
   end
 
-  context ".school" do
+  context '.school' do
-    it "returns the school that maps to the dese id provided" do
+    it 'returns the school that maps to the dese id provided' do
       attleboro
-      row = {"Dese ID" => "1234"}
+      row = { 'Dese ID' => '1234' }
       values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
       expect(values.school).to eq attleboro
 
-      row = {"DeseID" => "1234"}
+      row = { 'DeseID' => '1234' }
       values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
       expect(values.school).to eq attleboro
     end
   end
 
-  context ".grade" do
+  context '.grade' do
-    it "returns the grade that maps to the grade provided" do
+    it 'returns the grade that maps to the grade provided' do
-      row = {"Grade" => "1"}
+      row = { 'Grade' => '1' }
       values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
       expect(values.grade).to eq 1
     end
   end
-  context ".gender" do
+  context '.gender' do
-    it "returns the grade that maps to the grade provided" do
+    it 'returns the grade that maps to the grade provided' do
-      row = {"Gender" => "1"}
+      row = { 'Gender' => '1' }
       values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
       expect(values.gender.qualtrics_code).to eq 1
     end
   end
 
-  context ".survey_type" do
+  context '.respondent_type' do
-    it "reads header to find the survey type" do
+    it 'reads header to find the survey type' do
       headers = %w[s-sbel-q5 s-phys-q2 RecordedDate]
       values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
-      expect(values.survey_type).to eq :student
+      expect(values.respondent_type).to eq :student
 
       headers = %w[t-sbel-q5 t-phys-q2]
       values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
-      expect(values.survey_type).to eq :teacher
+      expect(values.respondent_type).to eq :teacher
     end
   end
 
-  context ".valid_duration" do
+  context '.survey_type' do
-    context "when duration is valid" do
+    context 'when survey type is standard form' do
-      it "returns true" do
+      it 'returns the survey type' do
-        headers = ["s-sbel-q5", "s-phys-q2", "RecordedDate", "Duration (in seconds)"]
+        headers = standard_survey_items
-        values = SurveyItemValues.new(row: {"Duration (in seconds)" => "240"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
-          schools:)
+        expect(values.survey_type).to eq :standard
+      end
+    end
+    context 'when survey type is teacher form' do
+      it 'returns the survey type' do
+        headers = teacher_survey_items
+        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        expect(values.survey_type).to eq :teacher
+      end
+    end
+
+    context 'when survey type is short form' do
+      it 'returns the survey type' do
+        headers = short_form_survey_items
+        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        expect(values.survey_type).to eq :short_form
+      end
+    end
+
+    context 'when survey type is early education' do
+      it 'returns the survey type' do
+        headers = early_education_survey_items
+        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        expect(values.survey_type).to eq :early_education
+      end
+    end
+  end
+
+  context '.valid_duration' do
+    context 'when duration is valid' do
+      it 'returns true' do
+        headers = standard_survey_items
+        values = SurveyItemValues.new(row: { 'Duration (in seconds)' => '240', 'Gender' => 'Male' }, headers:, genders:, survey_items:,
+                                      schools:)
         expect(values.valid_duration?).to eq true
 
-        headers = ["t-sbel-q5", "t-phys-q2", "Duration (in seconds)"]
+        headers = teacher_survey_items
-        values = SurveyItemValues.new(row: {"Duration (in seconds)" => "300"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'Duration (in seconds)' => '300' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
         expect(values.valid_duration?).to eq true
       end
     end
 
-    context "when duration is invalid" do
+    context 'when duration is invalid' do
-      it "returns false" do
+      it 'returns false' do
-        headers = ["s-sbel-q5", "s-phys-q2", "RecordedDate", "Duration (in seconds)"]
+        headers = standard_survey_items
-        values = SurveyItemValues.new(row: {"Duration (in seconds)" => "239"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'Duration (in seconds)' => '239' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
         expect(values.valid_duration?).to eq false
 
-        headers = ["t-sbel-q5", "t-phys-q2", "Duration (in seconds)"]
+        headers = teacher_survey_items
-        values = SurveyItemValues.new(row: {"Duration (in seconds)" => "299"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'Duration (in seconds)' => '299' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
+        expect(values.valid_duration?).to eq false
+        headers = short_form_survey_items
+        values = SurveyItemValues.new(row: { 'Duration (in seconds)' => '99' }, headers:, genders:, survey_items:,
+                                      schools:)
         expect(values.valid_duration?).to eq false
       end
     end
   end
 
-  context ".valid_progress" do
+  context '.valid_progress' do
-    context "when progress is valid" do
+    context 'when progress is valid' do
-      it "returns true" do
+      it 'returns true' do
         headers = %w[s-sbel-q5 s-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: {"Progress" => "25"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'Progress' => '25' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
         expect(values.valid_progress?).to eq true
       end
     end
 
-    context "when progress is invalid" do
+    context 'when progress is invalid' do
-      it "returns false" do
+      it 'returns false' do
         headers = %w[s-sbel-q5 s-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: {"Progress" => "24"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'Progress' => '24' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
         expect(values.valid_progress?).to eq false
       end
     end
   end
 
-  context ".valid_grade?" do
+  context '.valid_grade?' do
-    context "when grade is valid" do
+    context 'when grade is valid' do
       before :each do
         attleboro
         attleboro_respondents
       end
-      it "returns true for students" do
+      it 'returns true for students' do
         headers = %w[s-sbel-q5 s-phys-q2 grade RecordedDate]
-        values = SurveyItemValues.new(row: {"grade" => "9", "RecordedDate" => recorded_date, "Dese ID" => "1234"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'grade' => '9', 'RecordedDate' => recorded_date, 'Dese ID' => '1234' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
 
         expect(values.valid_grade?).to eq true
       end
-      it "returns true for teachers" do
+      it 'returns true for teachers' do
         headers = %w[t-sbel-q5 t-phys-q2 grade RecordedDate]
-        values = SurveyItemValues.new(row: {"RecordedDate" => recorded_date, "Dese ID" => "1234"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'RecordedDate' => recorded_date, 'Dese ID' => '1234' }, headers:, genders:, survey_items:,
-          schools:)
+                                      schools:)
         expect(values.valid_grade?).to eq true
       end
     end
 
-    context "when grade is invalid" do
+    context 'when grade is invalid' do
       before :each do
         attleboro
         attleboro_respondents
       end
-      it "returns false" do
+      it 'returns false' do
         headers = %w[s-sbel-q5 s-phys-q2 grade RecordedDate]
-        values = SurveyItemValues.new(row: {"grade" => "2", "RecordedDate" => recorded_date, "Dese ID" => "1234"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'grade' => '2', 'RecordedDate' => recorded_date, 'Dese ID' => '1234' }, headers:, genders:, survey_items:,
-          schools: School.school_hash)
+                                      schools: School.school_hash)
         expect(values.valid_grade?).to eq false
       end
     end
   end
 
-  context ".valid_sd?" do
+  context '.valid_sd?' do
-    context "when the standard deviation is valid" do
+    context 'when the standard deviation is valid' do
-      it "returns true for student questions" do
+      it 'returns true for student questions' do
         headers = %w[s-sbel-q5 s-phys-q1 s-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: {"RecordedDate" => recorded_date, "Dese ID" => "1234", "s-sbel-q5" => "1", "s-phys-q1" => "", "s-phys-q2" => "5"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'RecordedDate' => recorded_date, 'Dese ID' => '1234', 's-sbel-q5' => '1', 's-phys-q1' => '', 's-phys-q2' => '5' }, headers:, genders:, survey_items:,
-          schools: School.school_hash)
+                                      schools: School.school_hash)
         expect(values.valid_sd?).to eq true
       end
-      it "returns true for teacher questions" do
+      it 'returns true for teacher questions' do
         headers = %w[t-sbel-q5 t-phys-q2]
-        values = SurveyItemValues.new(row: {"RecordedDate" => recorded_date, "Dese ID" => "1234", "t-sbel-q5" => "1", "t-phys-q2" => "5"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'RecordedDate' => recorded_date, 'Dese ID' => '1234', 't-sbel-q5' => '1', 't-phys-q2' => '5' }, headers:, genders:, survey_items:,
-          schools: School.school_hash)
+                                      schools: School.school_hash)
         expect(values.valid_sd?).to eq true
       end
     end
 
-    context "when the standard deviation is invalid" do
+    context 'when the standard deviation is invalid' do
-      it "returns false for student questions" do
+      it 'returns false for student questions' do
         headers = %w[s-sbel-q5 s-phys-q1 s-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: {"RecordedDate" => recorded_date, "Dese ID" => "1234", "s-sbel-q5" => "1", "s-phys-q2" => "", "s-phys-q2" => "1"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'RecordedDate' => recorded_date, 'Dese ID' => '1234', 's-sbel-q5' => '1', 's-phys-q2' => '', 's-phys-q2' => '1' }, headers:, genders:, survey_items:,
-          schools: School.school_hash)
+                                      schools: School.school_hash)
         expect(values.valid_sd?).to eq false
       end
-      it "returns false for teacher questions" do
+      it 'returns false for teacher questions' do
         headers = %w[t-sbel-q5 t-phys-q1 t-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: {"RecordedDate" => recorded_date, "Dese ID" => "1234", "t-sbel-q5" => "1", "t-phys-q2" => "", "t-phys-q2" => "1"}, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { 'RecordedDate' => recorded_date, 'Dese ID' => '1234', 't-sbel-q5' => '1', 't-phys-q2' => '', 't-phys-q2' => '1' }, headers:, genders:, survey_items:,
-          schools: School.school_hash)
+                                      schools: School.school_hash)
         expect(values.valid_sd?).to eq false
       end
     end