From af91826392aac3bdf13f751d8a3b4ea0fe75c462 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Tue, 12 Mar 2024 17:08:51 -0500
Subject: [PATCH 01/14] take out spaces

---
 app/lib/submission_builder/document.rb        | 24 +++++------
 .../ty2022/states/az/individual_return.rb     | 20 ++++-----
 .../ty2022/states/ny/documents/it201.rb       | 16 +++----
 .../ty2022/states/ny/documents/rtn_header.rb  | 22 +++++-----
 .../ty2022/states/ny/individual_return.rb     | 42 +++++++++----------
 5 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/app/lib/submission_builder/document.rb b/app/lib/submission_builder/document.rb
index e2d0aba997..d1c2663f00 100644
--- a/app/lib/submission_builder/document.rb
+++ b/app/lib/submission_builder/document.rb
@@ -97,8 +97,8 @@ def process_mailing_street(xml)
       if mailing_street.length > 30
         process_long_mailing_street(xml, mailing_street)
       else
-        xml.MAIL_LN_1_ADR @submission.data_source.direct_file_data.mailing_apartment if @submission.data_source.direct_file_data.mailing_apartment.present?
-        xml.MAIL_LN_2_ADR mailing_street
+        xml.MAIL_LN_1_ADR @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_apartment.present?
+        xml.MAIL_LN_2_ADR mailing_street.strip.gsub(/\s+/, ' ')
       end
     end
 
@@ -121,14 +121,14 @@ def process_mailing_apartment(xml, excess_characters, truncated_mailing_street)
         apartment = @submission.data_source.direct_file_data.mailing_apartment
         if apartment.length + excess_characters.length > 30
           truncated_apartment = apartment[0, 30 - excess_characters.length].rpartition(' ').first
-          xml.MAIL_LN_1_ADR excess_characters + " " + truncated_apartment
+          xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + truncated_apartment.strip.gsub(/\s+/, ' ')
         else
-          xml.MAIL_LN_1_ADR excess_characters + " " + apartment
+          xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + apartment.strip.gsub(/\s+/, ' ')
         end
       else
-        xml.MAIL_LN_1_ADR excess_characters
+        xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ')
       end
-      xml.MAIL_LN_2_ADR truncated_mailing_street
+      xml.MAIL_LN_2_ADR truncated_mailing_street.strip.gsub(/\s+/, ' ')
     end
 
     def process_permanent_street(xml)
@@ -139,8 +139,8 @@ def process_permanent_street(xml)
       if permanent_street.length > 30
         process_long_permanent_street(xml, permanent_street)
       else
-        xml.PERM_LN_1_ADR @submission.data_source.permanent_apartment if @submission.data_source.permanent_apartment.present?
-        xml.PERM_LN_2_ADR permanent_street
+        xml.PERM_LN_1_ADR @submission.data_source.permanent_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.permanent_apartment.present?
+        xml.PERM_LN_2_ADR permanent_street.strip.gsub(/\s+/, ' ')
       end
     end
 
@@ -163,14 +163,14 @@ def process_permanent_apartment(xml, excess_characters, truncated_permanent_stre
         apartment = @submission.data_source.permanent_apartment
         if apartment.length + excess_characters.length > 30
           truncated_apartment = apartment[0, 30 - excess_characters.length].rpartition(' ').first
-          xml.PERM_LN_1_ADR excess_characters + " " + truncated_apartment
+          xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + truncated_apartment.strip.gsub(/\s+/, ' ')
         else
-          xml.PERM_LN_1_ADR excess_characters + " " + apartment
+          xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + apartment.strip.gsub(/\s+/, ' ')
         end
       else
-        xml.PERM_LN_1_ADR excess_characters
+        xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ')
       end
-      xml.PERM_LN_2_ADR truncated_permanent_street
+      xml.PERM_LN_2_ADR truncated_permanent_street.strip.gsub(/\s+/, ' ')
     end
   end
 end
diff --git a/app/lib/submission_builder/ty2022/states/az/individual_return.rb b/app/lib/submission_builder/ty2022/states/az/individual_return.rb
index 82d2b284b2..950458db25 100644
--- a/app/lib/submission_builder/ty2022/states/az/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/az/individual_return.rb
@@ -51,12 +51,12 @@ def pdf_documents
 
           def documents_wrapper
             xml_doc = build_xml_doc("Form140") do |xml|
-              xml.LNPriorYrs @submission.data_source.prior_last_names
+              xml.LNPriorYrs @submission.data_source.prior_last_names.strip.gsub(/\s+/, ' ')
               xml.FilingStatus filing_status
               if @submission.data_source.hoh_qualifying_person_name.present?
                 xml.QualChildDependentName do
-                  xml.FirstName @submission.data_source.hoh_qualifying_person_name[:first_name]
-                  xml.LastName @submission.data_source.hoh_qualifying_person_name[:last_name]
+                  xml.FirstName @submission.data_source.hoh_qualifying_person_name[:first_name]&.strip&.gsub(/\s+/, ' ')
+                  xml.LastName @submission.data_source.hoh_qualifying_person_name[:last_name]&.strip&.gsub(/\s+/, ' ')
                 end
               end
               xml.Exemptions do
@@ -71,14 +71,14 @@ def documents_wrapper
                 @submission.data_source.dependents.reject(&:is_qualifying_parent_or_grandparent?).each do |dependent|
                   xml.DependentDetails do
                     xml.Name do
-                      xml.FirstName dependent.first_name
-                      xml.MiddleInitial dependent.middle_initial if dependent.middle_initial.present?
-                      xml.LastName dependent.last_name
+                      xml.FirstName dependent.first_name&.strip&.gsub(/\s+/, ' ')
+                      xml.MiddleInitial dependent.middle_initial&.strip&.gsub(/\s+/, ' ') if dependent.middle_initial.present?
+                      xml.LastName dependent.last_name&.strip&.gsub(/\s+/, ' ')
                     end
                     unless dependent.ssn.nil?
                       xml.DependentSSN dependent.ssn.delete('-')
                     end
-                    xml.RelationShip relationship_key(dependent.relationship)
+                    xml.RelationShip relationship_key(dependent.relationship)&.strip&.gsub(/\s+/, ' ')
                     xml.NumMonthsLived dependent.months_in_home
                     if dependent.under_17?
                       xml.DepUnder17 'X'
@@ -90,9 +90,9 @@ def documents_wrapper
                 @submission.data_source.dependents.select(&:is_qualifying_parent_or_grandparent?).each do |dependent|
                   xml.QualParentsAncestors do
                     xml.Name do
-                      xml.FirstName dependent.first_name
-                      xml.MiddleInitial dependent.middle_initial if dependent.middle_initial.present?
-                      xml.LastName dependent.last_name
+                      xml.FirstName dependent.first_name&.strip&.gsub(/\s+/, ' ')
+                      xml.MiddleInitial dependent.middle_initial&.strip&.gsub(/\s+/, ' ') if dependent.middle_initial.present?
+                      xml.LastName dependent.last_name&.strip&.gsub(/\s+/, ' ')
                     end
                     unless dependent.ssn.nil?
                       xml.DependentSSN dependent.ssn.delete('-')
diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
index a51cbead42..4a170de70f 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
@@ -79,17 +79,17 @@ def document
                 add_non_zero_claimed_value(xml, :RFND_B4_EDU_AMT, :IT201_LINE_78)
                 add_non_zero_claimed_value(xml, :RFND_AMT, :IT201_LINE_78B)
                 if @submission.data_source.confirmed_third_party_designee_yes?
-                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name
-                  xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number
+                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name.strip.gsub(/\s+/, ' ')
+                  xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number&.strip&.gsub(/\s+/, ' ')
                 end
                 xml.PR_SGN_IND claimed: 1
                 if @submission.data_source.spouse_esigned_yes?
                   xml.SP_SGN_IND claimed: 1
                 end
                 if intake.email_address.present?
-                  xml.TP_EMAIL_ADR claimed: intake.email_address
+                  xml.TP_EMAIL_ADR claimed: intake.email_address.strip.gsub(/\s+/, ' ')
                 elsif intake.direct_file_data.tax_payer_email.present?
-                  xml.TP_EMAIL_ADR claimed: intake.direct_file_data.tax_payer_email
+                  xml.TP_EMAIL_ADR claimed: intake.direct_file_data.tax_payer_email.strip.gsub(/\s+/, ' ')
                 end
                 if intake.direct_file_data.fed_adjustments_claimed.present?
                   xml.IT201FEDADJID do
@@ -105,10 +105,10 @@ def document
                   xml.IT201DepExmpInfo do
                     intake.dependents.each do |dependent|
                       xml.depInfo do
-                        xml.DEP_CHLD_FRST_NAME claimed: dependent.first_name if dependent.first_name.present?
-                        xml.DEP_CHLD_MI_NAME claimed: dependent.middle_initial if dependent.middle_initial.present?
-                        xml.DEP_CHLD_LAST_NAME claimed: dependent.last_name if dependent.last_name.present?
-                        xml.DEP_RELATION_DESC claimed: dependent.relationship.delete(" ") if dependent.relationship.present?
+                        xml.DEP_CHLD_FRST_NAME claimed: dependent.first_name.strip.gsub(/\s+/, ' ') if dependent.first_name.present?
+                        xml.DEP_CHLD_MI_NAME claimed: dependent.middle_initial.strip.gsub(/\s+/, ' ') if dependent.middle_initial.present?
+                        xml.DEP_CHLD_LAST_NAME claimed: dependent.last_name.strip.gsub(/\s+/, ' ') if dependent.last_name.present?
+                        xml.DEP_RELATION_DESC claimed: dependent.relationship.strip.gsub(/\s+/, ' ') if dependent.relationship.present?
                         xml.DEP_SSN_NMBR claimed: dependent.ssn if dependent.ssn.present?
                         xml.DOB_DT claimed: dependent.dob.strftime("%Y-%m-%d") if dependent.dob.present?
                       end
diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb b/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
index 749bd3fdd5..a64a18d2d4 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
@@ -22,10 +22,10 @@ def document
                 # xml.COND_CODE_2_NMBR
                 if @submission.data_source.confirmed_third_party_designee_yes?
                   xml.THRD_PRTY_DSGN_IND claimed: 1
-                  xml.THRD_PRTY_PIN_NMBR claimed: @submission.data_source.direct_file_data.third_party_designee_pin if @submission.data_source.direct_file_data.third_party_designee_pin.present?
+                  xml.THRD_PRTY_PIN_NMBR claimed: @submission.data_source.direct_file_data.third_party_designee_pin.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.third_party_designee_pin.present?
                 end
                 xml.EXT_TP_ID claimed: @submission.data_source.primary.ssn if @submission.data_source.primary.ssn.present?
-                xml.ABA_NMBR claimed: @submission.data_source.routing_number if @submission.data_source.routing_number.present?
+                xml.ABA_NMBR claimed: @submission.data_source.routing_number.strip.gsub(/\s+/, ' ') if @submission.data_source.routing_number.present?
                 xml.BANK_ACCT_NMBR claimed: @submission.data_source.account_number.delete('-') if @submission.data_source.account_number.present?
                 if @submission.data_source.account_type.present? && ACCOUNT_TYPES[@submission.data_source.account_type.to_sym] != 0
                   xml.ACCT_TYPE_CD claimed: ACCOUNT_TYPES[@submission.data_source.account_type.to_sym]
@@ -49,17 +49,17 @@ def document
                 # xml.PREP_ZIP_5_ADR
                 # xml.PREP_EIN_IND
                 if @submission.data_source.phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.phone_number[-10, 3]
-                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number[-7, 3]
-                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number[-4, 4]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
+                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
+                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
                 elsif @submission.data_source.direct_file_data.phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number[-10, 3]
-                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number[-7, 3]
-                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number[-4, 4]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
+                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
+                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
                 elsif @submission.data_source.direct_file_data.cell_phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number[-10, 3]
-                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number[-7, 3]
-                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number[-4, 4]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
+                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
+                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
                 end
                 # xml.DGT4_PHONE_NMBR
                 xml.FORM_TYPE claimed: "201"
diff --git a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
index 97a080d858..6a9cdd7d13 100644
--- a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
@@ -44,38 +44,38 @@ def documents_wrapper
               end
 
               xml.tiPrime do
-                xml.FIRST_NAME @submission.data_source.primary.first_name if @submission.data_source.primary.first_name.present?
-                xml.MI_NAME @submission.data_source.primary.middle_initial if @submission.data_source.primary.middle_initial.present?
-                xml.LAST_NAME @submission.data_source.primary.last_name if @submission.data_source.primary.last_name.present?
+                xml.FIRST_NAME @submission.data_source.primary.first_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.first_name.present?
+                xml.MI_NAME @submission.data_source.primary.middle_initial.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.middle_initial.present?
+                xml.LAST_NAME @submission.data_source.primary.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
                 if @submission.data_source.direct_file_data.mailing_street.present?
                   process_mailing_street(xml)
                 end
-                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.slice(0, 18) if @submission.data_source.direct_file_data.mailing_city.present?
-                xml.MAIL_STATE_ADR @submission.data_source.direct_file_data.mailing_state if @submission.data_source.direct_file_data.mailing_state.present?
-                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.slice(0, 5) if @submission.data_source.direct_file_data.mailing_zip.present?
-                xml.COUNTY_CD @submission.data_source.county_code if @submission.data_source.county_code.present?
-                xml.COUNTY_NAME @submission.data_source.county_name&.truncate(20) if @submission.data_source.county_name.present?
+                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ')[0, 18] if @submission.data_source.direct_file_data.mailing_city.present?
+                xml.MAIL_STATE_ADR @submission.data_source.direct_file_data.mailing_state.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_state.present?
+                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.strip.gsub(/\s+/, ' ')[0, 5] if @submission.data_source.direct_file_data.mailing_zip.present?
+                xml.COUNTY_CD @submission.data_source.county_code.strip.gsub(/\s+/, ' ') if @submission.data_source.county_code.present?
+                xml.COUNTY_NAME @submission.data_source.county_name.strip.gsub(/\s+/, ' ')[0, 20] if @submission.data_source.county_name.present?
                 if @submission.data_source.permanent_street.present?
                   process_permanent_street(xml)
                 end
-                xml.PERM_CTY_ADR @submission.data_source.permanent_city.slice(0, 18) if @submission.data_source.permanent_city.present?
+                xml.PERM_CTY_ADR @submission.data_source.permanent_city.strip.gsub(/\s+/, ' ')[0, 18] if @submission.data_source.permanent_city.present?
                 xml.PERM_ST_ADR "NY"
                 xml.PERM_ZIP_ADR @submission.data_source.permanent_zip if @submission.data_source.permanent_zip.present?
                 xml.SCHOOL_CD @submission.data_source.school_district_number if @submission.data_source.school_district_number.present?
                 xml.SCHOOL_NAME @submission.data_source.school_district&.truncate(30) if @submission.data_source.school_district.present?
-                xml.PR_EMP_DESC @submission.data_source.direct_file_data.primary_occupation[0..24] if @submission.data_source.direct_file_data.primary_occupation.present?
+                xml.PR_EMP_DESC @submission.data_source.direct_file_data..strip.gsub(/\s+/, ' ')[0, 24] if @submission.data_source.direct_file_data.primary_occupation.present?
                 # We omit country name because we don't support out of country filers
                 #xml.COUNTRY_NAME @submission.data_source.mailing_country
               end
 
               if @submission.data_source.filing_status_mfj?
                 xml.tiSpouse do
-                  xml.FIRST_NAME @submission.data_source.spouse.first_name if @submission.data_source.spouse.first_name.present?
-                  xml.MI_NAME @submission.data_source.spouse.middle_initial if @submission.data_source.spouse.middle_initial.present?
-                  xml.LAST_NAME @submission.data_source.spouse.last_name if @submission.data_source.spouse.last_name.present?
+                  xml.FIRST_NAME @submission.data_source.spouse.first_name.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.first_name.present?
+                  xml.MI_NAME @submission.data_source.spouse.middle_initial.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.middle_initial.present?
+                  xml.LAST_NAME @submission.data_source.spouse.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.last_name.present?
                   xml.SP_SSN_NMBR @submission.data_source.spouse.ssn if @submission.data_source.spouse.ssn.present?
                   xml.DCSD_DT @submission.data_source.direct_file_data.spouse_date_of_death if @submission.data_source.spouse_deceased?
-                  xml.SP_EMP_DESC @submission.data_source.direct_file_data.spouse_occupation[0..24] if @submission.data_source.direct_file_data.spouse_occupation.present?
+                  xml.SP_EMP_DESC @submission.data_source.direct_file_data.spouse_occupation.strip.gsub(/\s+/, ' ')[0, 24] if @submission.data_source.direct_file_data.spouse_occupation.present?
                 end
               elsif @submission.data_source.filing_status_mfs?
                 xml.tiSpouse do
@@ -94,9 +94,9 @@ def documents_wrapper
                     xml.DEP_FORM_ID 348 # 348 is the code for the IT-213 form
                     xml.DEP_RELATION_DESC dependent.relationship.delete(" ") if dependent.relationship.present?
                     xml.DEP_STUDENT_IND dependent.eic_student_yes? ? 1 : 2
-                    xml.DEP_CHLD_LAST_NAME dependent.last_name if dependent.last_name.present?
-                    xml.DEP_CHLD_FRST_NAME dependent.first_name if dependent.first_name.present?
-                    xml.DEP_CHLD_MI_NAME dependent.middle_initial if dependent.middle_initial.present?
+                    xml.DEP_CHLD_LAST_NAME dependent.last_name.strip.gsub(/\s+/, ' ') if dependent.last_name.present?
+                    xml.DEP_CHLD_FRST_NAME dependent.first_name.strip.gsub(/\s+/, ' ') if dependent.first_name.present?
+                    xml.DEP_CHLD_MI_NAME dependent.middle_initial.strip.gsub(/\s+/, ' ') if dependent.middle_initial.present?
                     xml.DEP_CHLD_SFX_NAME dependent.suffix if dependent.suffix.present?
                     xml.DEP_MNTH_LVD_NMBR dependent.months_in_home if dependent.months_in_home.present?
                     xml.DOB_DT dependent.dob.strftime("%Y-%m-%d") if dependent.dob.present?
@@ -116,10 +116,10 @@ def documents_wrapper
                   unless dependent.eic_student_unfilled?
                     xml.DEP_STUDENT_IND dependent.eic_student_yes? ? 1 : 2
                   end
-                  xml.DEP_CHLD_LAST_NAME dependent.last_name if dependent.last_name.present?
-                  xml.DEP_CHLD_FRST_NAME dependent.first_name if dependent.first_name.present?
-                  xml.DEP_CHLD_MI_NAME dependent.middle_initial if dependent.middle_initial.present?
-                  xml.DEP_CHLD_SFX_NAME dependent.suffix if dependent.suffix.present?
+                  xml.DEP_CHLD_LAST_NAME dependent.last_name.strip.gsub(/\s+/, ' ') if dependent.last_name.present?
+                  xml.DEP_CHLD_FRST_NAME dependent.first_name.strip.gsub(/\s+/, ' ') if dependent.first_name.present?
+                  xml.DEP_CHLD_MI_NAME dependent.middle_initial.strip.gsub(/\s+/, ' ') if dependent.middle_initial.present?
+                  xml.DEP_CHLD_SFX_NAME dependent.suffix.strip.gsub(/\s+/, ' ') if dependent.suffix.present?
                   xml.DEP_MNTH_LVD_NMBR dependent.months_in_home if dependent.months_in_home.present?
                   xml.DOB_DT dependent.dob.strftime("%Y-%m-%d") if dependent.dob.present?
                 end

From 6901f1f52e90a49c33be313d05514d3e1a40a594 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Tue, 12 Mar 2024 17:32:33 -0500
Subject: [PATCH 02/14] Tests

Co-authored-by: Martha Pidcock <mpidcock@codeforamerica.org>
---
 .../ty2022/states/az/individual_return.rb     |  2 +-
 .../ty2022/states/ny/individual_return.rb     | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/az/individual_return.rb b/app/lib/submission_builder/ty2022/states/az/individual_return.rb
index 950458db25..5a34580768 100644
--- a/app/lib/submission_builder/ty2022/states/az/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/az/individual_return.rb
@@ -51,7 +51,7 @@ def pdf_documents
 
           def documents_wrapper
             xml_doc = build_xml_doc("Form140") do |xml|
-              xml.LNPriorYrs @submission.data_source.prior_last_names.strip.gsub(/\s+/, ' ')
+              xml.LNPriorYrs @submission.data_source.prior_last_names&.strip&.gsub(/\s+/, ' ')
               xml.FilingStatus filing_status
               if @submission.data_source.hoh_qualifying_person_name.present?
                 xml.QualChildDependentName do
diff --git a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
index 6a9cdd7d13..c6f57d34c7 100644
--- a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
@@ -44,26 +44,26 @@ def documents_wrapper
               end
 
               xml.tiPrime do
-                xml.FIRST_NAME @submission.data_source.primary.first_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.first_name.present?
-                xml.MI_NAME @submission.data_source.primary.middle_initial.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.middle_initial.present?
-                xml.LAST_NAME @submission.data_source.primary.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
+                xml.FIRST_NAME @submission.data_source.primary.first_name&.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.first_name.present?
+                xml.MI_NAME @submission.data_source.primary.middle_initial&.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.middle_initial.present?
+                xml.LAST_NAME @submission.data_source.primary.last_name&.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
                 if @submission.data_source.direct_file_data.mailing_street.present?
                   process_mailing_street(xml)
                 end
-                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ')[0, 18] if @submission.data_source.direct_file_data.mailing_city.present?
+                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.slice(0, 18) if @submission.data_source.direct_file_data.mailing_city.present?
                 xml.MAIL_STATE_ADR @submission.data_source.direct_file_data.mailing_state.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_state.present?
-                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.strip.gsub(/\s+/, ' ')[0, 5] if @submission.data_source.direct_file_data.mailing_zip.present?
+                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.slice(0, 5) if @submission.data_source.direct_file_data.mailing_zip.present?
                 xml.COUNTY_CD @submission.data_source.county_code.strip.gsub(/\s+/, ' ') if @submission.data_source.county_code.present?
-                xml.COUNTY_NAME @submission.data_source.county_name.strip.gsub(/\s+/, ' ')[0, 20] if @submission.data_source.county_name.present?
+                xml.COUNTY_NAME @submission.data_source.county_name.slice(0, 20) if @submission.data_source.county_name.present?
                 if @submission.data_source.permanent_street.present?
                   process_permanent_street(xml)
                 end
-                xml.PERM_CTY_ADR @submission.data_source.permanent_city.strip.gsub(/\s+/, ' ')[0, 18] if @submission.data_source.permanent_city.present?
+                xml.PERM_CTY_ADR @submission.data_source.permanent_city.slice(0, 18) if @submission.data_source.permanent_city.present?
                 xml.PERM_ST_ADR "NY"
                 xml.PERM_ZIP_ADR @submission.data_source.permanent_zip if @submission.data_source.permanent_zip.present?
                 xml.SCHOOL_CD @submission.data_source.school_district_number if @submission.data_source.school_district_number.present?
-                xml.SCHOOL_NAME @submission.data_source.school_district&.truncate(30) if @submission.data_source.school_district.present?
-                xml.PR_EMP_DESC @submission.data_source.direct_file_data..strip.gsub(/\s+/, ' ')[0, 24] if @submission.data_source.direct_file_data.primary_occupation.present?
+                xml.SCHOOL_NAME @submission.data_source.school_district.slice(0, 30) if @submission.data_source.school_district.present?
+                xml.PR_EMP_DESC @submission.data_source.direct_file_data.primary_occupation&.slice(0, 25) if @submission.data_source.direct_file_data.primary_occupation.present?
                 # We omit country name because we don't support out of country filers
                 #xml.COUNTRY_NAME @submission.data_source.mailing_country
               end
@@ -75,7 +75,7 @@ def documents_wrapper
                   xml.LAST_NAME @submission.data_source.spouse.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.last_name.present?
                   xml.SP_SSN_NMBR @submission.data_source.spouse.ssn if @submission.data_source.spouse.ssn.present?
                   xml.DCSD_DT @submission.data_source.direct_file_data.spouse_date_of_death if @submission.data_source.spouse_deceased?
-                  xml.SP_EMP_DESC @submission.data_source.direct_file_data.spouse_occupation.strip.gsub(/\s+/, ' ')[0, 24] if @submission.data_source.direct_file_data.spouse_occupation.present?
+                  xml.SP_EMP_DESC @submission.data_source.direct_file_data.spouse_occupation.slice(0, 25) if @submission.data_source.direct_file_data.spouse_occupation.present?
                 end
               elsif @submission.data_source.filing_status_mfs?
                 xml.tiSpouse do

From 11c461eab13345b6ae52ff427345e6bf0f3c6113 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Tue, 12 Mar 2024 19:25:05 -0500
Subject: [PATCH 03/14] Fix notes

---
 .../ty2022/states/ny/documents/it201.rb                |  4 ++--
 .../ty2022/states/ny/individual_return.rb              | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
index 4a170de70f..1bb2ccb36f 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
@@ -79,7 +79,7 @@ def document
                 add_non_zero_claimed_value(xml, :RFND_B4_EDU_AMT, :IT201_LINE_78)
                 add_non_zero_claimed_value(xml, :RFND_AMT, :IT201_LINE_78B)
                 if @submission.data_source.confirmed_third_party_designee_yes?
-                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name.strip.gsub(/\s+/, ' ')
+                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name&.strip.gsub(/\s+/, ' ')
                   xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number&.strip&.gsub(/\s+/, ' ')
                 end
                 xml.PR_SGN_IND claimed: 1
@@ -108,7 +108,7 @@ def document
                         xml.DEP_CHLD_FRST_NAME claimed: dependent.first_name.strip.gsub(/\s+/, ' ') if dependent.first_name.present?
                         xml.DEP_CHLD_MI_NAME claimed: dependent.middle_initial.strip.gsub(/\s+/, ' ') if dependent.middle_initial.present?
                         xml.DEP_CHLD_LAST_NAME claimed: dependent.last_name.strip.gsub(/\s+/, ' ') if dependent.last_name.present?
-                        xml.DEP_RELATION_DESC claimed: dependent.relationship.strip.gsub(/\s+/, ' ') if dependent.relationship.present?
+                        xml.DEP_RELATION_DESC claimed: dependent.relationship.delete(" ") if dependent.relationship.present?
                         xml.DEP_SSN_NMBR claimed: dependent.ssn if dependent.ssn.present?
                         xml.DOB_DT claimed: dependent.dob.strftime("%Y-%m-%d") if dependent.dob.present?
                       end
diff --git a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
index c6f57d34c7..3b39612d64 100644
--- a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
@@ -50,11 +50,11 @@ def documents_wrapper
                 if @submission.data_source.direct_file_data.mailing_street.present?
                   process_mailing_street(xml)
                 end
-                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.slice(0, 18) if @submission.data_source.direct_file_data.mailing_city.present?
+                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ').slice(0, 18) if @submission.data_source.direct_file_data.mailing_city.present?
                 xml.MAIL_STATE_ADR @submission.data_source.direct_file_data.mailing_state.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_state.present?
-                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.slice(0, 5) if @submission.data_source.direct_file_data.mailing_zip.present?
+                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.strip.gsub(/\s+/, ' ').slice(0, 5) if @submission.data_source.direct_file_data.mailing_zip.present?
                 xml.COUNTY_CD @submission.data_source.county_code.strip.gsub(/\s+/, ' ') if @submission.data_source.county_code.present?
-                xml.COUNTY_NAME @submission.data_source.county_name.slice(0, 20) if @submission.data_source.county_name.present?
+                xml.COUNTY_NAME @submission.data_source.county_name.strip.gsub(/\s+/, ' ').slice(0, 20) if @submission.data_source.county_name.present?
                 if @submission.data_source.permanent_street.present?
                   process_permanent_street(xml)
                 end
@@ -62,8 +62,8 @@ def documents_wrapper
                 xml.PERM_ST_ADR "NY"
                 xml.PERM_ZIP_ADR @submission.data_source.permanent_zip if @submission.data_source.permanent_zip.present?
                 xml.SCHOOL_CD @submission.data_source.school_district_number if @submission.data_source.school_district_number.present?
-                xml.SCHOOL_NAME @submission.data_source.school_district.slice(0, 30) if @submission.data_source.school_district.present?
-                xml.PR_EMP_DESC @submission.data_source.direct_file_data.primary_occupation&.slice(0, 25) if @submission.data_source.direct_file_data.primary_occupation.present?
+                xml.SCHOOL_NAME @submission.data_source.school_district.strip.gsub(/\s+/, ' ').slice(0, 30) if @submission.data_source.school_district.present?
+                xml.PR_EMP_DESC @submission.data_source.direct_file_data.primary_occupation&.strip.gsub(/\s+/, ' ').slice(0, 25) if @submission.data_source.direct_file_data.primary_occupation.present?
                 # We omit country name because we don't support out of country filers
                 #xml.COUNTRY_NAME @submission.data_source.mailing_country
               end

From c67839a2a5cffe4dcd956f6d239e62adc8a4684b Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Tue, 12 Mar 2024 19:59:34 -0500
Subject: [PATCH 04/14] 1099

---
 .../ty2022/states/ny/documents/state1099_g.rb    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
index 603f9d6948..235dca2430 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
@@ -12,15 +12,15 @@ def document
               build_xml_doc("State1099G", documentId: "State1099G-#{form1099g.id}") do |xml|
                 if form1099g.payer_name && form1099g.payer_name != ''
                   xml.PayerName payerNameControl: form1099g.payer_name.gsub(/\s+/, '').upcase[0..3] do
-                    xml.BusinessNameLine1Txt form1099g.payer_name[0..74]
+                    xml.BusinessNameLine1Txt form1099g.payer_name&.strip.gsub(/\s+/, ' ').slice(0..74)
                   end
                   xml.PayerUSAddress do
-                    xml.AddressLine1Txt form1099g.payer_street_address[0..34] if form1099g.payer_street_address.present?
-                    xml.CityNm form1099g.payer_city[0..21] if form1099g.payer_city.present?
+                    xml.AddressLine1Txt form1099g.payer_street_address.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.payer_street_address.present?
+                    xml.CityNm form1099g.payer_city.strip.gsub(/\s+/, ' ').slice(0..21) if form1099g.payer_city.present?
                     xml.StateAbbreviationCd "NY"
                     xml.ZIPCd form1099g.payer_zip if form1099g.payer_zip.present?
                   end
-                  xml.PayerEIN form1099g.payer_tin if form1099g.payer_tin.present?
+                  xml.PayerEIN form1099g.payer_tin.strip.gsub(/\s+/, ' ') if form1099g.payer_tin.present?
                 end
                 recipient = if form1099g.recipient_primary?
                   form1099g.intake.primary
@@ -28,11 +28,11 @@ def document
                   form1099g.intake.spouse
                 end
                 xml.RecipientSSN recipient.ssn if recipient.ssn.present?
-                xml.RecipientName recipient.full_name if recipient.full_name.present?
+                xml.RecipientName recipient.full_name.strip.gsub(/\s+/, ' ') if recipient.full_name.present?
                 xml.RecipientUSAddress do
-                  xml.AddressLine1Txt form1099g.recipient_address_line1[0..34] if form1099g.recipient_address_line1.present?
-                  xml.AddressLine2Txt form1099g.recipient_address_line2[0..34] if form1099g.recipient_address_line2.present?
-                  xml.CityNm form1099g.recipient_city[0..21] if form1099g.recipient_city.present?
+                  xml.AddressLine1Txt form1099g.recipient_address_line1.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.recipient_address_line1.present?
+                  xml.AddressLine2Txt form1099g.recipient_address_line2.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.recipient_address_line2.present?
+                  xml.CityNm form1099g.recipient_city.strip.gsub(/\s+/, ' ').slice(0..21) if form1099g.recipient_city.present?
                   xml.StateAbbreviationCd "NY"
                   xml.ZIPCd form1099g.recipient_zip if form1099g.recipient_zip.present?
                 end

From ef0f2c57292f74022ab26ce7092d2a59eeacd3b7 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 11:59:09 -0500
Subject: [PATCH 05/14] Fix slice

---
 .../ty2022/states/az/documents/state1099_g.rb      | 14 +++++++-------
 .../ty2022/states/ny/documents/it201.rb            |  2 +-
 .../ty2022/states/ny/documents/state1099_g.rb      | 12 ++++++------
 .../ty2022/states/ny/individual_return.rb          | 14 +++++++-------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/az/documents/state1099_g.rb b/app/lib/submission_builder/ty2022/states/az/documents/state1099_g.rb
index 82c7181117..20cc6b346f 100644
--- a/app/lib/submission_builder/ty2022/states/az/documents/state1099_g.rb
+++ b/app/lib/submission_builder/ty2022/states/az/documents/state1099_g.rb
@@ -12,11 +12,11 @@ def document
               build_xml_doc("State1099G", documentId: "State1099G-#{form1099g.id}") do |xml|
                 if form1099g.payer_name && form1099g.payer_name != ''
                   xml.PayerName payerNameControl: form1099g.payer_name.gsub(/\s+/, '').upcase[0..3] do
-                    xml.BusinessNameLine1Txt form1099g.payer_name[0..74]
+                    xml.BusinessNameLine1Txt form1099g.payer_name.gsub(/\s+/, ' ')&.slice(0, 75)&.strip
                   end
                   xml.PayerUSAddress do
-                    xml.AddressLine1Txt form1099g.payer_street_address[0..34]
-                    xml.CityNm form1099g.payer_city[0..21]
+                    xml.AddressLine1Txt form1099g.payer_street_address.gsub(/\s+/, ' ')&.slice(0, 35)&.strip
+                    xml.CityNm form1099g.payer_city.gsub(/\s+/, ' ')&.slice(0, 22)&.strip
                     xml.StateAbbreviationCd "AZ"
                     xml.ZIPCd form1099g.payer_zip
                   end
@@ -28,11 +28,11 @@ def document
                   form1099g.intake.spouse
                 end
                 xml.RecipientSSN recipient.ssn
-                xml.RecipientName recipient.full_name
+                xml.RecipientName recipient.full_name.gsub(/\s+/, ' ')&.strip
                 xml.RecipientUSAddress do
-                  xml.AddressLine1Txt form1099g.recipient_address_line1[0..34]
-                  xml.AddressLine2Txt form1099g.recipient_address_line2[0..34] if form1099g.recipient_address_line2.present?
-                  xml.CityNm form1099g.recipient_city[0..21]
+                  xml.AddressLine1Txt form1099g.recipient_address_line1.gsub(/\s+/, ' ')&.slice(0, 35)&.strip
+                  xml.AddressLine2Txt form1099g.recipient_address_line2.gsub(/\s+/, ' ')&.slice(0, 35)&.strip if form1099g.recipient_address_line2.present?
+                  xml.CityNm form1099g.recipient_city.gsub(/\s+/, ' ')&.slice(0, 22)&.strip
                   xml.StateAbbreviationCd "AZ"
                   xml.ZIPCd form1099g.recipient_zip
                 end
diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
index 1bb2ccb36f..7fcadfd228 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
@@ -79,7 +79,7 @@ def document
                 add_non_zero_claimed_value(xml, :RFND_B4_EDU_AMT, :IT201_LINE_78)
                 add_non_zero_claimed_value(xml, :RFND_AMT, :IT201_LINE_78B)
                 if @submission.data_source.confirmed_third_party_designee_yes?
-                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name&.strip.gsub(/\s+/, ' ')
+                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name&.strip&.gsub(/\s+/, ' ')
                   xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number&.strip&.gsub(/\s+/, ' ')
                 end
                 xml.PR_SGN_IND claimed: 1
diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
index 235dca2430..b95d6981ac 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
@@ -12,11 +12,11 @@ def document
               build_xml_doc("State1099G", documentId: "State1099G-#{form1099g.id}") do |xml|
                 if form1099g.payer_name && form1099g.payer_name != ''
                   xml.PayerName payerNameControl: form1099g.payer_name.gsub(/\s+/, '').upcase[0..3] do
-                    xml.BusinessNameLine1Txt form1099g.payer_name&.strip.gsub(/\s+/, ' ').slice(0..74)
+                    xml.BusinessNameLine1Txt form1099g.payer_name&.gsub(/\s+/, ' ')&.slice(0, 75)&.strip
                   end
                   xml.PayerUSAddress do
-                    xml.AddressLine1Txt form1099g.payer_street_address.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.payer_street_address.present?
-                    xml.CityNm form1099g.payer_city.strip.gsub(/\s+/, ' ').slice(0..21) if form1099g.payer_city.present?
+                    xml.AddressLine1Txt form1099g.payer_street_address.gsub(/\s+/, ' ')&.slice(0, 35)&.strip if form1099g.payer_street_address.present?
+                    xml.CityNm form1099g.payer_city.gsub(/\s+/, ' ')&.slice(0, 22)&.strip if form1099g.payer_city.present?
                     xml.StateAbbreviationCd "NY"
                     xml.ZIPCd form1099g.payer_zip if form1099g.payer_zip.present?
                   end
@@ -30,9 +30,9 @@ def document
                 xml.RecipientSSN recipient.ssn if recipient.ssn.present?
                 xml.RecipientName recipient.full_name.strip.gsub(/\s+/, ' ') if recipient.full_name.present?
                 xml.RecipientUSAddress do
-                  xml.AddressLine1Txt form1099g.recipient_address_line1.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.recipient_address_line1.present?
-                  xml.AddressLine2Txt form1099g.recipient_address_line2.strip.gsub(/\s+/, ' ').slice(0..34) if form1099g.recipient_address_line2.present?
-                  xml.CityNm form1099g.recipient_city.strip.gsub(/\s+/, ' ').slice(0..21) if form1099g.recipient_city.present?
+                  xml.AddressLine1Txt form1099g.recipient_address_line1.gsub(/\s+/, ' ')&.slice(0, 35)&.strip if form1099g.recipient_address_line1.present?
+                  xml.AddressLine2Txt form1099g.recipient_address_line2.gsub(/\s+/, ' ')&.slice(0, 75)&.strip if form1099g.recipient_address_line2.present?
+                  xml.CityNm form1099g.recipient_city.gsub(/\s+/, ' ')&.slice(0, 22)&.strip if form1099g.recipient_city.present?
                   xml.StateAbbreviationCd "NY"
                   xml.ZIPCd form1099g.recipient_zip if form1099g.recipient_zip.present?
                 end
diff --git a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
index 3b39612d64..04191e2ae2 100644
--- a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
@@ -50,20 +50,20 @@ def documents_wrapper
                 if @submission.data_source.direct_file_data.mailing_street.present?
                   process_mailing_street(xml)
                 end
-                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ').slice(0, 18) if @submission.data_source.direct_file_data.mailing_city.present?
+                xml.MAIL_CITY_ADR @submission.data_source.direct_file_data.mailing_city.gsub(/\s+/, ' ').slice(0, 18).strip if @submission.data_source.direct_file_data.mailing_city.present?
                 xml.MAIL_STATE_ADR @submission.data_source.direct_file_data.mailing_state.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_state.present?
-                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.strip.gsub(/\s+/, ' ').slice(0, 5) if @submission.data_source.direct_file_data.mailing_zip.present?
+                xml.MAIL_ZIP_5_ADR @submission.data_source.direct_file_data.mailing_zip.gsub(/\s+/, ' ').slice(0, 5).strip if @submission.data_source.direct_file_data.mailing_zip.present?
                 xml.COUNTY_CD @submission.data_source.county_code.strip.gsub(/\s+/, ' ') if @submission.data_source.county_code.present?
-                xml.COUNTY_NAME @submission.data_source.county_name.strip.gsub(/\s+/, ' ').slice(0, 20) if @submission.data_source.county_name.present?
+                xml.COUNTY_NAME @submission.data_source.county_name.gsub(/\s+/, ' ').slice(0, 20).strip if @submission.data_source.county_name.present?
                 if @submission.data_source.permanent_street.present?
                   process_permanent_street(xml)
                 end
-                xml.PERM_CTY_ADR @submission.data_source.permanent_city.slice(0, 18) if @submission.data_source.permanent_city.present?
+                xml.PERM_CTY_ADR @submission.data_source.permanent_city.gsub(/\s+/, ' ').slice(0, 18).strip if @submission.data_source.permanent_city.present?
                 xml.PERM_ST_ADR "NY"
                 xml.PERM_ZIP_ADR @submission.data_source.permanent_zip if @submission.data_source.permanent_zip.present?
                 xml.SCHOOL_CD @submission.data_source.school_district_number if @submission.data_source.school_district_number.present?
-                xml.SCHOOL_NAME @submission.data_source.school_district.strip.gsub(/\s+/, ' ').slice(0, 30) if @submission.data_source.school_district.present?
-                xml.PR_EMP_DESC @submission.data_source.direct_file_data.primary_occupation&.strip.gsub(/\s+/, ' ').slice(0, 25) if @submission.data_source.direct_file_data.primary_occupation.present?
+                xml.SCHOOL_NAME @submission.data_source.school_district.gsub(/\s+/, ' ').slice(0, 30).strip if @submission.data_source.school_district.present?
+                xml.PR_EMP_DESC @submission.data_source.direct_file_data.primary_occupation.gsub(/\s+/, ' ').slice(0, 25).strip if @submission.data_source.direct_file_data.primary_occupation.present?
                 # We omit country name because we don't support out of country filers
                 #xml.COUNTRY_NAME @submission.data_source.mailing_country
               end
@@ -75,7 +75,7 @@ def documents_wrapper
                   xml.LAST_NAME @submission.data_source.spouse.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.last_name.present?
                   xml.SP_SSN_NMBR @submission.data_source.spouse.ssn if @submission.data_source.spouse.ssn.present?
                   xml.DCSD_DT @submission.data_source.direct_file_data.spouse_date_of_death if @submission.data_source.spouse_deceased?
-                  xml.SP_EMP_DESC @submission.data_source.direct_file_data.spouse_occupation.slice(0, 25) if @submission.data_source.direct_file_data.spouse_occupation.present?
+                  xml.SP_EMP_DESC @submission.data_source.direct_file_data.spouse_occupation.gsub(/\s+/, ' ').slice(0, 25).strip if @submission.data_source.direct_file_data.spouse_occupation.present?
                 end
               elsif @submission.data_source.filing_status_mfs?
                 xml.tiSpouse do

From e6ef96716b00b717ba981b40c16d2e87632daddb Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 12:12:23 -0500
Subject: [PATCH 06/14] Fix consistency

---
 .../ty2022/states/ny/documents/it201.rb              |  4 ++--
 .../ty2022/states/ny/documents/state1099_g.rb        | 12 ++++++------
 .../ty2022/states/ny/individual_return.rb            |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
index 7fcadfd228..bda2cc2bdd 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/it201.rb
@@ -79,8 +79,8 @@ def document
                 add_non_zero_claimed_value(xml, :RFND_B4_EDU_AMT, :IT201_LINE_78)
                 add_non_zero_claimed_value(xml, :RFND_AMT, :IT201_LINE_78B)
                 if @submission.data_source.confirmed_third_party_designee_yes?
-                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name&.strip&.gsub(/\s+/, ' ')
-                  xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number&.strip&.gsub(/\s+/, ' ')
+                  xml.THRD_PRTY_NAME claimed: intake.direct_file_data.third_party_designee_name.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.third_party_designee_name.present?
+                  xml.THRD_PRTY_PH_NMBR claimed: intake.direct_file_data.third_party_designee_phone_number.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.third_party_designee_phone_number.present?
                 end
                 xml.PR_SGN_IND claimed: 1
                 if @submission.data_source.spouse_esigned_yes?
diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
index b95d6981ac..7f254dc706 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
@@ -12,11 +12,11 @@ def document
               build_xml_doc("State1099G", documentId: "State1099G-#{form1099g.id}") do |xml|
                 if form1099g.payer_name && form1099g.payer_name != ''
                   xml.PayerName payerNameControl: form1099g.payer_name.gsub(/\s+/, '').upcase[0..3] do
-                    xml.BusinessNameLine1Txt form1099g.payer_name&.gsub(/\s+/, ' ')&.slice(0, 75)&.strip
+                    xml.BusinessNameLine1Txt form1099g.payer_name&.gsub(/\s+/, ' ').slice(0, 75).strip
                   end
                   xml.PayerUSAddress do
-                    xml.AddressLine1Txt form1099g.payer_street_address.gsub(/\s+/, ' ')&.slice(0, 35)&.strip if form1099g.payer_street_address.present?
-                    xml.CityNm form1099g.payer_city.gsub(/\s+/, ' ')&.slice(0, 22)&.strip if form1099g.payer_city.present?
+                    xml.AddressLine1Txt form1099g.payer_street_address.gsub(/\s+/, ' ').slice(0, 35).strip if form1099g.payer_street_address.present?
+                    xml.CityNm form1099g.payer_city.gsub(/\s+/, ' ').slice(0, 22).strip if form1099g.payer_city.present?
                     xml.StateAbbreviationCd "NY"
                     xml.ZIPCd form1099g.payer_zip if form1099g.payer_zip.present?
                   end
@@ -30,9 +30,9 @@ def document
                 xml.RecipientSSN recipient.ssn if recipient.ssn.present?
                 xml.RecipientName recipient.full_name.strip.gsub(/\s+/, ' ') if recipient.full_name.present?
                 xml.RecipientUSAddress do
-                  xml.AddressLine1Txt form1099g.recipient_address_line1.gsub(/\s+/, ' ')&.slice(0, 35)&.strip if form1099g.recipient_address_line1.present?
-                  xml.AddressLine2Txt form1099g.recipient_address_line2.gsub(/\s+/, ' ')&.slice(0, 75)&.strip if form1099g.recipient_address_line2.present?
-                  xml.CityNm form1099g.recipient_city.gsub(/\s+/, ' ')&.slice(0, 22)&.strip if form1099g.recipient_city.present?
+                  xml.AddressLine1Txt form1099g.recipient_address_line1.gsub(/\s+/, ' ').slice(0, 35).strip if form1099g.recipient_address_line1.present?
+                  xml.AddressLine2Txt form1099g.recipient_address_line2.gsub(/\s+/, ' ').slice(0, 75).strip if form1099g.recipient_address_line2.present?
+                  xml.CityNm form1099g.recipient_city.gsub(/\s+/, ' ').slice(0, 22).strip if form1099g.recipient_city.present?
                   xml.StateAbbreviationCd "NY"
                   xml.ZIPCd form1099g.recipient_zip if form1099g.recipient_zip.present?
                 end
diff --git a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
index 04191e2ae2..9246a83d3a 100644
--- a/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/individual_return.rb
@@ -44,9 +44,9 @@ def documents_wrapper
               end
 
               xml.tiPrime do
-                xml.FIRST_NAME @submission.data_source.primary.first_name&.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.first_name.present?
-                xml.MI_NAME @submission.data_source.primary.middle_initial&.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.middle_initial.present?
-                xml.LAST_NAME @submission.data_source.primary.last_name&.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
+                xml.FIRST_NAME @submission.data_source.primary.first_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.first_name.present?
+                xml.MI_NAME @submission.data_source.primary.middle_initial.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.middle_initial.present?
+                xml.LAST_NAME @submission.data_source.primary.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
                 if @submission.data_source.direct_file_data.mailing_street.present?
                   process_mailing_street(xml)
                 end

From 1f7e9668078384fa4de1746d56c8e18675d34553 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 12:14:26 -0500
Subject: [PATCH 07/14] Fix test

---
 .../ty2022/states/ny/individual_return_spec.rb                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/lib/submission_builder/ty2022/states/ny/individual_return_spec.rb b/spec/lib/submission_builder/ty2022/states/ny/individual_return_spec.rb
index 4871fbb88e..fef2823a85 100644
--- a/spec/lib/submission_builder/ty2022/states/ny/individual_return_spec.rb
+++ b/spec/lib/submission_builder/ty2022/states/ny/individual_return_spec.rb
@@ -55,7 +55,7 @@
         intake.direct_file_data.spouse_occupation = "Manufacturer of artisan lightbulbs"
 
         xml = described_class.build(submission).document
-        expect(xml.at("PR_EMP_DESC").text).to eq("Professional Juggler and ")
+        expect(xml.at("PR_EMP_DESC").text).to eq("Professional Juggler and")
         expect(xml.at("tiSpouse SP_EMP_DESC").text).to eq("Manufacturer of artisan l")
       end
     end

From d38b8280a73ca1f8a8924968da7623dec8deb6ba Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 12:27:24 -0500
Subject: [PATCH 08/14] clean up addresses

---
 app/lib/submission_builder/document.rb | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/lib/submission_builder/document.rb b/app/lib/submission_builder/document.rb
index d1c2663f00..fdd6f6475b 100644
--- a/app/lib/submission_builder/document.rb
+++ b/app/lib/submission_builder/document.rb
@@ -92,13 +92,13 @@ def add_non_zero_claimed_value(xml, elem_name, claimed)
     def process_mailing_street(xml)
       return unless @submission.data_source.direct_file_data.mailing_street.present?
 
-      mailing_street = @submission.data_source.direct_file_data.mailing_street
+      mailing_street = @submission.data_source.direct_file_data.mailing_street.strip.gsub(/\s+/, ' ')
 
       if mailing_street.length > 30
         process_long_mailing_street(xml, mailing_street)
       else
         xml.MAIL_LN_1_ADR @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_apartment.present?
-        xml.MAIL_LN_2_ADR mailing_street.strip.gsub(/\s+/, ' ')
+        xml.MAIL_LN_2_ADR mailing_street
       end
     end
 
@@ -118,29 +118,29 @@ def process_long_mailing_street(xml, mailing_street)
 
     def process_mailing_apartment(xml, excess_characters, truncated_mailing_street)
       if @submission.data_source.direct_file_data.mailing_apartment.present?
-        apartment = @submission.data_source.direct_file_data.mailing_apartment
+        apartment = @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ')
         if apartment.length + excess_characters.length > 30
           truncated_apartment = apartment[0, 30 - excess_characters.length].rpartition(' ').first
-          xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + truncated_apartment.strip.gsub(/\s+/, ' ')
+          xml.MAIL_LN_1_ADR excess_characters + " " + truncated_apartment
         else
-          xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + apartment.strip.gsub(/\s+/, ' ')
+          xml.MAIL_LN_1_ADR excess_characters + " " + apartment
         end
       else
-        xml.MAIL_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ')
+        xml.MAIL_LN_1_ADR excess_characters
       end
-      xml.MAIL_LN_2_ADR truncated_mailing_street.strip.gsub(/\s+/, ' ')
+      xml.MAIL_LN_2_ADR truncated_mailing_street
     end
 
     def process_permanent_street(xml)
       return unless @submission.data_source.permanent_street.present?
 
-      permanent_street = @submission.data_source.permanent_street
+      permanent_street = @submission.data_source.permanent_street.strip.gsub(/\s+/, ' ')
 
       if permanent_street.length > 30
         process_long_permanent_street(xml, permanent_street)
       else
         xml.PERM_LN_1_ADR @submission.data_source.permanent_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.permanent_apartment.present?
-        xml.PERM_LN_2_ADR permanent_street.strip.gsub(/\s+/, ' ')
+        xml.PERM_LN_2_ADR permanent_street
       end
     end
 
@@ -160,17 +160,17 @@ def process_long_permanent_street(xml, street_address)
 
     def process_permanent_apartment(xml, excess_characters, truncated_permanent_street)
       if @submission.data_source.permanent_apartment.present?
-        apartment = @submission.data_source.permanent_apartment
+        apartment = @submission.data_source.permanent_apartment.strip.gsub(/\s+/, ' ')
         if apartment.length + excess_characters.length > 30
           truncated_apartment = apartment[0, 30 - excess_characters.length].rpartition(' ').first
-          xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + truncated_apartment.strip.gsub(/\s+/, ' ')
+          xml.PERM_LN_1_ADR excess_characters + " " + truncated_apartment
         else
-          xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ') + " " + apartment.strip.gsub(/\s+/, ' ')
+          xml.PERM_LN_1_ADR excess_characters + " " + apartment
         end
       else
-        xml.PERM_LN_1_ADR excess_characters.strip.gsub(/\s+/, ' ')
+        xml.PERM_LN_1_ADR excess_characters
       end
-      xml.PERM_LN_2_ADR truncated_permanent_street.strip.gsub(/\s+/, ' ')
+      xml.PERM_LN_2_ADR truncated_permanent_street
     end
   end
 end

From 9a3937574c9c94c1889004afd359ae5ac92614a5 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 12:50:16 -0500
Subject: [PATCH 09/14] Fix phone numbers

---
 .../ty2022/states/ny/documents/rtn_header.rb   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb b/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
index a64a18d2d4..08633c38b6 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
@@ -49,17 +49,17 @@ def document
                 # xml.PREP_ZIP_5_ADR
                 # xml.PREP_EIN_IND
                 if @submission.data_source.phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
-                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
-                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.phone_number.delete(" ")[-10, 3]
+                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number.delete(" ")[-7, 3]
+                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number.delete(" ")[-4, 4]
                 elsif @submission.data_source.direct_file_data.phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
-                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
-                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number..delete(" ")[-10, 3]
+                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.delete(" ")[-7, 3]
+                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.delete(" ")[-4, 4]
                 elsif @submission.data_source.direct_file_data.cell_phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-10, 3]
-                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-7, 3]
-                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.strip.gsub(/\s+/, ' ')[-4, 4]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.delete(" ")[-10, 3]
+                  xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.delete(" ")[-7, 3]
+                  xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.cell_phone_number.delete(" ")[-4, 4]
                 end
                 # xml.DGT4_PHONE_NMBR
                 xml.FORM_TYPE claimed: "201"

From 8f2911df1f66e912fa779372dcd126066d3152c8 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 13:03:32 -0500
Subject: [PATCH 10/14] Fix typo

---
 .../submission_builder/ty2022/states/ny/documents/rtn_header.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb b/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
index 08633c38b6..fc5be8f863 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/rtn_header.rb
@@ -53,7 +53,7 @@ def document
                   xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.phone_number.delete(" ")[-7, 3]
                   xml.DGT4_PHONE_NMBR claimed: @submission.data_source.phone_number.delete(" ")[-4, 4]
                 elsif @submission.data_source.direct_file_data.phone_number&.present?
-                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number..delete(" ")[-10, 3]
+                  xml.AREACODE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.delete(" ")[-10, 3]
                   xml.EXCHNG_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.delete(" ")[-7, 3]
                   xml.DGT4_PHONE_NMBR claimed: @submission.data_source.direct_file_data.phone_number.delete(" ")[-4, 4]
                 elsif @submission.data_source.direct_file_data.cell_phone_number&.present?

From 3a86cd9c4435786fb3f90828e3298699465f8a72 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 13:20:16 -0500
Subject: [PATCH 11/14] Fix

---
 .../ty2022/states/ny/documents/state1099_g.rb                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
index 7f254dc706..328c1b8366 100644
--- a/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
+++ b/app/lib/submission_builder/ty2022/states/ny/documents/state1099_g.rb
@@ -31,7 +31,7 @@ def document
                 xml.RecipientName recipient.full_name.strip.gsub(/\s+/, ' ') if recipient.full_name.present?
                 xml.RecipientUSAddress do
                   xml.AddressLine1Txt form1099g.recipient_address_line1.gsub(/\s+/, ' ').slice(0, 35).strip if form1099g.recipient_address_line1.present?
-                  xml.AddressLine2Txt form1099g.recipient_address_line2.gsub(/\s+/, ' ').slice(0, 75).strip if form1099g.recipient_address_line2.present?
+                  xml.AddressLine2Txt form1099g.recipient_address_line2.gsub(/\s+/, ' ').slice(0, 35).strip if form1099g.recipient_address_line2.present?
                   xml.CityNm form1099g.recipient_city.gsub(/\s+/, ' ').slice(0, 22).strip if form1099g.recipient_city.present?
                   xml.StateAbbreviationCd "NY"
                   xml.ZIPCd form1099g.recipient_zip if form1099g.recipient_zip.present?

From 866899b06c073024a22e6ad72d9a65edebfe2837 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 15:08:09 -0500
Subject: [PATCH 12/14] Fix header

---
 .../ty2022/states/financial_transaction.rb     |  8 ++++----
 .../ty2022/states/return_header.rb             | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/financial_transaction.rb b/app/lib/submission_builder/ty2022/states/financial_transaction.rb
index 43fdc2fe5c..f9a1cd257d 100644
--- a/app/lib/submission_builder/ty2022/states/financial_transaction.rb
+++ b/app/lib/submission_builder/ty2022/states/financial_transaction.rb
@@ -7,8 +7,8 @@ def document
           build_xml_doc("FinancialTransaction") do |xml|
             if (@kwargs[:refund_amount] || 0).positive? # REFUND
               xml.RefundDirectDeposit do
-                xml.RoutingTransitNumber @submission.data_source.routing_number if @submission.data_source.routing_number.present?
-                xml.BankAccountNumber @submission.data_source.account_number if @submission.data_source.account_number.present?
+                xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.routing_number.present?
+                xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.account_number.present?
                 xml.Amount @kwargs[:refund_amount]
                 case @submission.data_source.account_type
                 when 'checking'
@@ -26,8 +26,8 @@ def document
                 when 'savings'
                   xml.Savings 'X'
                 end
-                xml.RoutingTransitNumber @submission.data_source.routing_number if @submission.data_source.routing_number.present?
-                xml.BankAccountNumber @submission.data_source.account_number if @submission.data_source.account_number.present?
+                xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.routing_number.present?
+                xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.account_number.present?
                 xml.PaymentAmount @submission.data_source.withdraw_amount if @submission.data_source.withdraw_amount.present?
                 xml.RequestedPaymentDate date_type(@submission.data_source.date_electronic_withdrawal) if @submission.data_source.date_electronic_withdrawal.present?
                 xml.NotIATTransaction 'X'
diff --git a/app/lib/submission_builder/ty2022/states/return_header.rb b/app/lib/submission_builder/ty2022/states/return_header.rb
index 9e12b94641..1f05966f96 100644
--- a/app/lib/submission_builder/ty2022/states/return_header.rb
+++ b/app/lib/submission_builder/ty2022/states/return_header.rb
@@ -21,9 +21,9 @@ def document
             xml.Filer do
               xml.Primary do
                 xml.TaxpayerName do
-                  xml.FirstName @submission.data_source.primary.first_name if @submission.data_source.primary.first_name.present?
-                  xml.MiddleInitial @submission.data_source.primary.middle_initial if @submission.data_source.primary.middle_initial.present?
-                  xml.LastName @submission.data_source.primary.last_name if @submission.data_source.primary.last_name.present?
+                  xml.FirstName @submission.data_source.primary.first_name.strip.gsub(/\s+/, ' ')  if @submission.data_source.primary.first_name.present?
+                  xml.MiddleInitial @submission.data_source.primary.middle_initial.strip.gsub(/\s+/, ' ')  if @submission.data_source.primary.middle_initial.present?
+                  xml.LastName @submission.data_source.primary.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
                 end
                 xml.TaxpayerSSN @submission.data_source.primary.ssn if @submission.data_source.primary.ssn.present?
                 xml.DateOfBirth date_type(@submission.data_source.primary.birth_date) if @submission.data_source.primary.birth_date.present?
@@ -31,9 +31,9 @@ def document
               if @submission.data_source&.spouse.ssn.present? && @submission.data_source&.spouse.first_name.present?
                 xml.Secondary do
                   xml.TaxpayerName do
-                    xml.FirstName @submission.data_source.spouse.first_name if @submission.data_source.spouse.first_name.present?
-                    xml.MiddleInitial @submission.data_source.spouse.middle_initial if @submission.data_source.spouse.middle_initial.present?
-                    xml.LastName @submission.data_source.spouse.last_name if @submission.data_source.spouse.last_name.present?
+                    xml.FirstName @submission.data_source.spouse.first_name.strip.gsub(/\s+/, ' ')  if @submission.data_source.spouse.first_name.present?
+                    xml.MiddleInitial @submission.data_source.spouse.middle_initial.strip.gsub(/\s+/, ' ')  if @submission.data_source.spouse.middle_initial.present?
+                    xml.LastName @submission.data_source.spouse.last_name.strip.gsub(/\s+/, ' ')  if @submission.data_source.spouse.last_name.present?
                   end
                   xml.TaxpayerSSN @submission.data_source.spouse.ssn if @submission.data_source.spouse.ssn.present?
                   xml.DateOfBirth date_type(@submission.data_source.spouse.birth_date) if @submission.data_source.spouse.birth_date.present?
@@ -41,9 +41,9 @@ def document
                 end
               end
               xml.USAddress do |xml|
-                xml.AddressLine1Txt @submission.data_source.direct_file_data.mailing_street if @submission.data_source.direct_file_data.mailing_street.present?
-                xml.AddressLine2Txt @submission.data_source.direct_file_data.mailing_apartment if @submission.data_source.direct_file_data.mailing_apartment.present?
-                xml.CityNm @submission.data_source.direct_file_data.mailing_city if @submission.data_source.direct_file_data.mailing_city.present?
+                xml.AddressLine1Txt @submission.data_source.direct_file_data.mailing_street.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_street.present?
+                xml.AddressLine2Txt @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_apartment.present?
+                xml.CityNm @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_city.present?
                 xml.StateAbbreviationCd @submission.bundle_class.state_abbreviation if @submission.bundle_class.state_abbreviation.present?
                 xml.ZIPCd @submission.data_source.direct_file_data.mailing_zip if @submission.data_source.direct_file_data.mailing_zip.present?
               end

From c99798b514a6942cf42d82c380b1ae2115352d72 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 15:09:39 -0500
Subject: [PATCH 13/14] Fix

---
 .../ty2022/states/financial_transaction.rb                  | 6 +++---
 app/lib/submission_builder/ty2022/states/return_header.rb   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/financial_transaction.rb b/app/lib/submission_builder/ty2022/states/financial_transaction.rb
index f9a1cd257d..3ed6d34afe 100644
--- a/app/lib/submission_builder/ty2022/states/financial_transaction.rb
+++ b/app/lib/submission_builder/ty2022/states/financial_transaction.rb
@@ -7,8 +7,8 @@ def document
           build_xml_doc("FinancialTransaction") do |xml|
             if (@kwargs[:refund_amount] || 0).positive? # REFUND
               xml.RefundDirectDeposit do
-                xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.routing_number.present?
-                xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.account_number.present?
+                xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ') if @submission.data_source.routing_number.present?
+                xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ') if @submission.data_source.account_number.present?
                 xml.Amount @kwargs[:refund_amount]
                 case @submission.data_source.account_type
                 when 'checking'
@@ -27,7 +27,7 @@ def document
                   xml.Savings 'X'
                 end
                 xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.routing_number.present?
-                xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.account_number.present?
+                xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ') if @submission.data_source.account_number.present?
                 xml.PaymentAmount @submission.data_source.withdraw_amount if @submission.data_source.withdraw_amount.present?
                 xml.RequestedPaymentDate date_type(@submission.data_source.date_electronic_withdrawal) if @submission.data_source.date_electronic_withdrawal.present?
                 xml.NotIATTransaction 'X'
diff --git a/app/lib/submission_builder/ty2022/states/return_header.rb b/app/lib/submission_builder/ty2022/states/return_header.rb
index 1f05966f96..de8181cfe8 100644
--- a/app/lib/submission_builder/ty2022/states/return_header.rb
+++ b/app/lib/submission_builder/ty2022/states/return_header.rb
@@ -43,7 +43,7 @@ def document
               xml.USAddress do |xml|
                 xml.AddressLine1Txt @submission.data_source.direct_file_data.mailing_street.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_street.present?
                 xml.AddressLine2Txt @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_apartment.present?
-                xml.CityNm @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_city.present?
+                xml.CityNm @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_city.present?
                 xml.StateAbbreviationCd @submission.bundle_class.state_abbreviation if @submission.bundle_class.state_abbreviation.present?
                 xml.ZIPCd @submission.data_source.direct_file_data.mailing_zip if @submission.data_source.direct_file_data.mailing_zip.present?
               end

From 8053ccb37237bd801b79c5bf02baa39242643810 Mon Sep 17 00:00:00 2001
From: Tahsina Islam <tislam@codeforamerica.org>
Date: Wed, 13 Mar 2024 16:12:26 -0500
Subject: [PATCH 14/14] clean code

---
 .../ty2022/states/financial_transaction.rb         |  2 +-
 .../ty2022/states/return_header.rb                 | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/lib/submission_builder/ty2022/states/financial_transaction.rb b/app/lib/submission_builder/ty2022/states/financial_transaction.rb
index 3ed6d34afe..05114750d5 100644
--- a/app/lib/submission_builder/ty2022/states/financial_transaction.rb
+++ b/app/lib/submission_builder/ty2022/states/financial_transaction.rb
@@ -26,7 +26,7 @@ def document
                 when 'savings'
                   xml.Savings 'X'
                 end
-                xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ')  if @submission.data_source.routing_number.present?
+                xml.RoutingTransitNumber @submission.data_source.routing_number.strip.gsub(/\s+/, ' ') if @submission.data_source.routing_number.present?
                 xml.BankAccountNumber @submission.data_source.account_number.strip.gsub(/\s+/, ' ') if @submission.data_source.account_number.present?
                 xml.PaymentAmount @submission.data_source.withdraw_amount if @submission.data_source.withdraw_amount.present?
                 xml.RequestedPaymentDate date_type(@submission.data_source.date_electronic_withdrawal) if @submission.data_source.date_electronic_withdrawal.present?
diff --git a/app/lib/submission_builder/ty2022/states/return_header.rb b/app/lib/submission_builder/ty2022/states/return_header.rb
index de8181cfe8..daaefe15c4 100644
--- a/app/lib/submission_builder/ty2022/states/return_header.rb
+++ b/app/lib/submission_builder/ty2022/states/return_header.rb
@@ -21,8 +21,8 @@ def document
             xml.Filer do
               xml.Primary do
                 xml.TaxpayerName do
-                  xml.FirstName @submission.data_source.primary.first_name.strip.gsub(/\s+/, ' ')  if @submission.data_source.primary.first_name.present?
-                  xml.MiddleInitial @submission.data_source.primary.middle_initial.strip.gsub(/\s+/, ' ')  if @submission.data_source.primary.middle_initial.present?
+                  xml.FirstName @submission.data_source.primary.first_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.first_name.present?
+                  xml.MiddleInitial @submission.data_source.primary.middle_initial.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.middle_initial.present?
                   xml.LastName @submission.data_source.primary.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.primary.last_name.present?
                 end
                 xml.TaxpayerSSN @submission.data_source.primary.ssn if @submission.data_source.primary.ssn.present?
@@ -31,9 +31,9 @@ def document
               if @submission.data_source&.spouse.ssn.present? && @submission.data_source&.spouse.first_name.present?
                 xml.Secondary do
                   xml.TaxpayerName do
-                    xml.FirstName @submission.data_source.spouse.first_name.strip.gsub(/\s+/, ' ')  if @submission.data_source.spouse.first_name.present?
-                    xml.MiddleInitial @submission.data_source.spouse.middle_initial.strip.gsub(/\s+/, ' ')  if @submission.data_source.spouse.middle_initial.present?
-                    xml.LastName @submission.data_source.spouse.last_name.strip.gsub(/\s+/, ' ')  if @submission.data_source.spouse.last_name.present?
+                    xml.FirstName @submission.data_source.spouse.first_name.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.first_name.present?
+                    xml.MiddleInitial @submission.data_source.spouse.middle_initial.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.middle_initial.present?
+                    xml.LastName @submission.data_source.spouse.last_name.strip.gsub(/\s+/, ' ') if @submission.data_source.spouse.last_name.present?
                   end
                   xml.TaxpayerSSN @submission.data_source.spouse.ssn if @submission.data_source.spouse.ssn.present?
                   xml.DateOfBirth date_type(@submission.data_source.spouse.birth_date) if @submission.data_source.spouse.birth_date.present?
@@ -41,8 +41,8 @@ def document
                 end
               end
               xml.USAddress do |xml|
-                xml.AddressLine1Txt @submission.data_source.direct_file_data.mailing_street.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_street.present?
-                xml.AddressLine2Txt @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ')  if @submission.data_source.direct_file_data.mailing_apartment.present?
+                xml.AddressLine1Txt @submission.data_source.direct_file_data.mailing_street.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_street.present?
+                xml.AddressLine2Txt @submission.data_source.direct_file_data.mailing_apartment.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_apartment.present?
                 xml.CityNm @submission.data_source.direct_file_data.mailing_city.strip.gsub(/\s+/, ' ') if @submission.data_source.direct_file_data.mailing_city.present?
                 xml.StateAbbreviationCd @submission.bundle_class.state_abbreviation if @submission.bundle_class.state_abbreviation.present?
                 xml.ZIPCd @submission.data_source.direct_file_data.mailing_zip if @submission.data_source.direct_file_data.mailing_zip.present?