From 20f9a470ebe41042204e9e504213bcce7a6b91fa Mon Sep 17 00:00:00 2001 From: SamSeed-Softwire <63662292+SamSeed-Softwire@users.noreply.github.com> Date: Tue, 15 Nov 2022 11:20:01 +0000 Subject: [PATCH] feat: simplify logic for incomplete status Co-authored-by: James Rose --- app/models/location.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/location.rb b/app/models/location.rb index cd61e34b9..116d8e7d6 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -384,11 +384,7 @@ class Location < ApplicationRecord end def status(date = Time.zone.now) - return :incomplete if - postcode.blank? || - units.blank? || - type_of_unit.blank? || - mobility_type.blank? + return :incomplete if [postcode, units, type_of_unit, mobility_type].any?(&:blank?) return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date