From a54418e8300df8afec85b543baed1d48e2495992 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Tue, 31 Jan 2023 10:28:33 +0000
Subject: [PATCH] Display the household questions if the buyers were not
 interviewed

---
 app/models/form/sales/pages/age1.rb                | 11 ++++++++---
 app/models/form/sales/pages/age2.rb                | 14 ++++++++++----
 app/models/form/sales/pages/buyer1_ethnic_group.rb | 11 ++++++++---
 .../form/sales/pages/buyer1_live_in_property.rb    | 11 ++++++++---
 .../form/sales/pages/buyer1_working_situation.rb   | 11 ++++++++---
 .../form/sales/pages/buyer2_live_in_property.rb    | 14 ++++++++++----
 .../sales/pages/buyer2_relationship_to_buyer1.rb   | 14 ++++++++++----
 .../form/sales/pages/buyer2_working_situation.rb   | 14 ++++++++++----
 app/models/form/sales/pages/gender_identity1.rb    | 11 ++++++++---
 app/models/form/sales/pages/gender_identity2.rb    | 14 ++++++++++----
 app/models/form/sales/pages/nationality1.rb        | 11 ++++++++---
 .../sales/pages/number_of_others_in_property.rb    | 11 ++++++++---
 app/models/form/sales/pages/privacy_notice.rb      |  3 +++
 spec/models/form/sales/pages/age1_spec.rb          |  2 +-
 spec/models/form/sales/pages/age2_spec.rb          | 14 ++++++++++----
 .../form/sales/pages/buyer1_ethnic_group_spec.rb   |  2 +-
 .../sales/pages/buyer1_live_in_property_spec.rb    |  2 +-
 .../sales/pages/buyer2_live_in_property_spec.rb    | 11 ++++++++++-
 .../pages/buyer2_relationship_to_buyer1_spec.rb    | 14 ++++++++++----
 .../sales/pages/buyer2_working_situation_spec.rb   | 14 ++++++++++----
 .../form/sales/pages/gender_identity1_spec.rb      |  2 +-
 .../form/sales/pages/gender_identity2_spec.rb      | 14 ++++++++++----
 spec/models/form/sales/pages/nationality1_spec.rb  |  2 +-
 .../models/form/sales/pages/privacy_notice_spec.rb |  2 +-
 24 files changed, 165 insertions(+), 64 deletions(-)

diff --git a/app/models/form/sales/pages/age1.rb b/app/models/form/sales/pages/age1.rb
index 4a80f806b..5aed5c4f3 100644
--- a/app/models/form/sales/pages/age1.rb
+++ b/app/models/form/sales/pages/age1.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::Age1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_age"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/age2.rb b/app/models/form/sales/pages/age2.rb
index 93f5e9ee0..ff0666988 100644
--- a/app/models/form/sales/pages/age2.rb
+++ b/app/models/form/sales/pages/age2.rb
@@ -2,10 +2,16 @@ class Form::Sales::Pages::Age2 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_age"
-    @depends_on = [{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_ethnic_group.rb b/app/models/form/sales/pages/buyer1_ethnic_group.rb
index dc7d11cf9..73d66b328 100644
--- a/app/models/form/sales/pages/buyer1_ethnic_group.rb
+++ b/app/models/form/sales/pages/buyer1_ethnic_group.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::Buyer1EthnicGroup < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_ethnic_group"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_live_in_property.rb b/app/models/form/sales/pages/buyer1_live_in_property.rb
index 803d3fb7a..deb6275af 100644
--- a/app/models/form/sales/pages/buyer1_live_in_property.rb
+++ b/app/models/form/sales/pages/buyer1_live_in_property.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::Buyer1LiveInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_live_in_property"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer1_working_situation.rb b/app/models/form/sales/pages/buyer1_working_situation.rb
index 6ddaafc9f..66cf38e69 100644
--- a/app/models/form/sales/pages/buyer1_working_situation.rb
+++ b/app/models/form/sales/pages/buyer1_working_situation.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::Buyer1WorkingSituation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_working_situation"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer2_live_in_property.rb b/app/models/form/sales/pages/buyer2_live_in_property.rb
index 52b5e3ca8..9ba67080b 100644
--- a/app/models/form/sales/pages/buyer2_live_in_property.rb
+++ b/app/models/form/sales/pages/buyer2_live_in_property.rb
@@ -2,10 +2,16 @@ class Form::Sales::Pages::Buyer2LiveInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_live_in_property"
-    @depends_on = [{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb
index 089d34ca9..7a1612d1f 100644
--- a/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb
+++ b/app/models/form/sales/pages/buyer2_relationship_to_buyer1.rb
@@ -2,10 +2,16 @@ class Form::Sales::Pages::Buyer2RelationshipToBuyer1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_relationship_to_buyer_1"
-    @depends_on = [{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/buyer2_working_situation.rb b/app/models/form/sales/pages/buyer2_working_situation.rb
index 8c3ad1cfc..704fc0eac 100644
--- a/app/models/form/sales/pages/buyer2_working_situation.rb
+++ b/app/models/form/sales/pages/buyer2_working_situation.rb
@@ -2,10 +2,16 @@ class Form::Sales::Pages::Buyer2WorkingSituation < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_working_situation"
-    @depends_on = [{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/gender_identity1.rb b/app/models/form/sales/pages/gender_identity1.rb
index 5693b15ed..a9d333cf4 100644
--- a/app/models/form/sales/pages/gender_identity1.rb
+++ b/app/models/form/sales/pages/gender_identity1.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::GenderIdentity1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_gender_identity"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/gender_identity2.rb b/app/models/form/sales/pages/gender_identity2.rb
index ebd830f78..f79c3dc4a 100644
--- a/app/models/form/sales/pages/gender_identity2.rb
+++ b/app/models/form/sales/pages/gender_identity2.rb
@@ -2,10 +2,16 @@ class Form::Sales::Pages::GenderIdentity2 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_2_gender_identity"
-    @depends_on = [{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/nationality1.rb b/app/models/form/sales/pages/nationality1.rb
index 354bbccc7..96723e857 100644
--- a/app/models/form/sales/pages/nationality1.rb
+++ b/app/models/form/sales/pages/nationality1.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_nationality"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/number_of_others_in_property.rb b/app/models/form/sales/pages/number_of_others_in_property.rb
index bc173691f..c090422fd 100644
--- a/app/models/form/sales/pages/number_of_others_in_property.rb
+++ b/app/models/form/sales/pages/number_of_others_in_property.rb
@@ -2,9 +2,14 @@ class Form::Sales::Pages::NumberOfOthersInProperty < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "number_of_others_in_property"
-    @depends_on = [{
-      "privacynotice" => 1,
-    }]
+    @depends_on = [
+      {
+        "privacynotice" => 1,
+      },
+      {
+        "noint" => 1,
+      },
+    ]
   end
 
   def questions
diff --git a/app/models/form/sales/pages/privacy_notice.rb b/app/models/form/sales/pages/privacy_notice.rb
index dc4bfa70d..a41800194 100644
--- a/app/models/form/sales/pages/privacy_notice.rb
+++ b/app/models/form/sales/pages/privacy_notice.rb
@@ -3,6 +3,9 @@ class Form::Sales::Pages::PrivacyNotice < ::Form::Page
     super
     @id = "privacy_notice"
     @header = "Department for Levelling Up, Housing and Communities privacy notice"
+    @depends_on = [{
+      "noint" => 2,
+    }]
   end
 
   def questions
diff --git a/spec/models/form/sales/pages/age1_spec.rb b/spec/models/form/sales/pages/age1_spec.rb
index 2a9817558..6205610a0 100644
--- a/spec/models/form/sales/pages/age1_spec.rb
+++ b/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 }])
+    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
   end
 end
diff --git a/spec/models/form/sales/pages/age2_spec.rb b/spec/models/form/sales/pages/age2_spec.rb
index aac176445..2645b3724 100644
--- a/spec/models/form/sales/pages/age2_spec.rb
+++ b/spec/models/form/sales/pages/age2_spec.rb
@@ -28,9 +28,15 @@ RSpec.describe Form::Sales::Pages::Age2, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }])
+    expect(page.depends_on).to eq([
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
index a1204cc59..52bbaff53 100644
--- a/spec/models/form/sales/pages/buyer1_ethnic_group_spec.rb
+++ b/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 }])
+    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
index b0460899c..6bdd4f5e2 100644
--- a/spec/models/form/sales/pages/buyer1_live_in_property_spec.rb
+++ b/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 }])
+    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
index 6f1fb0c7a..258e37462 100644
--- a/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_live_in_property_spec.rb
@@ -28,6 +28,15 @@ RSpec.describe Form::Sales::Pages::Buyer2LiveInProperty, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{ "jointpur" => 1, "privacynotice" => 1 }])
+    expect(page.depends_on).to eq([
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
index f9591e3d1..a518a1dc4 100644
--- a/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_relationship_to_buyer1_spec.rb
@@ -28,9 +28,15 @@ RSpec.describe Form::Sales::Pages::Buyer2RelationshipToBuyer1, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }])
+    expect(page.depends_on).to eq([
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
index e136037d9..59c16c583 100644
--- a/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/pages/buyer2_working_situation_spec.rb
@@ -28,9 +28,15 @@ RSpec.describe Form::Sales::Pages::Buyer2WorkingSituation, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }])
+    expect(page.depends_on).to eq([
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ])
   end
 end
diff --git a/spec/models/form/sales/pages/gender_identity1_spec.rb b/spec/models/form/sales/pages/gender_identity1_spec.rb
index 97e5a4514..5188bb4ae 100644
--- a/spec/models/form/sales/pages/gender_identity1_spec.rb
+++ b/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 }])
+    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
   end
 end
diff --git a/spec/models/form/sales/pages/gender_identity2_spec.rb b/spec/models/form/sales/pages/gender_identity2_spec.rb
index 2234f5339..54e7ab565 100644
--- a/spec/models/form/sales/pages/gender_identity2_spec.rb
+++ b/spec/models/form/sales/pages/gender_identity2_spec.rb
@@ -28,9 +28,15 @@ RSpec.describe Form::Sales::Pages::GenderIdentity2, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to eq([{
-      "jointpur" => 1,
-      "privacynotice" => 1,
-    }])
+    expect(page.depends_on).to eq([
+      {
+        "jointpur" => 1,
+        "privacynotice" => 1,
+      },
+      {
+        "jointpur" => 1,
+        "noint" => 1,
+      },
+    ])
   end
 end
diff --git a/spec/models/form/sales/pages/nationality1_spec.rb b/spec/models/form/sales/pages/nationality1_spec.rb
index b13763587..da5a5f802 100644
--- a/spec/models/form/sales/pages/nationality1_spec.rb
+++ b/spec/models/form/sales/pages/nationality1_spec.rb
@@ -28,6 +28,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 }])
+    expect(page.depends_on).to eq([{ "privacynotice" => 1 }, { "noint" => 1 }])
   end
 end
diff --git a/spec/models/form/sales/pages/privacy_notice_spec.rb b/spec/models/form/sales/pages/privacy_notice_spec.rb
index d8e25a3d8..86a214bfa 100644
--- a/spec/models/form/sales/pages/privacy_notice_spec.rb
+++ b/spec/models/form/sales/pages/privacy_notice_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Pages::PrivacyNotice, type: :model do
   end
 
   it "has correct depends_on" do
-    expect(page.depends_on).to be_nil
+    expect(page.depends_on).to eq([{ "noint" => 2 }])
   end
 end