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

Refactor validations

pull/1022/head
Kat 4 years ago
parent
1294264ce8
commit
0cb1137d2e
5 changed files with 68 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      app/models/location.rb
  2. 18
      app/models/scheme.rb
  3. 24
      app/models/validations/date_validations.rb
  4. 33
      app/models/validations/setup_validations.rb
  5. 36
      app/models/validations/shared_validations.rb

19
app/models/location.rb
Unescape View File

@ -373,14 +373,19 @@ class Location < ApplicationRecord
startdate || [created_at, FormHandler.instance.current_collection_start_date].min startdate || [created_at, FormHandler.instance.current_collection_start_date].min
end end
def status def open_deactivation
open_deactivation = location_deactivation_periods.deactivations_without_reactivation.first location_deactivation_periods.deactivations_without_reactivation.first
recent_deactivation = location_deactivation_periods.order("created_at").last end
def recent_deactivation
location_deactivation_periods.order("created_at").last
end
return :deactivated if open_deactivation&.deactivation_date.present? && Time.zone.now >= open_deactivation.deactivation_date def status(date = Time.zone.now)
return :deactivating_soon if open_deactivation&.deactivation_date.present? && Time.zone.now < open_deactivation.deactivation_date return :deactivated if open_deactivation&.deactivation_date.present? && date >= open_deactivation.deactivation_date
return :reactivating_soon if recent_deactivation&.reactivation_date.present? && Time.zone.now < recent_deactivation.reactivation_date return :deactivating_soon if open_deactivation&.deactivation_date.present? && date < open_deactivation.deactivation_date
return :activating_soon if startdate.present? && Time.zone.now < startdate return :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
return :activating_soon if startdate.present? && date < startdate
:active :active
end end

18
app/models/scheme.rb
Unescape View File

@ -213,15 +213,19 @@ class Scheme < ApplicationRecord
[created_at, FormHandler.instance.current_collection_start_date].min [created_at, FormHandler.instance.current_collection_start_date].min
end end
def status def open_deactivation
return :incomplete unless confirmed scheme_deactivation_periods.deactivations_without_reactivation.first
end
open_deactivation = scheme_deactivation_periods.deactivations_without_reactivation.first def recent_deactivation
recent_deactivation = scheme_deactivation_periods.order("created_at").last scheme_deactivation_periods.order("created_at").last
end
return :deactivated if open_deactivation&.deactivation_date.present? && Time.zone.now >= open_deactivation.deactivation_date def status(date = Time.zone.now)
return :deactivating_soon if open_deactivation&.deactivation_date.present? && Time.zone.now < open_deactivation.deactivation_date return :incomplete unless confirmed
return :reactivating_soon if recent_deactivation&.reactivation_date.present? && Time.zone.now < recent_deactivation.reactivation_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 :reactivating_soon if recent_deactivation&.reactivation_date.present? && date < recent_deactivation.reactivation_date
:active :active
end end

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

@ -1,4 +1,6 @@
module Validations::DateValidations module Validations::DateValidations
include Validations::SharedValidations
def validate_property_major_repairs(record) def validate_property_major_repairs(record)
date_valid?("mrcdate", record) date_valid?("mrcdate", record)
if record["startdate"].present? && record["mrcdate"].present? && record["startdate"] < record["mrcdate"] if record["startdate"].present? && record["mrcdate"].present? && record["startdate"] < record["mrcdate"]
@ -60,15 +62,8 @@ module Validations::DateValidations
record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date") record.errors.add :startdate, I18n.t("validations.setup.startdate.after_major_repair_date")
end end
location_inactive_status = inactive_status(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from) location_during_startdate_validation(record, :startdate)
if location_inactive_status.present? scheme_during_startdate_validation(record, :startdate)
record.errors.add :startdate, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
end
scheme_inactive_status = inactive_status(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from)
if scheme_inactive_status.present?
record.errors.add :startdate, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
end
end end
private private
@ -101,15 +96,4 @@ private
def is_rsnvac_first_let?(record) def is_rsnvac_first_let?(record)
[15, 16, 17].include?(record["rsnvac"]) [15, 16, 17].include?(record["rsnvac"])
end end
def inactive_status(date, deactivation_periods, available_from)
return if date.blank?
closest_reactivation = deactivation_periods.order(created_at: :desc).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 end

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

@ -1,4 +1,6 @@
module Validations::SetupValidations module Validations::SetupValidations
include Validations::SharedValidations
def validate_irproduct_other(record) def validate_irproduct_other(record)
if intermediate_product_rent_type?(record) && record.irproduct_other.blank? if intermediate_product_rent_type?(record) && record.irproduct_other.blank?
record.errors.add :irproduct_other, I18n.t("validations.setup.intermediate_rent_product_name.blank") record.errors.add :irproduct_other, I18n.t("validations.setup.intermediate_rent_product_name.blank")
@ -6,12 +8,12 @@ module Validations::SetupValidations
end end
def validate_location(record) def validate_location(record)
validate_location_during_startdate(record, :location_id) location_during_startdate_validation(record, :location_id)
end end
def validate_scheme(record) def validate_scheme(record)
validate_location_during_startdate(record, :scheme_id) location_during_startdate_validation(record, :scheme_id)
validate_scheme_during_startdate(record) scheme_during_startdate_validation(record, :scheme_id)
end end
private private
@ -19,29 +21,4 @@ private
def intermediate_product_rent_type?(record) def intermediate_product_rent_type?(record)
record.rent_type == 5 record.rent_type == 5
end end
def inactive_status(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
def validate_location_during_startdate(record, field)
location_inactive_status = inactive_status(record.startdate, record.location&.location_deactivation_periods, record.location&.available_from)
if location_inactive_status.present?
record.errors.add field, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
end
end
def validate_scheme_during_startdate(record)
scheme_inactive_status = inactive_status(record.startdate, record.scheme&.scheme_deactivation_periods, record.scheme&.available_from)
if scheme_inactive_status.present?
record.errors.add :scheme_id, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
end
end
end end

36
app/models/validations/shared_validations.rb
Unescape View File

@ -33,4 +33,40 @@ module Validations::SharedValidations
end end
end end
end end
def location_during_startdate_validation(record, field)
location_inactive_status = inactive_status(record.startdate, record.location&.available_from, record.location)
if location_inactive_status.present?
record.errors.add field, I18n.t("validations.setup.startdate.location_#{location_inactive_status[:status]}", postcode: record.location.postcode, date: location_inactive_status[:reactivation_date].to_formatted_s(:govuk_date), deactivation_date: location_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
end
end
def scheme_during_startdate_validation(record, field)
scheme_inactive_status = inactive_status(record.startdate, record.scheme&.available_from, record.scheme)
if scheme_inactive_status.present?
record.errors.add field, I18n.t("validations.setup.startdate.scheme_#{scheme_inactive_status[:status]}", name: record.scheme.service_name, date: scheme_inactive_status[:reactivation_date].to_formatted_s(:govuk_date), deactivation_date: scheme_inactive_status[:deactivation_date]&.to_formatted_s(:govuk_date))
end
end
def inactive_status(date, available_from, resource)
return if date.blank? || resource.blank?
status = resource.status(date)
return unless %i[reactivating_soon activating_soon deactivated].include?(status)
closest_reactivation = resource.recent_deactivation
open_deactivation = resource.open_deactivation
case status
when :reactivating_soon
reactivation_date = closest_reactivation.reactivation_date
deactivation_date = closest_reactivation.deactivation_date
when :activating_soon
reactivation_date = available_from
when :deactivated
reactivation_date = open_deactivation.deactivation_date
end
{ status:, reactivation_date:, deactivation_date: }
end
end end

Write Preview
Loading…
Cancel
Save