From d97be22420d191ddac513e3d06d59029039e9659 Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Tue, 11 Apr 2023 16:52:41 +0100
Subject: [PATCH] refactor a couple more depends on for readability

---
 .../form/lettings/pages/outstanding_amount.rb    |  2 +-
 app/models/form/lettings/pages/rent_4_weekly.rb  |  6 ++----
 app/models/form/lettings/pages/rent_bi_weekly.rb |  6 ++----
 app/models/form/lettings/pages/rent_monthly.rb   |  6 ++----
 app/models/lettings_log.rb                       | 16 ++++++++++++----
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/models/form/lettings/pages/outstanding_amount.rb b/app/models/form/lettings/pages/outstanding_amount.rb
index 876307069..22d06c2c8 100644
--- a/app/models/form/lettings/pages/outstanding_amount.rb
+++ b/app/models/form/lettings/pages/outstanding_amount.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::OutstandingAmount < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "outstanding_amount"
-    @depends_on = [{ "receives_any_housing_benefit?" => true, "has_housing_benefit_rent_shortfall?" => true }]
+    @depends_on = [{ "receives_housing_related_benefits?" => true, "has_housing_benefit_rent_shortfall?" => true }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/rent_4_weekly.rb b/app/models/form/lettings/pages/rent_4_weekly.rb
index fd8518e8e..e71cd7ffa 100644
--- a/app/models/form/lettings/pages/rent_4_weekly.rb
+++ b/app/models/form/lettings/pages/rent_4_weekly.rb
@@ -4,10 +4,8 @@ class Form::Lettings::Pages::Rent4Weekly < ::Form::Page
     @id = "rent_4_weekly"
     @header = "Household rent and charges"
     @depends_on = [
-      { "household_charge" => 0, "period" => 3, "is_carehome" => 0 },
-      { "household_charge" => nil, "period" => 3, "is_carehome" => 0 },
-      { "household_charge" => 0, "period" => 3, "is_carehome" => nil },
-      { "household_charge" => nil, "period" => 3, "is_carehome" => nil },
+      { "household_charge" => 0, "rent_and_charges_paid_every_4_weeks?" => true, "is_carehome?" => false },
+      { "household_charge" => nil, "rent_and_charges_paid_every_4_weeks?" => true, "is_carehome?" => false },
     ]
   end
 
diff --git a/app/models/form/lettings/pages/rent_bi_weekly.rb b/app/models/form/lettings/pages/rent_bi_weekly.rb
index 66ebef76b..0b1b9c884 100644
--- a/app/models/form/lettings/pages/rent_bi_weekly.rb
+++ b/app/models/form/lettings/pages/rent_bi_weekly.rb
@@ -4,10 +4,8 @@ class Form::Lettings::Pages::RentBiWeekly < ::Form::Page
     @id = "rent_bi_weekly"
     @header = "Household rent and charges"
     @depends_on = [
-      { "household_charge" => 0, "period" => 2, "is_carehome" => 0 },
-      { "household_charge" => nil, "period" => 2, "is_carehome" => 0 },
-      { "household_charge" => 0, "period" => 2, "is_carehome" => nil },
-      { "household_charge" => nil, "period" => 2, "is_carehome" => nil },
+      { "household_charge" => nil, "rent_and_charges_paid_every_2_weeks?" => true, "is_carehome?" => false },
+      { "household_charge" => 0, "rent_and_charges_paid_every_2_weeks?" => true, "is_carehome?" => false },
     ]
   end
 
diff --git a/app/models/form/lettings/pages/rent_monthly.rb b/app/models/form/lettings/pages/rent_monthly.rb
index 04664bc93..d6af7a08c 100644
--- a/app/models/form/lettings/pages/rent_monthly.rb
+++ b/app/models/form/lettings/pages/rent_monthly.rb
@@ -4,10 +4,8 @@ class Form::Lettings::Pages::RentMonthly < ::Form::Page
     @id = "rent_monthly"
     @header = "Household rent and charges"
     @depends_on = [
-      { "household_charge" => 0, "period" => 4, "is_carehome" => 0 },
-      { "household_charge" => nil, "period" => 4, "is_carehome" => 0 },
-      { "household_charge" => 0, "period" => 4, "is_carehome" => nil },
-      { "household_charge" => nil, "period" => 4, "is_carehome" => nil },
+      { "household_charge" => nil, "rent_and_charges_paid_monthly?" => true, "is_carehome?" => false },
+      { "household_charge" => 0, "rent_and_charges_paid_monthly?" => true, "is_carehome?" => false },
     ]
   end
 
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 2cd3935ec..e3bd48f68 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -379,10 +379,6 @@ class LettingsLog < Log
     hb == 6
   end
 
-  def receives_any_housing_benefit?
-    receives_housing_benefit_only? || receives_uc_with_housing_element_excl_housing_benefit?
-  end
-
   def receives_no_benefits?
     # 9: None
     hb == 9
@@ -518,6 +514,18 @@ class LettingsLog < Log
     [1, 5, 6, 7, 8, 9, 10].include? period
   end
 
+  def rent_and_charges_paid_every_4_weeks?
+    period == 3
+  end
+
+  def rent_and_charges_paid_every_2_weeks?
+    period == 2
+  end
+
+  def rent_and_charges_paid_monthly?
+    period == 4
+  end
+
   def is_carehome?
     is_carehome == 1
   end