FYST-1902-md-update-disability-logic (#5709)

DrewProebstel · Drew Proebstel · web-flow · commit d55a3239e1ed · 2025-03-11T09:16:37.000-07:00
Co-authored-by: Drew Proebstel &lt;dproebstel@codeforamerica.org&gt;
diff --git a/app/controllers/state_file/questions/md_pension_exclusion_offboarding_controller.rb b/app/controllers/state_file/questions/md_pension_exclusion_offboarding_controller.rb
@@ -3,7 +3,7 @@ module Questions
     class MdPensionExclusionOffboardingController < QuestionsController
       include OtherOptionsLinksConcern
       def self.show?(intake)
-        Flipper.enabled?(:show_retirement_ui) && intake.filing_status_mfj? && intake.state_file1099_rs.present? && intake.has_filer_under_65? && intake.filer_disabled? && intake.no_proof_of_disability_submitted?
+        Flipper.enabled?(:show_retirement_ui) && intake.filing_status_mfj? && intake.should_warn_about_pension_exclusion? && intake.has_at_least_one_disabled_filer? && intake.no_proof_of_disability_submitted?
       end
     end
   end
diff --git a/app/forms/state_file/md_permanently_disabled_form.rb b/app/forms/state_file/md_permanently_disabled_form.rb
@@ -27,22 +27,14 @@ def save
 
     private
 
-    def proof_not_required?
-      if intake.filing_status_mfj?
-        intake.primary_senior? && intake.spouse_senior?
-      else
-        intake.primary_senior?
-      end
-    end
-
     def primary_requires_proof?
-      return false if proof_not_required?
+      return false unless intake.should_warn_about_pension_exclusion?
 
       mfj_disability.in?(%w[primary both]) || primary_disabled == "yes"
     end
 
     def spouse_requires_proof?
-      return false if proof_not_required?
+      return false unless intake.should_warn_about_pension_exclusion?
 
       mfj_disability.in?(%w[spouse both])
     end
diff --git a/app/models/state_file_md_intake.rb b/app/models/state_file_md_intake.rb
@@ -265,7 +265,11 @@ def has_banking_information_in_financial_resolution?
     true
   end
 
-  def filer_disabled?
+  def has_at_least_one_disabled_filer?
     primary_disabled_yes? || spouse_disabled_yes?
   end
+
+  def should_warn_about_pension_exclusion?
+    eligible_1099rs.present? && has_filer_under_65?
+  end
 end
diff --git a/app/views/state_file/questions/md_permanently_disabled/edit.html.erb b/app/views/state_file/questions/md_permanently_disabled/edit.html.erb
@@ -16,20 +16,18 @@
     <div class="question-with-follow-up">
       <div class="question-with-follow-up__question">
         <div class="white-group">
+          <% should_warn_about_pension_exclusion = current_intake.should_warn_about_pension_exclusion? %>
+          <% primary_data_followup = should_warn_about_pension_exclusion ? "#primary-disability-proof" : nil %>
           <% if current_intake.filing_status_mfj? %>
-            <% are_filers_under_65 = !(current_intake.primary_senior? && current_intake.spouse_senior?) %>
-            <% primary_data_followup = are_filers_under_65 ? "#primary-disability-proof" : nil %>
-            <% spouse_data_followup = are_filers_under_65 ? "#spouse-disability-proof" : nil %>
-            <% both_data_followup = are_filers_under_65 ? "#both-disability-proof" : nil %>
-
+            <% spouse_data_followup = should_warn_about_pension_exclusion ? "#spouse-disability-proof" : nil %>
+            <% both_data_followup = should_warn_about_pension_exclusion ? "#both-disability-proof" : nil %>
             <%= f.cfa_radio_set(:mfj_disability, collection: [
               { value: "primary", label: t(".yes_me"), input_html: { "data-follow-up": primary_data_followup } },
               { value: "spouse", label: t(".yes_spouse"), input_html: { "data-follow-up": spouse_data_followup } },
               { value: "both", label: t(".yes_both"), input_html: { "data-follow-up": both_data_followup } },
               { value: "none", label: t(".no_neither") }
             ]) %>
           <% else %>
-            <% primary_data_followup = !current_intake.primary_senior? ? "#primary-disability-proof" : nil %>
             <%= f.cfa_radio_set(:primary_disabled, collection: [
               { value: "yes", label: t("general.affirmative"), input_html: { "data-follow-up": primary_data_followup } },
               { value: "no", label: t("general.negative") }
diff --git a/spec/controllers/state_file/questions/md_pension_exclusion_offboarding_controller_spec.rb b/spec/controllers/state_file/questions/md_pension_exclusion_offboarding_controller_spec.rb
@@ -29,11 +29,11 @@
     context "when they have 1099Rs in their DF XML" do
       context "when a filer is disabled" do
         before do
-          allow(intake).to receive(:filer_disabled?).and_return(true)
+          allow(intake).to receive(:has_at_least_one_disabled_filer?).and_return(true)
         end
-        context "has a disabled filer under 65" do
+        context "when we should warn about pension exclusion" do
           before do
-            allow(intake).to receive(:has_filer_under_65?).and_return(true)
+            allow(intake).to receive(:should_warn_about_pension_exclusion?).and_return(true)
           end
 
           context "has no proof of disability" do
@@ -57,9 +57,9 @@
           end
         end
 
-        context "does not have a filer under 65" do
+        context "should not warn about pension exclusion" do
           before do
-            allow(intake).to receive(:has_filer_under_65?).and_return(false)
+            allow(intake).to receive(:should_warn_about_pension_exclusion?).and_return(false)
           end
 
           context "has no proof of disability" do
@@ -82,7 +82,7 @@
 
       context "when no filers are disabled" do
         before do
-          allow(intake).to receive(:filer_disabled?).and_return(false)
+          allow(intake).to receive(:has_at_least_one_disabled_filer?).and_return(false)
         end
 
         it "shows" do
diff --git a/spec/controllers/state_file/questions/md_permanently_disabled_controller_spec.rb b/spec/controllers/state_file/questions/md_permanently_disabled_controller_spec.rb
@@ -62,87 +62,123 @@
     context "proof followup" do
       context "mfj filers" do
         let(:intake) { create :state_file_md_intake, :with_spouse }
-
-        it "has all followups when spouse is not senior" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
-          intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          get :edit
-
-          html = Nokogiri::HTML.parse(response.body)
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
-        end
-
-        it "has all followups primary is not senior" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
-          get :edit
-
-          html = Nokogiri::HTML.parse(response.body)
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
-        end
-
-        it "has all followups when neither are senior" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          get :edit
-
-          html = Nokogiri::HTML.parse(response.body)
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
+        context "with an eligible 1099r" do
+          let!(:state_file1099_r) { create :state_file1099_r, intake: intake }
+
+          it "has all followups when spouse is not senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
+            intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
+          end
+
+          it "has all followups primary is not senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
+          end
+
+          it "has all followups when neither are senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
+          end
+
+          it "has no followup id when both are senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
+            intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
+          end
+
+          it "does not have the pension exclusion warning when follow ups are shown but filing status is mfj" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
+            expect(html.to_s).not_to include('data-follow-up="#disability-warning"')
+          end
         end
 
-        it "has no followup id when both are senior" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
-          intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
-          get :edit
+        context "without an eligible 1099rs" do
+          let!(:state_file1099_r) { create :state_file1099_r, intake: intake, taxable_amount: 0}
 
-          html = Nokogiri::HTML.parse(response.body)
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).not_to be_present
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
-        end
+          it "has no followups when neither are senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            get :edit
 
-        it "does not have the pension exclusion warning when follow ups are shown but filing status is mfj" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          intake.update(spouse_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          get :edit
-
-          html = Nokogiri::HTML.parse(response.body)
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).to be_present
-          expect(html.to_s).not_to include('data-follow-up="#disability-warning"')
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
+          end
         end
       end
 
       context "not mfj" do
         let(:intake) { create :state_file_md_intake, filing_status: "single" }
 
-        it "has primary data followup and warning when primary is not senior" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
-          get :edit
+        context "with an eligible 1099rs" do
+          let!(:state_file1099_r) { create :state_file1099_r, intake: intake }
+          it "has primary data followup and warning when primary is not senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
+            expect(html.to_s).to include('data-follow-up="#disability-warning"')
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
+          end
+
+          it "does not have primary data followup when primary is senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
+            get :edit
+
+            html = Nokogiri::HTML.parse(response.body)
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
+          end
+        end
 
-          html = Nokogiri::HTML.parse(response.body)
+        context "without an eligible 1099rs" do
+          let!(:state_file1099_r) { create :state_file1099_r, intake: intake, taxable_amount: 0}
 
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).to be_present
-          expect(html.to_s).to include('data-follow-up="#disability-warning"')
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
-        end
+          it "has no followups and warning when primary is not senior" do
+            intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 64), 1, 1))
+            get :edit
 
-        it "does not have primary data followup when primary is senior" do
-          intake.update(primary_birth_date: Date.new((MultiTenantService.statefile.current_tax_year - 66), 1, 1))
-          get :edit
+            html = Nokogiri::HTML.parse(response.body)
 
-          html = Nokogiri::HTML.parse(response.body)
-          expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).not_to be_present
-          expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
-          expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#primary-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#spouse-disability-proof']")).not_to be_present
+            expect(html.at_css("input[data-follow-up='#both-disability-proof']")).not_to be_present
+          end
         end
       end
     end
diff --git a/spec/forms/state_file/md_permanently_disabled_form_spec.rb b/spec/forms/state_file/md_permanently_disabled_form_spec.rb
diff --git a/spec/models/state_file_md_intake_spec.rb b/spec/models/state_file_md_intake_spec.rb
