Browse Source

feat: change to confirmed to add clarification in code

pull/1456/head
natdeanlewissoftwire 3 years ago
parent
commit
1b44165cb0
  1. 1
      app/models/location.rb
  2. 10
      app/models/scheme.rb

1
app/models/location.rb

@ -23,6 +23,7 @@ class Location < ApplicationRecord
scope :search_by, ->(param) { search_by_name(param).or(search_by_postcode(param)) } scope :search_by, ->(param) { search_by_name(param).or(search_by_postcode(param)) }
scope :started, -> { where("startdate <= ?", Time.zone.today).or(where(startdate: nil)) } scope :started, -> { where("startdate <= ?", Time.zone.today).or(where(startdate: nil)) }
scope :active, -> { where(confirmed: true).and(started) } scope :active, -> { where(confirmed: true).and(started) }
scope :confirmed, -> { where(confirmed: true) }
LOCAL_AUTHORITIES = LocalAuthority.all.map { |la| [la.name, la.code] }.to_h LOCAL_AUTHORITIES = LocalAuthority.all.map { |la| [la.name, la.code] }.to_h

10
app/models/scheme.rb

@ -235,7 +235,7 @@ class Scheme < ApplicationRecord
end end
def status_at(date) def status_at(date)
return :incomplete unless confirmed && has_completed_locations? return :incomplete unless confirmed && has_confirmed_locations?
return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date 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 :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 return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
@ -255,13 +255,13 @@ class Scheme < ApplicationRecord
status == :deactivated status == :deactivated
end end
def has_completed_locations? def has_confirmed_locations?
completed_locations_count.positive? confirmed_locations_count.positive?
end end
private private
def completed_locations_count def confirmed_locations_count
locations.count { |location| location.status != :incomplete } locations.confirmed.size
end end
end end

Loading…
Cancel
Save