Merge branch 'main' into FYST-1973-send-marketing-email-to-az-ty-23-filers-who-have-not-yet-filed-for-ty-24

jenny-heath · anisharamnani · jenny-heath · commit 144946e38b63 · 2025-04-04T15:09:00.000-07:00
Co-authored-by: Anisha Ramnani &lt;aramnani@codeforamerica.org&gt;
diff --git a/app/controllers/state_file/questions/nc_out_of_country_controller.rb b/app/controllers/state_file/questions/nc_out_of_country_controller.rb
@@ -0,0 +1,11 @@
+module StateFile
+  module Questions
+    class NcOutOfCountryController < QuestionsController
+      include ReturnToReviewConcern
+
+      def self.show?(_intake)
+        Flipper.enabled?(:extension_period)
+      end
+    end
+  end
+end
diff --git a/app/forms/state_file/nc_out_of_country_form.rb b/app/forms/state_file/nc_out_of_country_form.rb
@@ -0,0 +1,11 @@
+module StateFile
+  class NcOutOfCountryForm < QuestionsForm
+    set_attributes_for :intake, :out_of_country
+
+    validates :out_of_country, inclusion: { in: %w[yes no], message: :blank }
+
+    def save
+      @intake.update!(attributes_for(:intake))
+    end
+  end
+end
diff --git a/app/forms/state_file/nj_medical_expenses_form.rb b/app/forms/state_file/nj_medical_expenses_form.rb
@@ -4,12 +4,10 @@ class NjMedicalExpensesForm < QuestionsForm
                        :medical_expenses
 
     validates_numericality_of :medical_expenses, message: I18n.t("validators.not_a_number"), if: -> { medical_expenses.present? }
-    validates :medical_expenses, presence: true, allow_blank: false, numericality: { greater_than_or_equal_to: 0 }
+    validates :medical_expenses, allow_blank: true, numericality: { greater_than_or_equal_to: 0 }
                    
     def save
-      unless medical_expenses.nil?
-        @intake.update(attributes_for(:intake))
-      end
+      @intake.update(attributes_for(:intake))
     end
   end
 end
diff --git a/app/lib/efile/nj/nj1040_calculator.rb b/app/lib/efile/nj/nj1040_calculator.rb
@@ -365,7 +365,8 @@ def calculate_line_29
 
       def calculate_line_31
         two_percent_gross = line_or_zero(:NJ1040_LINE_29) * 0.02
-        difference_with_med_expenses = @intake.medical_expenses - two_percent_gross
+        medical_expenses = @intake.medical_expenses || 0
+        difference_with_med_expenses = medical_expenses - two_percent_gross
         rounded_difference = difference_with_med_expenses.round
         return rounded_difference if rounded_difference.positive?
         nil
diff --git a/app/lib/navigation/state_file_nc_question_navigation.rb b/app/lib/navigation/state_file_nc_question_navigation.rb
@@ -38,6 +38,7 @@ class StateFileNcQuestionNavigation < Navigation::StateFileBaseQuestionNavigatio
         Navigation::NavigationStep.new(StateFile::Questions::NcRetirementIncomeSubtractionController),
         Navigation::NavigationStep.new(StateFile::Questions::NcSubtractionsController),
         Navigation::NavigationStep.new(StateFile::Questions::NcSalesUseTaxController),
+        Navigation::NavigationStep.new(StateFile::Questions::NcOutOfCountryController),
         Navigation::NavigationStep.new(StateFile::Questions::PrimaryStateIdController),
         Navigation::NavigationStep.new(StateFile::Questions::SpouseStateIdController),
         Navigation::NavigationStep.new(StateFile::Questions::NcReviewController),
diff --git a/app/lib/pdf_filler/nc_d400_pdf.rb b/app/lib/pdf_filler/nc_d400_pdf.rb
@@ -21,7 +21,7 @@ def hash_for_pdf
       mfs_spouse_last_name = @xml_document.at("MFSSpouseName LastName")&.text || ""
       mfs_spouse_name = [mfs_spouse_first_name, mfs_spouse_middle_initial, mfs_spouse_last_name].reject(&:empty?).join(" ")
 
-      {
+      answers = {
         y_d400wf_ssn1: @submission.data_source.primary.ssn,
         y_d400wf_ssn2: @submission.data_source.spouse.ssn,
         y_d400wf_fname1: @submission.data_source.primary.first_name,
@@ -80,6 +80,10 @@ def hash_for_pdf
         y_d400wf_sigdate: @submission.data_source.primary_esigned_yes? ? date_type_for_timezone(@submission.data_source.primary_esigned_at)&.to_date : "",
         y_d400wf_sigdate2: @submission.data_source.spouse_esigned_yes? ? date_type_for_timezone(@submission.data_source.spouse_esigned_at)&.to_date : ""
       }
+      if Flipper.enabled?(:extension_period)
+        answers["y_d400wf_Out of Country"] = checkbox_value(@xml_document.at('OutOfCountry')&.text.present?)
+      end
+      answers
     end
 
     def checkbox_value(condition)
diff --git a/app/lib/submission_builder/financial_transaction.rb b/app/lib/submission_builder/financial_transaction.rb
@@ -27,7 +27,7 @@ def document
             xml.BankAccountNumber sanitize_for_xml(@submission.data_source.account_number) if @submission.data_source.account_number.present?
             xml.PaymentAmount @submission.data_source.withdraw_amount if @submission.data_source.withdraw_amount.present?
             xml.AccountHolderType "2" if @submission.data_source.requires_additional_withdrawal_information?
-            xml.RequestedPaymentDate date_type(@submission.data_source.date_electronic_withdrawal) if @submission.data_source.date_electronic_withdrawal.present?
+            xml.RequestedPaymentDate date_type(@submission.data_source.calculate_date_electronic_withdrawal(current_time: @submission.created_at)) if @submission.data_source.date_electronic_withdrawal.present?
             if @submission.data_source.requires_additional_withdrawal_information?
               xml.AddendaRecord do
                 xml.TaxTypeCode do
diff --git a/app/lib/submission_builder/ty2024/states/nc/documents/d400.rb b/app/lib/submission_builder/ty2024/states/nc/documents/d400.rb
@@ -19,6 +19,7 @@ def document
 
               build_xml_doc("FormNCD400") do |xml|
                 xml.NCCountyCode @submission.data_source.residence_county
+                xml.OutOfCountry "X" if Flipper.enabled?(:extension_period) && @submission.data_source.out_of_country_yes?
                 xml.ResidencyStatusPrimary true
                 xml.ResidencyStatusSpouse true if @submission.data_source.filing_status_mfj?
                 xml.VeteranInfoPrimary @submission.data_source.primary_veteran_yes? ? 1 : 0
diff --git a/app/models/state_file/automated_message/pre_deadline_reminder.rb b/app/models/state_file/automated_message/pre_deadline_reminder.rb
@@ -10,7 +10,7 @@ def self.after_transition_notification?
     end
 
     def self.send_only_once?
-      true
+      false
     end
 
     def sms_body(**args)
diff --git a/app/models/state_file_base_intake.rb b/app/models/state_file_base_intake.rb
@@ -493,4 +493,14 @@ def eligible_1099rs
       form1099r.taxable_amount&.to_f&.positive?
     end
   end
-end
+
+  def calculate_date_electronic_withdrawal(current_time:)
+    submitted_before_deadline = StateFile::StateInformationService.before_payment_deadline?(current_time, self.state_code)
+    if submitted_before_deadline
+      date_electronic_withdrawal&.to_date
+    else
+      timezone = StateFile::StateInformationService.timezone(self.state_code)
+      current_time.in_time_zone(timezone).to_date
+    end
+  end
+end
diff --git a/app/models/state_file_nc_intake.rb b/app/models/state_file_nc_intake.rb
@@ -33,6 +33,7 @@
 #  locked_at                         :datetime
 #  message_tracker                   :jsonb
 #  moved_after_hurricane_helene      :integer          default("unfilled"), not null
+#  out_of_country                    :integer          default("no"), not null
 #  payment_or_deposit_type           :integer          default("unfilled"), not null
 #  phone_number                      :string
 #  phone_number_verified_at          :datetime
@@ -100,6 +101,7 @@ class StateFileNcIntake < StateFileBaseIntake
   enum eligibility_out_of_state_income: { unfilled: 0, yes: 1, no: 2 }, _prefix: :eligibility_out_of_state_income
   enum eligibility_ed_loan_cancelled: { no: 0, yes: 1 }, _prefix: :eligibility_ed_loan_cancelled
   enum eligibility_ed_loan_emp_payment: { no: 0, yes: 1 }, _prefix: :eligibility_ed_loan_emp_payment
+  enum out_of_country: { no: 0, yes: 1 }, _prefix: :out_of_country
 
   attr_accessor :nc_eligiblity_none
   before_save :sanitize_county_details
diff --git a/app/models/state_file_nj_intake.rb b/app/models/state_file_nj_intake.rb
@@ -44,7 +44,7 @@
 #  last_sign_in_ip                                        :inet
 #  locale                                                 :string           default("en")
 #  locked_at                                              :datetime
-#  medical_expenses                                       :decimal(12, 2)   default(0.0), not null
+#  medical_expenses                                       :decimal(12, 2)
 #  message_tracker                                        :jsonb
 #  municipality_code                                      :string
 #  municipality_name                                      :string
diff --git a/app/services/state_file/send_pre_deadline_reminder_service.rb b/app/services/state_file/send_pre_deadline_reminder_service.rb
@@ -1,23 +1,23 @@
 module StateFile
   class SendPreDeadlineReminderService
-    BATCH_SIZE = 10
+    BATCH_SIZE = 100
     HOURS_AGO = 24
 
     def self.run
       cutoff_time_ago = HOURS_AGO.hours.ago
       intakes_to_notify = []
 
-      StateFile::StateInformationService.state_intake_classes.each do |class_object|
+      StateFile::StateInformationService.state_intake_classes.excluding(StateFileNyIntake).each do |class_object|
         intakes_to_notify += class_object.left_joins(:efile_submissions)
                                          .where(efile_submissions: { id: nil })
-                                         .where.not(email_address: nil)
-                                         .where.not(email_address_verified_at: nil)
-                                         .where(unsubscribed_from_email: false)
-                                         .where("#{class_object.name.underscore.pluralize}.message_tracker #> '{messages.state_file.pre_deadline_reminder}' IS NULL")
+                                         .where.not(df_data_imported_at: nil)
+                                         .messaging_eligible
                                          .select do |intake|
                                             if intake.message_tracker.present? && intake.message_tracker["messages.state_file.finish_return"]
                                               finish_return_msg_sent_time = Time.parse(intake.message_tracker["messages.state_file.finish_return"])
                                               finish_return_msg_sent_time < cutoff_time_ago
+                                            elsif intake.disqualifying_df_data_reason.present?
+                                              false
                                             else
                                               true
                                             end
diff --git a/app/views/state_file/questions/nc_out_of_country/edit.html.erb b/app/views/state_file/questions/nc_out_of_country/edit.html.erb
@@ -0,0 +1,22 @@
+<% title = t('.title', year: MultiTenantService.statefile.current_tax_year + 1) %>
+<% content_for :page_title, title %>
+
+<% content_for :card do %>
+  <h1 class="h2"><%= title %></h1>
+  <%= form_with model: @form, url: { action: :update }, local: true, method: "put", builder: VitaMinFormBuilder do |f| %>
+    <div class="spacing-below-25">
+      <div class="white-group">
+        <%=
+          f.cfa_radio_set(
+            :out_of_country,
+            collection: [
+              { value: :yes, label: t("general.affirmative") },
+              { value: :no, label: t("general.negative") },
+            ]
+          )
+        %>
+      </div>
+    </div>
+    <%= f.continue %>
+  <% end %>
+<% end %>
diff --git a/app/views/state_file/questions/nj_review/edit.html.erb b/app/views/state_file/questions/nj_review/edit.html.erb
@@ -146,7 +146,7 @@
     <section id="medical_expenses" class="white-group">
       <div class="spacing-below-5">
         <h2 class="text--body text--bold spacing-below-5"><%=t(".medical_expenses") %></h2>
-        <p><%= number_to_currency(current_intake.medical_expenses, precision: 0) %></p>
+        <p><%= number_to_currency(current_intake.medical_expenses || 0, precision: 0) %></p>
         <%= link_to StateFile::Questions::NjMedicalExpensesController.to_path_helper(return_to_review: "y"), class: "button--small" do %>
           <%= t(".review_and_edit") %>
           <span class="sr-only"><%= t(".medical_expenses") %></span>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -3376,6 +3376,9 @@ en:
           question: Did any of the following less common scenarios apply to you (or your spouse, if married filing jointly) in %{filing_year}?
           subtitle: For this tax season, this service will only be able to serve people with specific tax situations. Please answer the following questions to find out if you can use it.
           title: First, let's see if you can use this service to file your %{filing_year} North Carolina taxes
+      nc_out_of_country:
+        edit:
+          title: Were you out of the country on April 15, %{year} and a US citizen or resident?
       nc_primary_state_id:
         nc_primary:
           encourage_sharing: While providing this information is encouraged, it is optional and not required to file your North Carolina taxes.
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -3346,6 +3346,9 @@ es:
           question: "¿Alguna de las siguientes situaciones menos comunes aplicó en tu caso (o el de tu cónyuge, si casado presentando conjunta) en %{filing_year}?"
           subtitle: Para esta temporada de impuestos, este servicio sólo estará disponible para personas con situaciones fiscales específicas. Para saber si puedes usar el servicio responde las siguientes preguntas.
           title: Primero, veamos si puedes usar este servicio para declarar tus impuestos del %{filing_year} de Carolina del Norte
+      nc_out_of_country:
+        edit:
+          title: Were you out of the country on April 15, %{year} and a US citizen or resident?
       nc_primary_state_id:
         nc_primary:
           encourage_sharing: Aunque se recomienda compartir esta información, no es un requisito para presentar tus impuestos en Carolina del Norte.
diff --git a/crontab b/crontab
@@ -9,5 +9,7 @@
 */10 * * * 1-6 bundle exec rake efile:poll_and_get_acknowledgments
 0 */2 * * * bundle exec rake state_file:reminder_to_finish_state_return
 0 19 23 4 * bundle exec rake state_file:post_deadline_reminder
+0 18 08 4 * bundle exec rake state_file:pre_deadline_reminder
+0 18 15 4 * bundle exec rake state_file:pre_deadline_reminder
 0 21 23 4 * bundle exec rake send_reject_resolution_reminder_notifications:send
 0 21 27 10 * bundle exec rake users:suspend_non_admins
diff --git a/db/migrate/20250402190355_add_out_of_country_for_state_file_nc_intakes.rb b/db/migrate/20250402190355_add_out_of_country_for_state_file_nc_intakes.rb
@@ -0,0 +1,5 @@
+class AddOutOfCountryForStateFileNcIntakes < ActiveRecord::Migration[7.1]
+  def change
+    add_column :state_file_nc_intakes, :out_of_country, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20250403171411_remove_medical_expenses_default_on_nj_intake.rb b/db/migrate/20250403171411_remove_medical_expenses_default_on_nj_intake.rb
@@ -0,0 +1,6 @@
+class RemoveMedicalExpensesDefaultOnNjIntake < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :state_file_nj_intakes, :medical_expenses, true
+    change_column_default :state_file_nj_intakes, :medical_expenses, nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_04_02_233714) do
+ActiveRecord::Schema[7.1].define(version: 2025_04_03_171411) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
   enable_extension "plpgsql"
@@ -2240,6 +2240,7 @@
     t.datetime "locked_at"
     t.jsonb "message_tracker", default: {}
     t.integer "moved_after_hurricane_helene", default: 0, null: false
+    t.integer "out_of_country", default: 0, null: false
     t.integer "payment_or_deposit_type", default: 0, null: false
     t.string "phone_number"
     t.datetime "phone_number_verified_at"
@@ -2375,7 +2376,7 @@
     t.inet "last_sign_in_ip"
     t.string "locale", default: "en"
     t.datetime "locked_at"
-    t.decimal "medical_expenses", precision: 12, scale: 2, default: "0.0", null: false
+    t.decimal "medical_expenses", precision: 12, scale: 2
     t.jsonb "message_tracker", default: {}
     t.string "municipality_code"
     t.string "municipality_name"
diff --git a/lib/tasks/state_file.rake b/lib/tasks/state_file.rake
@@ -6,7 +6,7 @@ namespace :state_file do
   end
 
   task pre_deadline_reminder: :environment do
-    return unless DateTime.now.year == 2024
+    return unless DateTime.now.year == 2025
     StateFile::SendPreDeadlineReminderService.run
   end
 
diff --git a/spec/controllers/state_file/questions/nc_out_of_country_controller_spec.rb b/spec/controllers/state_file/questions/nc_out_of_country_controller_spec.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe StateFile::Questions::NcOutOfCountryController do
+  let(:intake) { create :state_file_az_intake }
+
+  describe ".show?" do
+    context "when extension period is enabled" do
+      before do
+        allow(Flipper).to receive(:enabled?).with(:extension_period).and_return(true)
+      end
+
+      it "returns true" do
+        expect(described_class.show?(intake)).to eq true
+      end
+    end
+
+    context "when extension period is disabled" do
+      before do
+        allow(Flipper).to receive(:enabled?).with(:extension_period).and_return(false)
+      end
+
+      it "returns false" do
+        expect(described_class.show?(intake)).to eq false
+      end
+    end
+  end
+end
diff --git a/spec/factories/state_file_nc_intakes.rb b/spec/factories/state_file_nc_intakes.rb
@@ -33,6 +33,7 @@
 #  locked_at                         :datetime
 #  message_tracker                   :jsonb
 #  moved_after_hurricane_helene      :integer          default("unfilled"), not null
+#  out_of_country                    :integer          default("no"), not null
 #  payment_or_deposit_type           :integer          default("unfilled"), not null
 #  phone_number                      :string
 #  phone_number_verified_at          :datetime
diff --git a/spec/factories/state_file_nj_intakes.rb b/spec/factories/state_file_nj_intakes.rb
@@ -44,7 +44,7 @@
 #  last_sign_in_ip                                        :inet
 #  locale                                                 :string           default("en")
 #  locked_at                                              :datetime
-#  medical_expenses                                       :decimal(12, 2)   default(0.0), not null
+#  medical_expenses                                       :decimal(12, 2)
 #  message_tracker                                        :jsonb
 #  municipality_code                                      :string
 #  municipality_name                                      :string
diff --git a/spec/features/state_file/complete_intake_spec.rb b/spec/features/state_file/complete_intake_spec.rb
@@ -202,6 +202,7 @@
       allow_any_instance_of(Efile::Nc::D400Calculator).to receive(:refund_or_owed_amount).and_return 1000
       allow(Flipper).to receive(:enabled?).and_call_original
       allow(Flipper).to receive(:enabled?).with(:show_retirement_ui).and_return(true)
+      allow(Flipper).to receive(:enabled?).with(:extension_period).and_return(true)
     end
 
     it "has content", required_schema: "nc" do
@@ -284,6 +285,10 @@
       choose I18n.t("general.negative")
       click_on I18n.t("general.continue")
 
+      expect(page).to have_text(I18n.t("state_file.questions.nc_out_of_country.edit.title", year: filing_year + 1))
+      choose I18n.t("general.negative")
+      click_on I18n.t("general.continue")
+
       expect(page).to have_text I18n.t("state_file.questions.primary_state_id.state_id.id_type_question.label")
       choose I18n.t("state_file.questions.primary_state_id.state_id.id_type_question.drivers_license")
       fill_in "state_file_primary_state_id_form_id_number", with: "123456789"
@@ -389,6 +394,10 @@
       choose "state_file_nc_sales_use_tax_form_sales_use_tax_calculation_method_automated"
       click_on I18n.t("general.continue")
 
+      expect(page).to have_text(I18n.t("state_file.questions.nc_out_of_country.edit.title", year: filing_year + 1))
+      choose I18n.t("general.negative")
+      click_on I18n.t("general.continue")
+
       expect(page).to have_text I18n.t("state_file.questions.primary_state_id.state_id.id_type_question.label")
       choose I18n.t("state_file.questions.primary_state_id.state_id.id_type_question.drivers_license")
       fill_in "state_file_primary_state_id_form_id_number", with: "123456789"
diff --git a/spec/forms/state_file/nc_out_of_country_form_spec.rb b/spec/forms/state_file/nc_out_of_country_form_spec.rb
diff --git a/spec/forms/state_file/nj_medical_expenses_form_spec.rb b/spec/forms/state_file/nj_medical_expenses_form_spec.rb
diff --git a/spec/lib/efile/nj/nj1040_calculator_spec.rb b/spec/lib/efile/nj/nj1040_calculator_spec.rb
diff --git a/spec/lib/pdf_filler/nc_d400_pdf_spec.rb b/spec/lib/pdf_filler/nc_d400_pdf_spec.rb
diff --git a/spec/lib/submission_builder/financial_transaction_spec.rb b/spec/lib/submission_builder/financial_transaction_spec.rb
diff --git a/spec/lib/submission_builder/ty2024/states/nc/documents/d400_spec.rb b/spec/lib/submission_builder/ty2024/states/nc/documents/d400_spec.rb
diff --git a/spec/models/efile_error_spec.rb b/spec/models/efile_error_spec.rb
diff --git a/spec/models/state_file_base_intake_spec.rb b/spec/models/state_file_base_intake_spec.rb
diff --git a/spec/models/state_file_nc_intake_spec.rb b/spec/models/state_file_nc_intake_spec.rb
diff --git a/spec/models/state_file_nj_intake_spec.rb b/spec/models/state_file_nj_intake_spec.rb
diff --git a/spec/tasks/send_pre_deadline_reminder_service_spec.rb b/spec/tasks/send_pre_deadline_reminder_service_spec.rb
