From f749b9600694a8a0bf52f16a13e3e68e85fe08ea Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Wed, 31 May 2023 16:57:47 -0700
Subject: [PATCH] update response_date to recorded_date

---
 app/services/survey_item_values.rb       |  6 +++---
 spec/services/cleaner_spec.rb            | 10 +++++-----
 spec/services/survey_item_values_spec.rb |  7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/services/survey_item_values.rb b/app/services/survey_item_values.rb
index fd1b7040..cb3530d4 100644
--- a/app/services/survey_item_values.rb
+++ b/app/services/survey_item_values.rb
@@ -13,15 +13,15 @@ class SurveyItemValues
     dese_id.present?
   end
 
-  def response_date
-    @response_date ||= begin
+  def recorded_date
+    @recorded_date ||= begin
       recorded_date = value_from(pattern: /Recorded\s*Date/i)
       Date.parse(recorded_date)
     end
   end
 
   def academic_year
-    @academic_year ||= AcademicYear.find_by_date response_date
+    @academic_year ||= AcademicYear.find_by_date recorded_date
   end
 
   def survey_item_response(survey_item:)
diff --git a/spec/services/cleaner_spec.rb b/spec/services/cleaner_spec.rb
index 9e625ceb..b01fb4e9 100644
--- a/spec/services/cleaner_spec.rb
+++ b/spec/services/cleaner_spec.rb
@@ -102,7 +102,7 @@ RSpec.describe Cleaner do
           filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
             headers: standard_survey_items, data:
           )
-          expect(filename).to eq 'District1.standard.2022-23.csv'
+          expect(filename).to eq 'district1.standard.2022-23.csv'
         end
 
         context 'when the file is based on short form survey items' do
@@ -114,7 +114,7 @@ RSpec.describe Cleaner do
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: short_form_survey_items, data:
             )
-            expect(filename).to eq 'District1.short_form.2022-23.csv'
+            expect(filename).to eq 'district1.short_form.2022-23.csv'
           end
         end
 
@@ -127,7 +127,7 @@ RSpec.describe Cleaner do
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:
             )
-            expect(filename).to eq 'District1.early_education.2022-23.csv'
+            expect(filename).to eq 'district1.early_education.2022-23.csv'
           end
         end
         context 'when the file is based on teacher survey items' do
@@ -139,7 +139,7 @@ RSpec.describe Cleaner do
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: teacher_survey_items, data:
             )
-            expect(filename).to eq 'District1.teacher.2022-23.csv'
+            expect(filename).to eq 'district1.teacher.2022-23.csv'
           end
         end
 
@@ -153,7 +153,7 @@ RSpec.describe Cleaner do
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: teacher_survey_items, data:
             )
-            expect(filename).to eq 'District1.District2.teacher.2022-23.csv'
+            expect(filename).to eq 'district1.district2.teacher.2022-23.csv'
           end
         end
       end
diff --git a/spec/services/survey_item_values_spec.rb b/spec/services/survey_item_values_spec.rb
index 7f6b28bf..5ad57b4c 100644
--- a/spec/services/survey_item_values_spec.rb
+++ b/spec/services/survey_item_values_spec.rb
@@ -85,7 +85,12 @@ RSpec.describe SurveyItemValues, type: :model 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.recorded_date).to eq Date.parse('2017-01-01')
+
+      headers = ['Recorded Date']
+      row = { 'Recorded Date' => '2017-01-02' }
+      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      expect(values.recorded_date).to eq Date.parse('2017-01-02')
     end
   end