feat: fix buyer 2 nationality routing, use helper methods everywhere

app/models/form/sales/pages/age1.rb

@@ -4,10 +4,10 @@ class Form::Sales::Pages::Age1 < ::Form::Page
     @id = "buyer_1_age"
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/age2.rb

@@ -4,12 +4,12 @@ class Form::Sales::Pages::Age2 < ::Form::Page
     @id = "buyer_2_age"
     @depends_on = [
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/buyer1_ethnic_group.rb

@@ -4,10 +4,10 @@ class Form::Sales::Pages::Buyer1EthnicGroup < ::Form::Page
     @id = "buyer_1_ethnic_group"
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/buyer1_live_in_property.rb

@@ -4,10 +4,10 @@ class Form::Sales::Pages::Buyer1LiveInProperty < ::Form::Page
     @id = "buyer_1_live_in_property"
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/buyer1_working_situation.rb

@@ -4,10 +4,10 @@ class Form::Sales::Pages::Buyer1WorkingSituation < ::Form::Page
     @id = "buyer_1_working_situation"
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/buyer2_ethnic_group.rb

@@ -4,12 +4,12 @@ class Form::Sales::Pages::Buyer2EthnicGroup < ::Form::Page
     @id = "buyer_2_ethnic_group"
     @depends_on = [
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/buyer2_income.rb

@@ -3,7 +3,7 @@ class Form::Sales::Pages::Buyer2Income < ::Form::Page
     super
     @id = "buyer_2_income"
     @depends_on = [{
-      "jointpur" => 1,
+      "joint_purchase?" => true,
     }]
   end
 

app/models/form/sales/pages/buyer2_live_in_property.rb

@@ -5,7 +5,7 @@ class Form::Sales::Pages::Buyer2LiveInProperty < ::Form::Page
     @depends_on = [
       {
         "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
         "joint_purchase?" => true,

app/models/form/sales/pages/buyer2_mortgage.rb

@@ -2,7 +2,7 @@ class Form::Sales::Pages::Buyer2Mortgage < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_mortgage"
-    @depends_on = [{ "jointpur" => 1 }]
+    @depends_on = [{ "joint_purchase?" => true }]
   end
 
   def questions

app/models/form/sales/pages/buyer2_nationality.rb

@@ -2,7 +2,16 @@ class Form::Sales::Pages::Buyer2Nationality < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_nationality"
-    @depends_on = [{ "joint_purchase?" => true }]
+    @depends_on = [
+      {
+        "joint_purchase?" => true,
+        "buyer_has_seen_privacy_notice?" => true,
+      },
+      {
+        "joint_purchase?" => true,
+        "buyer_not_interviewed?" => true,
+      },
+    ]
   end
 
   def questions

app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb

@@ -4,12 +4,12 @@ class Form::Sales::Pages::Buyer2RelationshipToBuyer1 < ::Form::Page
     @id = "buyer_2_relationship_to_buyer_1"
     @depends_on = [
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/buyer2_working_situation.rb

@@ -4,12 +4,12 @@ class Form::Sales::Pages::Buyer2WorkingSituation < ::Form::Page
     @id = "buyer_2_working_situation"
     @depends_on = [
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/gender_identity1.rb

@@ -4,10 +4,10 @@ class Form::Sales::Pages::GenderIdentity1 < ::Form::Page
     @id = "buyer_1_gender_identity"
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/gender_identity2.rb

@@ -4,12 +4,12 @@ class Form::Sales::Pages::GenderIdentity2 < ::Form::Page
     @id = "buyer_2_gender_identity"
     @depends_on = [
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ]
   end

app/models/form/sales/pages/mortgage_value_check.rb

@@ -17,7 +17,7 @@ class Form::Sales::Pages::MortgageValueCheck < ::Form::Page
       [
         {
           "mortgage_over_soft_max?" => true,
-          "jointpur" => 1,
+          "joint_purchase?" => true,
         },
       ]
     else

app/models/form/sales/pages/nationality1.rb

@@ -4,7 +4,7 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page
     @id = "buyer_1_nationality"
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
         "buyer_not_interviewed?" => true,

app/models/form/sales/pages/number_joint_buyers.rb

@@ -3,7 +3,7 @@ class Form::Sales::Pages::NumberJointBuyers < ::Form::Page
     super
     @id = "number_joint_buyers"
     @depends_on = [{
-      "jointpur" => 1,
+      "joint_purchase?" => true,
     }]
   end
 

app/models/form/sales/pages/number_of_others_in_property.rb

@@ -3,7 +3,7 @@ class Form::Sales::Pages::NumberOfOthersInProperty < ::Form::Page
     super(id, hsh, subsection)
     @depends_on = [
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
         "joint_purchase?" => joint_purchase,
       },
       {

app/models/form/sales/pages/person_known.rb

@@ -13,18 +13,18 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person
 
   def depends_on
     if @person_index == 2
-      [{ "jointpur" => 2,
+      [{ "not_joint_purchase?" => true,
          "hholdcount" => {
            "operator" => ">=",
            "operand" => 1,
          } }]
     else
-      [{ "jointpur" => 2,
+      [{ "not_joint_purchase?" => true,
          "hholdcount" => {
            "operator" => ">=",
            "operand" => @person_index - 1,
          } },
-       { "jointpur" => 1,
+       { "joint_purchase?" => true,
          "hholdcount" => {
            "operator" => ">=",
            "operand" => @person_index - 2,

app/models/sales_log.rb

@@ -272,6 +272,10 @@ class SalesLog < Log
     jointpur == 2
   end
 
+  def buyer_has_seen_privacy_notice?
+    privacynotice == 1
+  end
+
   def buyer_not_interviewed?
     noint == 1
   end

db/schema.rb

@@ -519,6 +519,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.integer "prevten"
     t.integer "mortgageused"
     t.integer "wchair"
+    t.integer "income2_value_check"
     t.integer "armedforcesspouse"
     t.datetime "hodate", precision: nil
     t.integer "hoday"
@@ -543,14 +544,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.integer "retirement_value_check"
     t.integer "hodate_check"
     t.integer "extrabor_value_check"
-    t.integer "grant_value_check"
-    t.integer "staircase_bought_value_check"
     t.integer "deposit_and_mortgage_value_check"
     t.integer "shared_ownership_deposit_value_check"
+    t.integer "grant_value_check"
+    t.integer "value_value_check"
     t.integer "old_persons_shared_ownership_value_check"
-    t.integer "income2_value_check"
+    t.integer "staircase_bought_value_check"
     t.integer "monthly_charges_value_check"
-    t.integer "value_value_check"
     t.integer "details_known_5"
     t.integer "details_known_6"
     t.integer "saledate_check"
@@ -560,10 +560,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.integer "ethnicbuy2"
     t.integer "proplen_asked"
     t.string "old_id"
-    t.integer "pregblank"
     t.integer "buy2living"
     t.integer "prevtenbuy2"
-    t.integer "nationalbuy2"
+    t.integer "pregblank"
     t.string "uprn"
     t.integer "uprn_known"
     t.integer "uprn_confirmed"
@@ -571,10 +570,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.string "address_line2"
     t.string "town_or_city"
     t.string "county"
+    t.integer "nationalbuy2"
     t.integer "discounted_sale_value_check"
     t.integer "student_not_child_value_check"
-    t.integer "buyer_livein_value_check"
     t.integer "percentage_discount_value_check"
+    t.integer "buyer_livein_value_check"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["old_id"], name: "index_sales_logs_on_old_id", unique: true

spec/models/form/sales/pages/age1_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Age1, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
+    expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }])
   end
 end

spec/models/form/sales/pages/age2_spec.rb

@@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Age2, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ])
   end

spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer1EthnicGroup, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
+    expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }])
   end
 end

spec/models/form/sales/pages/buyer1_live_in_property_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer1LiveInProperty, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
+    expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }])
   end
 end

spec/models/form/sales/pages/buyer2_ethnic_group_spec.rb

@@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2EthnicGroup, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ])
   end

spec/models/form/sales/pages/buyer2_income_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer2Income, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "jointpur" => 1 }])
+    expect(page.depends_on).to eq([{ "joint_purchase?" => true }])
   end
 end

spec/models/form/sales/pages/buyer2_live_in_property_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
     expect(page.depends_on).to eq([
       {
         "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
         "joint_purchase?" => true,

spec/models/form/sales/pages/buyer2_mortgage_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::Buyer2Mortgage, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "jointpur" => 1 }])
+    expect(page.depends_on).to eq([{ "joint_purchase?" => true }])
   end
 end

spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb

@@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2RelationshipToBuyer1, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ])
   end

spec/models/form/sales/pages/buyer2_working_situation_spec.rb

@@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ])
   end

spec/models/form/sales/pages/gender_identity1_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::GenderIdentity1, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
+    expect(page.depends_on).to eq([{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }])
   end
 end

spec/models/form/sales/pages/gender_identity2_spec.rb

@@ -30,12 +30,12 @@ RSpec.describe Form::Sales::Pages::GenderIdentity2, type: :model do
   it "has correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
       },
       {
-        "jointpur" => 1,
+        "joint_purchase?" => true,
-        "noint" => 1,
+        "buyer_not_interviewed?" => true,
       },
     ])
   end

spec/models/form/sales/pages/housing_benefits_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Form::Sales::Pages::HousingBenefits, type: :model do
 
   context "when joint_purchase is false" do
     it "has correct depends_on" do
-      expect(page.depends_on).to eq([{ "jointpur" => 2 }])
+      expect(page.depends_on).to eq([{ "not_joint_purchase?" => true }])
     end
   end
 
@@ -38,7 +38,7 @@ RSpec.describe Form::Sales::Pages::HousingBenefits, type: :model do
     let(:joint_purchase) { true }
 
     it "has correct depends_on" do
-      expect(page.depends_on).to eq([{ "jointpur" => 1 }])
+      expect(page.depends_on).to eq([{ "joint_purchase?" => true }])
     end
   end
 end

spec/models/form/sales/pages/mortgage_value_check_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do
       expect(page.depends_on).to eq([
         {
           "mortgage_over_soft_max?" => true,
-          "jointpur" => 1,
+          "joint_purchase?" => true,
         },
       ])
     end

spec/models/form/sales/pages/nationality1_spec.rb

@@ -26,6 +26,6 @@ RSpec.describe Form::Sales::Pages::Nationality1, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq [{ "privacynotice" => 1 }, { "buyer_not_interviewed?" => true }]
+    expect(page.depends_on).to eq [{ "buyer_has_seen_privacy_notice?" => true }, { "buyer_not_interviewed?" => true }]
   end
 end

spec/models/form/sales/pages/number_joint_buyers_spec.rb

@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::NumberJointBuyers, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "jointpur" => 1 }])
+    expect(page.depends_on).to eq([{ "joint_purchase?" => true }])
   end
 end

spec/models/form/sales/pages/number_of_others_in_property_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
   it "has the correct depends_on" do
     expect(page.depends_on).to eq([
       {
-        "privacynotice" => 1,
+        "buyer_has_seen_privacy_notice?" => true,
         "joint_purchase?" => joint_purchase,
       },
       {
@@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Pages::NumberOfOthersInProperty, type: :model do
     it "has the correct depends_on" do
       expect(page.depends_on).to eq([
         {
-          "privacynotice" => 1,
+          "buyer_has_seen_privacy_notice?" => true,
           "joint_purchase?" => joint_purchase,
         },
         {

spec/models/form/sales/pages/person_known_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
 
       it "has correct depends_on" do
         expect(page.depends_on).to eq([{
-          "jointpur" => 2,
+          "not_joint_purchase?" => true,
           "hholdcount" => {
             "operator" => ">=",
             "operand" => 1,
@@ -67,14 +67,14 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       it "has correct depends_on" do
         expect(page.depends_on).to eq([
           {
-            "jointpur" => 2,
+            "not_joint_purchase?" => true,
             "hholdcount" => {
               "operator" => ">=",
               "operand" => 2,
             },
           },
           {
-            "jointpur" => 1,
+            "joint_purchase?" => true,
             "hholdcount" => {
               "operator" => ">=",
               "operand" => 1,
@@ -104,14 +104,14 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       it "has correct depends_on" do
         expect(page.depends_on).to eq([
           {
-            "jointpur" => 2,
+            "not_joint_purchase?" => true,
             "hholdcount" => {
               "operator" => ">=",
               "operand" => 3,
             },
           },
           {
-            "jointpur" => 1,
+            "joint_purchase?" => true,
             "hholdcount" => {
               "operator" => ">=",
               "operand" => 2,
@@ -140,14 +140,14 @@ RSpec.describe Form::Sales::Pages::PersonKnown, type: :model do
       it "has correct depends_on" do
         expect(page.depends_on).to eq([
           {
-            "jointpur" => 2,
+            "not_joint_purchase?" => true,
             "hholdcount" => {
               "operator" => ">=",
               "operand" => 4,
             },
           },
           {
-            "jointpur" => 1,
+            "joint_purchase?" => true,
             "hholdcount" => {
               "operator" => ">=",
               "operand" => 3,