baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

move status_during_startdate into validations files

pull/1022/head
Kat 4 years ago
parent
ed560a6d40
commit
7e5c9217a7
3 changed files with 33 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      app/models/location.rb
  2. 15
      app/models/validations/date_validations.rb
  3. 29
      app/models/validations/setup_validations.rb

11
app/models/location.rb
Unescape View File

@ -393,17 +393,6 @@ class Location < ApplicationRecord
status == :reactivating_soon
end
def status_during(date)
return if date.blank?
closest_reactivation = location_deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) }
return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present?
return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date
open_deactivation = location_deactivation_periods.deactivations_without_reactivation.first
return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date
end
private
PIO = PostcodeService.new

15
app/models/validations/date_validations.rb
Unescape View File

@ -60,7 +60,7 @@ module Validations::DateValidations
record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date")
end
location_status_during_startdate = record.location&.status_during(record.startdate)
location_status_during_startdate = status_during_startdate(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from)
if location_status_during_startdate.present? && location_status_during_startdate[:status] == :deactivated
record.errors.add :startdate, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
@ -73,7 +73,7 @@ module Validations::DateValidations
record.errors.add :startdate, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
scheme_status_during_startdate = record.scheme&.status_during(record.startdate)
scheme_status_during_startdate = status_during_startdate(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from)
if scheme_status_during_startdate.present? && scheme_status_during_startdate[:status] == :deactivated
record.errors.add :startdate, I18n.t("validations.setup.startdate.during_deactivated_scheme", name: record.scheme.service_name, date: scheme_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
@ -117,4 +117,15 @@ private
def is_rsnvac_first_let?(record)
[15, 16, 17].include?(record["rsnvac"])
end
def status_during_startdate(date, deactivation_periods, available_from)
return if date.blank?
closest_reactivation = deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } if deactivation_periods.present?
return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present?
return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date
open_deactivation = deactivation_periods.deactivations_without_reactivation.first if deactivation_periods.present?
return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date
end
end

29
app/models/validations/setup_validations.rb
Unescape View File

@ -6,22 +6,22 @@ module Validations::SetupValidations
end
def validate_location(record)
status_during_startdate = record.location&.status_during(record.startdate)
if status_during_startdate.present? && status_during_startdate[:status] == :deactivated
record.errors.add :location_id, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: status_during_startdate[:date].to_formatted_s(:govuk_date))
location_status_during_startdate = status_during_startdate(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from)
if location_status_during_startdate.present? && location_status_during_startdate[:status] == :deactivated
record.errors.add :location_id, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
if status_during_startdate.present? && status_during_startdate[:status] == :reactivating_soon
record.errors.add :location_id, I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: record.location.postcode, date: status_during_startdate[:date].to_formatted_s(:govuk_date), deactivation_date: status_during_startdate[:deactivation_date].to_formatted_s(:govuk_date))
if location_status_during_startdate.present? && location_status_during_startdate[:status] == :reactivating_soon
record.errors.add :location_id, I18n.t("validations.setup.startdate.location_reactivating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date), deactivation_date: location_status_during_startdate[:deactivation_date].to_formatted_s(:govuk_date))
end
if status_during_startdate.present? && status_during_startdate[:status] == :activating_soon
record.errors.add :location_id, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: status_during_startdate[:date].to_formatted_s(:govuk_date))
if location_status_during_startdate.present? && location_status_during_startdate[:status] == :activating_soon
record.errors.add :location_id, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
end
def validate_scheme(record)
location_status_during_startdate = record.location&.status_during(record.startdate)
location_status_during_startdate = status_during_startdate(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from)
if location_status_during_startdate.present? && location_status_during_startdate[:status] == :deactivated
record.errors.add :scheme_id, I18n.t("validations.setup.startdate.during_deactivated_location", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
@ -34,7 +34,7 @@ module Validations::SetupValidations
record.errors.add :scheme_id, I18n.t("validations.setup.startdate.location_activating_soon", postcode: record.location.postcode, date: location_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
scheme_status_during_startdate = record.scheme&.status_during(record.startdate)
scheme_status_during_startdate = status_during_startdate(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from)
if scheme_status_during_startdate.present? && scheme_status_during_startdate[:status] == :deactivated
record.errors.add :scheme_id, I18n.t("validations.setup.startdate.during_deactivated_scheme", name: record.scheme.service_name, date: scheme_status_during_startdate[:date].to_formatted_s(:govuk_date))
end
@ -53,4 +53,15 @@ private
def intermediate_product_rent_type?(record)
record.rent_type == 5
end
def status_during_startdate(date, deactivation_periods, available_from)
return if date.blank?
closest_reactivation = deactivation_periods.reverse.find { |period| period.reactivation_date.present? && date.between?(period.deactivation_date, period.reactivation_date - 1.day) } if deactivation_periods.present?
return { status: :reactivating_soon, date: closest_reactivation.reactivation_date, deactivation_date: closest_reactivation.deactivation_date } if closest_reactivation.present?
return { status: :activating_soon, date: available_from } if available_from.present? && available_from > date
open_deactivation = deactivation_periods.deactivations_without_reactivation.first if deactivation_periods.present?
return { status: :deactivated, date: open_deactivation.deactivation_date } if open_deactivation.present? && open_deactivation.deactivation_date <= date
end
end

Write Preview
Loading…
Cancel
Save