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

Do not validate removing reactivation date

pull/2069/head
Kat 2 years ago
parent
adbb3f0bb0
commit
224165e4cf
1 changed files with 8 additions and 2 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. 10
      app/services/merge/merge_organisations_service.rb

10
app/services/merge/merge_organisations_service.rb
Unescape View File

@ -189,7 +189,10 @@ private
if deactivation_happenned_during_merge?(deactivation_period) if deactivation_happenned_during_merge?(deactivation_period)
SchemeDeactivationPeriod.create!(deactivation_period.attributes.except("id", "scheme_id", "deactivation_date").merge(scheme: new_scheme, deactivation_date: @merge_date)) SchemeDeactivationPeriod.create!(deactivation_period.attributes.except("id", "scheme_id", "deactivation_date").merge(scheme: new_scheme, deactivation_date: @merge_date))
deactivation_period.update!(reactivation_date: nil) if deactivation_period.reactivation_date.present? if deactivation_period.reactivation_date.present?
deactivation_period.reactivation_date = nil
deactivation_period.save!(validate: false)
end
else else
SchemeDeactivationPeriod.create!(deactivation_period.attributes.except("id", "scheme_id").merge(scheme: new_scheme)) SchemeDeactivationPeriod.create!(deactivation_period.attributes.except("id", "scheme_id").merge(scheme: new_scheme))
deactivation_period.destroy! deactivation_period.destroy!
@ -201,7 +204,10 @@ private
if deactivation_happenned_during_merge?(deactivation_period) if deactivation_happenned_during_merge?(deactivation_period)
LocationDeactivationPeriod.create!(deactivation_period.attributes.except("id", "location_id", "deactivation_date").merge(location: new_location, deactivation_date: @merge_date)) LocationDeactivationPeriod.create!(deactivation_period.attributes.except("id", "location_id", "deactivation_date").merge(location: new_location, deactivation_date: @merge_date))
deactivation_period.update!(reactivation_date: nil) if deactivation_period.reactivation_date.present? if deactivation_period.reactivation_date.present?
deactivation_period.reactivation_date = nil
deactivation_period.save!(validate: false)
end
else else
LocationDeactivationPeriod.create!(deactivation_period.attributes.except("id", "location_id").merge(location: new_location)) LocationDeactivationPeriod.create!(deactivation_period.attributes.except("id", "location_id").merge(location: new_location))
deactivation_period.destroy! deactivation_period.destroy!

Write Preview
Loading…
Cancel
Save