Gyr1 867 13614c clean up (#6138)

tahsinaislam · web-flow · commit 4b42a3815200 · 2026-01-08T11:26:31.000-06:00
diff --git a/app/forms/hub/create_client_form.rb b/app/forms/hub/create_client_form.rb
@@ -9,7 +9,7 @@ class CreateClientForm < ClientForm
                        :married,
                        :separated,
                        :widowed,
-                       :lived_with_spouse,
+                       :lived_without_spouse,
                        :divorced,
                        :divorced_year,
                        :separated_year,
diff --git a/app/forms/hub/update_13614c_form_page1.rb b/app/forms/hub/update_13614c_form_page1.rb
@@ -7,7 +7,7 @@ class Update13614cFormPage1 < ClientForm
                        :married,
                        :separated,
                        :widowed,
-                       :lived_with_spouse,
+                       :lived_without_spouse,
                        :divorced,
                        :divorced_year,
                        :separated_year,
@@ -48,7 +48,7 @@ class Update13614cFormPage1 < ClientForm
                        :spouse_us_citizen,
                        :spouse_visa,
                        :never_married,
-                       :married_for_all_of_tax_year,
+                       :married_last_day_of_year,
                        :receive_written_communication,
                        :preferred_written_language,
                        :presidential_campaign_fund_donation,
diff --git a/app/forms/hub/update_client_form.rb b/app/forms/hub/update_client_form.rb
@@ -8,7 +8,7 @@ class UpdateClientForm < ClientForm
                        :married,
                        :separated,
                        :widowed,
-                       :lived_with_spouse,
+                       :lived_without_spouse,
                        :divorced,
                        :divorced_year,
                        :separated_year,
diff --git a/app/helpers/filing_status_helper.rb b/app/helpers/filing_status_helper.rb
@@ -25,7 +25,7 @@ def marital_status(client)
 
     statuses = [
       (I18n.t("general.married") if intake.married == "yes"),
-      (I18n.t("general.lived_with_spouse") if intake.lived_with_spouse == "yes"),
+      (I18n.t("general.lived_without_spouse") if intake.try(:lived_without_spouse) == "yes" || intake.try(:lived_with_spouse) == "no"),
       ("#{I18n.t("general.separated")} #{intake.separated_year}" if intake.separated == "yes"),
       ("#{I18n.t("general.divorced")} #{intake.divorced_year}" if intake.divorced == "yes"),
       ("#{I18n.t("general.widowed")} #{intake.widowed_year}" if intake.widowed == "yes"),
diff --git a/app/lib/pdf_filler/f13614c_pdf.rb b/app/lib/pdf_filler/f13614c_pdf.rb
@@ -11,7 +11,7 @@ class F13614cPdf
       ever_married: [
         :paid_alimony,
         :divorced,
-        :lived_with_spouse,
+        :lived_without_spouse,
         :married,
         :received_alimony,
         :separated,
@@ -86,8 +86,10 @@ def hash_for_pdf
               "statusLegallySeparated[0].statusLegallySeparated[0]" => @intake.separated_yes?,
               "statusDivorced[0].statusDivorced[0]" => @intake.divorced_yes?,
               "statusWidowed[0].statusWidowed[0]" => @intake.widowed_yes?,
-              "liveApart[0].liveApartNo[0]" => @intake.lived_with_spouse_yes?,
-              "liveApart[0].liveApartYes[0]" => @intake.lived_with_spouse_no?
+              "liveApart[0].liveApartNo[0]" => @intake.lived_without_spouse_no?,
+              "liveApart[0].liveApartYes[0]" => @intake.lived_without_spouse_yes?,
+              "lastDay[0].lastDayYes[0]" => @intake.married_last_day_of_year_yes?,
+              "lastDay[0].lastDayNo[0]" => @intake.married_last_day_of_year_no?
             }
           end
         )
diff --git a/app/models/intake.rb b/app/models/intake.rb
@@ -206,11 +206,13 @@
 #  issued_identity_pin                                  :integer          default(0), not null
 #  job_count                                            :integer
 #  lived_with_spouse                                    :integer          default(0), not null
+#  lived_without_spouse                                 :integer          default(0), not null
 #  locale                                               :string
 #  made_estimated_tax_payments                          :integer          default(0), not null
 #  made_estimated_tax_payments_amount                   :decimal(12, 2)
 #  married                                              :integer          default(0), not null
 #  married_for_all_of_tax_year                          :integer          default(0), not null
+#  married_last_day_of_year                             :integer          default(0), not null
 #  multiple_states                                      :integer          default(0), not null
 #  navigator_has_verified_client_identity               :boolean
 #  navigator_name                                       :string
diff --git a/app/models/intake/ctc_intake.rb b/app/models/intake/ctc_intake.rb
@@ -206,11 +206,13 @@
 #  issued_identity_pin                                  :integer          default(0), not null
 #  job_count                                            :integer
 #  lived_with_spouse                                    :integer          default(0), not null
+#  lived_without_spouse                                 :integer          default(0), not null
 #  locale                                               :string
 #  made_estimated_tax_payments                          :integer          default(0), not null
 #  made_estimated_tax_payments_amount                   :decimal(12, 2)
 #  married                                              :integer          default(0), not null
 #  married_for_all_of_tax_year                          :integer          default(0), not null
+#  married_last_day_of_year                             :integer          default(0), not null
 #  multiple_states                                      :integer          default(0), not null
 #  navigator_has_verified_client_identity               :boolean
 #  navigator_name                                       :string
diff --git a/app/models/intake/gyr_intake.rb b/app/models/intake/gyr_intake.rb
@@ -206,11 +206,13 @@
 #  issued_identity_pin                                  :integer          default("unfilled"), not null
 #  job_count                                            :integer
 #  lived_with_spouse                                    :integer          default("unfilled"), not null
+#  lived_without_spouse                                 :integer          default("unfilled"), not null
 #  locale                                               :string
 #  made_estimated_tax_payments                          :integer          default("unfilled"), not null
 #  made_estimated_tax_payments_amount                   :decimal(12, 2)
 #  married                                              :integer          default("unfilled"), not null
 #  married_for_all_of_tax_year                          :integer          default("unfilled"), not null
+#  married_last_day_of_year                             :integer          default("unfilled"), not null
 #  multiple_states                                      :integer          default("unfilled"), not null
 #  navigator_has_verified_client_identity               :boolean
 #  navigator_name                                       :string
@@ -450,9 +452,11 @@ class Intake::GyrIntake < Intake
   enum income_over_limit: { unfilled: 0, yes: 1, no: 2, unsure: 3 }, _prefix: :income_over_limit
   enum issued_identity_pin: { unfilled: 0, yes: 1, no: 2, unsure: 3 }, _prefix: :issued_identity_pin
   enum lived_with_spouse: { unfilled: 0, yes: 1, no: 2, unsure: 3 }, _prefix: :lived_with_spouse
+  enum lived_without_spouse: { unfilled: 0, yes: 1, no: 2, unsure: 3 }, _prefix: :lived_without_spouse
   enum made_estimated_tax_payments: { unfilled: 0, yes: 1, no: 2, unsure: 3 }, _prefix: :made_estimated_tax_payments
   enum married: { unfilled: 0, yes: 1, no: 2 }, _prefix: :married
   enum married_for_all_of_tax_year: { unfilled: 0, yes: 1, no: 2 }, _prefix: :married_for_all_of_tax_year
+  enum married_last_day_of_year: { unfilled: 0, yes: 1, no: 2 }, _prefix: :married_last_day_of_year
   enum multiple_states: { unfilled: 0, yes: 1, no: 2, unsure: 3 }, _prefix: :multiple_states
   enum needs_help_previous_year_3: {unfilled: 0, yes: 1, no: 2}, _prefix: :needs_help_previous_year_3
   enum needs_help_previous_year_2: {unfilled: 0, yes: 1, no: 2}, _prefix: :needs_help_previous_year_2
diff --git a/app/views/hub/clients/edit_13614c_form_page1.html.erb b/app/views/hub/clients/edit_13614c_form_page1.html.erb
@@ -143,8 +143,8 @@
         </div>
         <div class="hub-form__row">
           <%= f.hub_checkbox(:married, t("general.married"), options: { classes: ["checkbox--wide"], checked_value: "yes", unchecked_value: "no" }) %>
-          <%= f.cfa_select(:married_for_all_of_tax_year, 'If married, were you married for all of 2024', yes_no_options_for_select) %>
-          <%= f.cfa_select(:lived_with_spouse, t(".fields.lived_with_spouse"), yes_no_options_for_select) %>
+          <%= f.cfa_select(:married_last_day_of_year, 'If married, were you married on the last day of the year', yes_no_options_for_select) %>
+          <%= f.cfa_select(:lived_without_spouse, t(".fields.lived_without_spouse"), yes_no_options_for_select) %>
         </div>
         <div class="hub-form__row">
           <%= f.hub_checkbox(:divorced, t("general.divorced"), options: { classes: ["checkbox--wide"], checked_value: "yes", unchecked_value: "no" }) %>
diff --git a/app/views/shared/_marital_status_fields.html.erb b/app/views/shared/_marital_status_fields.html.erb
@@ -7,7 +7,7 @@
     <%= f.hub_checkbox(:married, t("general.married"), options: { checked_value: "yes", unchecked_value: "no" }) %>
   </div>
   <div class="hub-form__row">
-    <%= f.hub_checkbox(:lived_with_spouse, t("general.lived_with_spouse"), options: { classes: ["checkbox--wide"], checked_value: "yes", unchecked_value: "no" }) %>
+    <%= f.hub_checkbox(:lived_without_spouse, t("general.lived_without_spouse"), options: { classes: ["checkbox--wide"], checked_value: "yes", unchecked_value: "no" }) %>
   </div>
   <div class="hub-form__row">
     <%= f.hub_checkbox(:separated, t("general.separated"), options: { classes: ["checkbox--wide"], checked_value: "yes", unchecked_value: "no" }) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -508,7 +508,7 @@ en:
     last_four_ssn: Last 4 of SSN/ITIN
     last_name: Last name
     less_than_one_day: "<1 day"
-    lived_with_spouse: Lived with spouse
+    lived_without_spouse: Lived without spouse
     locked: Locked
     log_out: Log out
     login: Login
@@ -783,7 +783,7 @@ en:
           job_title: Job Title
           last_name: Last Name
           lived_or_worked_in_two_or_more_states: Did you live or work in two or more states in 2024?
-          lived_with_spouse: B. Did you live with your spouse during any part of the last six months of 2024?
+          lived_without_spouse: Did you and your spouse live apart all of the last 6 months of the year
           middle_initial: M.I.
           months_in_home: "# of mos. lived in home last year:"
           never_married: Never Married
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -509,7 +509,7 @@ es:
     last_four_ssn: Últimos 4 de SSN)/ITIN
     last_name: Apellido
     less_than_one_day: "<1 día"
-    lived_with_spouse: Vivieron con su cónyuge
+    lived_without_spouse: Vivieron sin cónyuge
     locked: Bloqueada
     log_out: Cerrar sesión
     login: Iniciar sesión
@@ -791,7 +791,7 @@ es:
           job_title: Título de puesto
           last_name: Apellido
           lived_or_worked_in_two_or_more_states: Did you live or work in two or more states in 2024?
-          lived_with_spouse: B. Did you live with your spouse during any part of the last six months of 2024?
+          lived_without_spouse: Did you and your spouse live apart all of the last 6 months of the year
           middle_initial: Inicial de su segundo nombre
           months_in_home: "# o número de meses que vivió en su casa el año pasado:"
           never_married: Nunca se ha casado
diff --git a/db/migrate/20251211181212_change_married_column_for_intake.rb b/db/migrate/20251211181212_change_married_column_for_intake.rb
@@ -0,0 +1,5 @@
+class ChangeMarriedColumnForIntake < ActiveRecord::Migration[7.1]
+  def change
+    add_column :intakes, :married_last_day_of_year, :integer, default: 0, null: false
+  end
+end
diff --git a/db/migrate/20251215185245_add_lived_without_spouse_to_intake.rb b/db/migrate/20251215185245_add_lived_without_spouse_to_intake.rb
@@ -0,0 +1,5 @@
+class AddLivedWithoutSpouseToIntake < ActiveRecord::Migration[7.1]
+  def change
+    add_column :intakes, :lived_without_spouse, :integer, default: 0, null: false
+  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_12_11_172223) do
+ActiveRecord::Schema[7.1].define(version: 2025_12_15_185245) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
   enable_extension "plpgsql"
@@ -1353,11 +1353,13 @@
     t.integer "issued_identity_pin", default: 0, null: false
     t.integer "job_count"
     t.integer "lived_with_spouse", default: 0, null: false
+    t.integer "lived_without_spouse", default: 0, null: false
     t.string "locale"
     t.integer "made_estimated_tax_payments", default: 0, null: false
     t.decimal "made_estimated_tax_payments_amount", precision: 12, scale: 2
     t.integer "married", default: 0, null: false
     t.integer "married_for_all_of_tax_year", default: 0, null: false
+    t.integer "married_last_day_of_year", default: 0, null: false
     t.bigint "matching_previous_year_intake_id"
     t.integer "multiple_states", default: 0, null: false
     t.boolean "navigator_has_verified_client_identity"
diff --git a/spec/controllers/hub/clients_controller_spec.rb b/spec/controllers/hub/clients_controller_spec.rb
@@ -54,7 +54,7 @@
           married: "yes",
           separated: "no",
           widowed: "no",
-          lived_with_spouse: "yes",
+          lived_without_spouse: "yes",
           divorced: "no",
           divorced_year: "",
           separated_year: "",
@@ -211,7 +211,7 @@
              needs_help_current_year: "yes",
              needs_help_previous_year_1: "yes",
              married: "yes",
-             lived_with_spouse: "yes",
+             lived_without_spouse: "yes",
              filing_joint: "yes",
              state: "CA",
              city: "Oakland",
@@ -252,7 +252,7 @@
         expect(profile).to have_text(client.email_address)
         expect(profile).to have_text(client.phone_number)
         expect(profile).to have_text("English")
-        expect(profile).to have_text("Married, Lived with spouse")
+        expect(profile).to have_text("Married, Lived without spouse")
         expect(profile).to have_text("Filing jointly")
         expect(profile).to have_text("Oakland, CA 94606")
         expect(profile).to have_text("Spouse Contact Info")
@@ -976,7 +976,7 @@
                        married: intake.married,
                        separated: intake.separated,
                        widowed: intake.widowed,
-                       lived_with_spouse: intake.lived_with_spouse,
+                       lived_without_spouse: intake.lived_without_spouse,
                        divorced: intake.divorced,
                        divorced_year: intake.divorced_year,
                        separated_year: intake.separated_year,
@@ -1723,7 +1723,7 @@
             got_married_during_tax_year: "unfilled",
             separated: intake.separated,
             widowed: intake.widowed,
-            lived_with_spouse: intake.lived_with_spouse,
+            lived_without_spouse: intake.lived_without_spouse,
             divorced: intake.divorced,
             divorced_year: intake.divorced_year,
             separated_year: intake.separated_year,
diff --git a/spec/factories/intakes.rb b/spec/factories/intakes.rb
@@ -109,7 +109,7 @@ def self.roman_numerals(n)
     divorced { "yes" }
     divorced_year { "2018" }
     ever_married { "yes" }
-    lived_with_spouse { "yes" }
+    lived_without_spouse { "yes" }
     widowed { "no" }
     widowed_year { "2016" }
     separated { "yes" }
diff --git a/spec/features/hub/create_client_spec.rb b/spec/features/hub/create_client_spec.rb
@@ -55,7 +55,7 @@
         fill_in "Separated year", with: "2017"
         check "Widowed"
         fill_in "Widowed year", with: "2015"
-        check "Lived with spouse"
+        check "Lived without spouse"
         check "Divorced"
         fill_in "Divorced year", with: "2018"
         check "Filing jointly"
@@ -88,7 +88,7 @@
       expect(page).to have_text "Married"
       expect(page).to have_text "Separated 2017"
       expect(page).to have_text "Widowed 2015"
-      expect(page).to have_text "Lived with spouse"
+      expect(page).to have_text "Lived without spouse"
       expect(page).to have_text "Divorced 2018"
       expect(page).to have_text "Filing jointly"
       expect(page).to have_text "hello@cauliflower.com"
diff --git a/spec/features/hub/edit_13614c_spec.rb b/spec/features/hub/edit_13614c_spec.rb
@@ -43,7 +43,7 @@
                             spouse_owned_or_held_any_digital_currencies: 'no',
                             spouse_was_full_time_student: "no",
                             issued_identity_pin: "unsure",
-                            lived_with_spouse: "unsure",
+                            lived_without_spouse: "unsure",
                             dependents: [
                               create(:dependent, first_name: "Lara", last_name: "Legume", birth_date: "2007-03-06"),
                             ],
diff --git a/spec/features/hub/edit_client_spec.rb b/spec/features/hub/edit_client_spec.rb
@@ -93,7 +93,7 @@
       within "#marital-status-fields" do
         check "Filing jointly"
         check "Married"
-        check "Lived with spouse"
+        check "Lived without spouse"
         check "Separated"
         fill_in "Separated year", with: "2017"
         check "Widowed"
@@ -174,7 +174,7 @@
       expect(page).to have_text "Married"
       expect(page).to have_text "Separated 2017"
       expect(page).to have_text "Widowed 2015"
-      expect(page).to have_text "Lived with spouse"
+      expect(page).to have_text "Lived without spouse"
       expect(page).to have_text "Divorced 2018"
       expect(page).to have_text "Filing jointly"
       expect(page).to have_text "Pacific Time (US & Canada)"
@@ -250,7 +250,7 @@
 
       expect(changes_table_contents('.changes-table')).to match({
         "divorced" => ["unfilled", "no"],
-        "lived_with_spouse" => ["unfilled", "no"],
+        "lived_without_spouse" => ["unfilled", "no"],
         "married" => ["unfilled", "no"],
         "preferred_name" => ["Colleen Cauliflower", "Colly Cauliflower"],
         "separated" => ["unfilled", "no"],
diff --git a/spec/forms/hub/create_client_form_spec.rb b/spec/forms/hub/create_client_form_spec.rb
@@ -30,7 +30,7 @@
         married: "yes",
         separated: "no",
         widowed: "no",
-        lived_with_spouse: "yes",
+        lived_without_spouse: "yes",
         divorced: "no",
         divorced_year: "",
         separated_year: "",
diff --git a/spec/forms/hub/update_client_form_spec.rb b/spec/forms/hub/update_client_form_spec.rb
@@ -25,7 +25,7 @@
         married: intake.married,
         separated: intake.separated,
         widowed: intake.widowed,
-        lived_with_spouse: intake.lived_with_spouse,
+        lived_without_spouse: intake.lived_without_spouse,
         divorced: intake.divorced,
         divorced_year: intake.divorced_year,
         separated_year: intake.separated_year,
diff --git a/spec/lib/pdf_filler/f13614c_pdf_spec.rb b/spec/lib/pdf_filler/f13614c_pdf_spec.rb
@@ -76,10 +76,11 @@
           has_ssn_of_alimony_recipient: "yes",
           issued_identity_pin: "no",
           job_count: 5,
-          lived_with_spouse: "yes",
+          lived_without_spouse: "no",
           made_estimated_tax_payments: "unsure",
           made_estimated_tax_payments_amount: 0,
           married: "yes",
+          married_last_day_of_year: "yes",
           multiple_states: "yes",
           new_vehicle_purchased: "yes",
           had_other_income: "yes",
@@ -334,6 +335,8 @@
                             +"form1[0].page1[0].maritalStatus[0].lastDay[0].lastDayYes[0]" => "Off",
                             "form1[0].page1[0].maritalStatus[0].liveApart[0].liveApartYes[0]" => "Off",
                             "form1[0].page1[0].maritalStatus[0].liveApart[0].liveApartNo[0]" => "1",
+                            "form1[0].page1[0].maritalStatus[0].lastDay[0].lastDayYes[0]" => "1",
+                            "form1[0].page1[0].maritalStatus[0].lastDay[0].lastDayNo[0]" => "Off",
                             "form1[0].page1[0].maritalStatus[0].statusDivorced[0].dateFinalDecree[0]" => "2015",
                             "form1[0].page1[0].maritalStatus[0].statusDivorced[0].statusDivorced[0]" => "Off",
                             "form1[0].page1[0].maritalStatus[0].statusLegallySeparated[0].dateSeparateDecree[0]" => "2016",
diff --git a/spec/models/intake/gyr_intake_spec.rb b/spec/models/intake/gyr_intake_spec.rb
diff --git a/spec/models/intake_spec.rb b/spec/models/intake_spec.rb
