From 2e0e5361cae114004bb0edbdd09c7a13e52e8b63 Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Tue, 17 May 2022 10:48:04 +0100 Subject: [PATCH] Use helper --- app/models/case_log.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 420721129..3dc52bf0d 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -191,6 +191,10 @@ class CaseLog < ApplicationRecord tshortfall_known == 1 end + def is_fixed_term_tenancy? + [4, 6].include?(tenancy) + end + def is_secure_tenancy? return unless collection_start_year @@ -480,7 +484,7 @@ private return false unless collection_start_year return true if collection_start_year < 2022 - collection_start_year >= 2022 && ![4, 6].include?(tenancy) + collection_start_year >= 2022 && !is_fixed_term_tenancy? end def set_derived_fields!