From e97e7047b1ae9a69117dff13b099e6f15cb35813 Mon Sep 17 00:00:00 2001
From: Nelson Jovel <memoryman51@hotmail.com>
Date: Thu, 22 Feb 2024 10:55:48 -0800
Subject: [PATCH] fix: no longer support 'form' in filename when cleaning. 
 Only look for 'part X' and add that to the filename if it exists

---
 app/services/cleaner.rb       |  2 +-
 spec/services/cleaner_spec.rb | 52 ++++++-----------------------------
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/app/services/cleaner.rb b/app/services/cleaner.rb
index 78645399..2037a419 100644
--- a/app/services/cleaner.rb
+++ b/app/services/cleaner.rb
@@ -40,7 +40,7 @@ class Cleaner
       row.school.name
     end.to_set
 
-    part = filepath&.match(/[\b\s_.]+(part|form)[\W*_](?<label>[\w\d])/i)&.named_captures&.[]("label")&.upcase
+    part = filepath&.match(/[\b\s_.]+(part)[\W*_](?<label>[\w\d])/i)&.named_captures&.[]("label")&.upcase
 
     school_name = schools.first.parameterize
 
diff --git a/spec/services/cleaner_spec.rb b/spec/services/cleaner_spec.rb
index bc74fe86..77a06ad3 100644
--- a/spec/services/cleaner_spec.rb
+++ b/spec/services/cleaner_spec.rb
@@ -151,7 +151,7 @@ RSpec.describe Cleaner do
         it "adds the survey type as standard to the filename" do
           survey_items = SurveyItem.where(survey_item_id: standard_survey_items)
 
-          data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: standard_survey_items,  survey_items:,
+          data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: standard_survey_items, survey_items:,
                                        schools: School.school_hash)]
           filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
             headers: standard_survey_items, data:, filepath: nil
@@ -163,7 +163,7 @@ RSpec.describe Cleaner do
           it "adds the survey type as short form to the filename" do
             survey_items = SurveyItem.where(survey_item_id: short_form_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: short_form_survey_items,  survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: short_form_survey_items, survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: short_form_survey_items, data:, filepath: nil
@@ -176,7 +176,7 @@ RSpec.describe Cleaner do
           it "adds the survey type as early education to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:, filepath: nil
@@ -188,7 +188,7 @@ RSpec.describe Cleaner do
           it "adds the survey type as teacher to the filename" do
             survey_items = SurveyItem.where(survey_item_id: teacher_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items,  survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items, survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: teacher_survey_items, data:, filepath: nil
@@ -201,9 +201,9 @@ RSpec.describe Cleaner do
           it "adds all districts to the filename" do
             survey_items = SurveyItem.where(survey_item_id: teacher_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items,  survey_items:, schools: School.school_hash),
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items, survey_items:, schools: School.school_hash),
                     SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "222_222" },
-                                         headers: teacher_survey_items,  survey_items:, schools: School.school_hash)]
+                                         headers: teacher_survey_items, survey_items:, schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: teacher_survey_items, data:, filepath: nil
             )
@@ -215,50 +215,14 @@ RSpec.describe Cleaner do
           it "adds the part to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
-              headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form a.2022-23.csv"
+              headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ part a.2022-23.csv"
             )
             expect(filename).to eq "maynard.maynard-high-school.early_education.Part-A.2022-23.csv"
           end
         end
-        context "when the file name includes the words 'form'" do
-          it "adds the part to the filename" do
-            survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
-
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
-                                         schools: School.school_hash)]
-            filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
-              headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form f.2022-23.csv"
-            )
-            expect(filename).to eq "maynard.maynard-high-school.early_education.Part-F.2022-23.csv"
-          end
-        end
-        context "when the file name includes the words 'form'" do
-          it "adds the part to the filename" do
-            survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
-
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
-                                         schools: School.school_hash)]
-            filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
-              headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form_f.2022-23.csv"
-            )
-            expect(filename).to eq "maynard.maynard-high-school.early_education.Part-F.2022-23.csv"
-          end
-        end
-        context "when the file name includes the words 'form'" do
-          it "adds the part to the filename" do
-            survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
-
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
-                                         schools: School.school_hash)]
-            filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
-              headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form&f.2022-23.csv"
-            )
-            expect(filename).to eq "maynard.maynard-high-school.early_education.Part-F.2022-23.csv"
-          end
-        end
       end
     end
   end