From 381622bae3f1b2dfd02d13f69953cdde15f8d243 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 27 Mar 2023 12:02:05 +0100 Subject: [PATCH] refactor: simplify --- app/models/scheme.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index d348f73e1..1ab65ea32 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -235,7 +235,7 @@ class Scheme < ApplicationRecord end def status_at(date) - return :incomplete unless confirmed && has_confirmed_locations? + return :incomplete unless confirmed && locations.confirmed.any? 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 @@ -254,14 +254,4 @@ class Scheme < ApplicationRecord def deactivated? status == :deactivated end - - def has_confirmed_locations? - confirmed_locations_count.positive? - end - -private - - def confirmed_locations_count - locations.confirmed.size - end end