From b93df70b3e91371e30f33dc5229fc31f441de45a Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 27 Mar 2023 12:05:02 +0100 Subject: [PATCH] refactor: simplify --- app/models/scheme.rb | 4 ---- app/models/validations/setup_validations.rb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index d0c42889a..a190c5d5e 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -255,10 +255,6 @@ class Scheme < ApplicationRecord status == :deactivated end - def has_confirmed_locations? - confirmed_locations_count.positive? - end - private def confirmed_locations_count diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index a423f914f..bd12d3249 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -23,7 +23,7 @@ module Validations::SetupValidations def validate_scheme_has_confirmed_locations_validation(record) return unless record.scheme - unless record.scheme.has_confirmed_locations? + unless record.scheme.locations.confirmed.any? record.errors.add :scheme_id, I18n.t("validations.scheme.no_completed_locations") end end