From a298161e151239c988b733b73f93c0694176be67 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Fri, 24 Mar 2023 12:20:47 +0000
Subject: [PATCH] feat: respond to po comments

---
 .../lettings/pages/new_build_handover_date.rb | 11 ------
 app/models/form/lettings/pages/void_date.rb   |  3 +-
 .../lettings/questions/voiddate_new_build.rb  | 12 ------
 .../subsections/property_information.rb       |  1 -
 config/forms/2022_2023.json                   | 38 ++++++-------------
 5 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 app/models/form/lettings/pages/new_build_handover_date.rb
 delete mode 100644 app/models/form/lettings/questions/voiddate_new_build.rb

diff --git a/app/models/form/lettings/pages/new_build_handover_date.rb b/app/models/form/lettings/pages/new_build_handover_date.rb
deleted file mode 100644
index e7cb2e5d9..000000000
--- a/app/models/form/lettings/pages/new_build_handover_date.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Form::Lettings::Pages::NewBuildHandoverDate < ::Form::Page
-  def initialize(id, hsh, subsection)
-    super
-    @id = "new_build_handover_date"
-    @depends_on = [{ "is_renewal?" => false, "has_first_let_vacancy_reason?" => true }]
-  end
-
-  def questions
-    @questions ||= [Form::Lettings::Questions::VoiddateNewBuild.new(nil, nil, self)]
-  end
-end
diff --git a/app/models/form/lettings/pages/void_date.rb b/app/models/form/lettings/pages/void_date.rb
index 21c2ed246..43d066a70 100644
--- a/app/models/form/lettings/pages/void_date.rb
+++ b/app/models/form/lettings/pages/void_date.rb
@@ -2,7 +2,8 @@ class Form::Lettings::Pages::VoidDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "void_date"
-    @depends_on = [{ "is_renewal?" => false, "vacancy_reason_not_renewal_or_first_let?" => true }]
+    @depends_on = [{ "is_renewal?" => false, "vacancy_reason_not_renewal_or_first_let?" => true },
+                   { "is_renewal?" => false, "has_first_let_vacancy_reason?" => true }]
   end
 
   def questions
diff --git a/app/models/form/lettings/questions/voiddate_new_build.rb b/app/models/form/lettings/questions/voiddate_new_build.rb
deleted file mode 100644
index dcf1326b0..000000000
--- a/app/models/form/lettings/questions/voiddate_new_build.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class Form::Lettings::Questions::VoiddateNewBuild < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "voiddate"
-    @check_answer_label = "New-build handover date"
-    @header = "What is the new-build handover date?"
-    @type = "date"
-    @check_answers_card_number = 0
-    @hint_text = ""
-    @question_number = 23
-  end
-end
diff --git a/app/models/form/lettings/subsections/property_information.rb b/app/models/form/lettings/subsections/property_information.rb
index 45b859043..2e21b8c5a 100644
--- a/app/models/form/lettings/subsections/property_information.rb
+++ b/app/models/form/lettings/subsections/property_information.rb
@@ -22,7 +22,6 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection
       Form::Lettings::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
       Form::Lettings::Pages::VoidDate.new(nil, nil, self),
       Form::Lettings::Pages::VoidDateValueCheck.new(nil, nil, self),
-      Form::Lettings::Pages::NewBuildHandoverDate.new(nil, nil, self),
       Form::Lettings::Pages::PropertyMajorRepairs.new(nil, nil, self),
       Form::Lettings::Pages::PropertyMajorRepairsValueCheck.new(nil, nil, self),
     ].flatten.compact
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 15fb8926a..8e1eca338 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -767,6 +767,18 @@
                 {
                   "renewal": 0,
                   "rsnvac": 19
+                },
+                {
+                  "renewal": 0,
+                  "rsnvac": 15
+                },
+                {
+                  "renewal": 0,
+                  "rsnvac": 16
+                },
+                {
+                  "renewal": 0,
+                  "rsnvac": 17
                 }
               ]
             },
@@ -806,32 +818,6 @@
                 }
               }
             },
-            "new_build_handover_date": {
-              "header": "",
-              "description": "",
-              "questions": {
-                "voiddate": {
-                  "check_answer_label": "New-build handover date",
-                  "header": "What is the new-build handover date?",
-                  "hint_text": "",
-                  "type": "date"
-                }
-              },
-              "depends_on": [
-                {
-                  "renewal": 0,
-                  "rsnvac": 15
-                },
-                {
-                  "renewal": 0,
-                  "rsnvac": 16
-                },
-                {
-                  "renewal": 0,
-                  "rsnvac": 17
-                }
-              ]
-            },
             "property_major_repairs": {
               "header": "",
               "description": "",