zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 03:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix local conflict

Browse source
This commit is contained in:
Alex Sherman 2019-12-04 14:54:34 +05:00
parent 4b4650ee7f
commit 0e1542609e
2 changed files with 170 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app/models/concerns/domain/force_delete.rb
View file

@ -7,33 +7,59 @@ module Concerns::Domain::ForceDelete
statuses.include?(DomainStatus::FORCE_DELETE) statuses.include?(DomainStatus::FORCE_DELETE)
end end
def schedule_force_delete def schedule_force_delete(type: :fast_track)
if discarded? if discarded?
raise StandardError, 'Force delete procedure cannot be scheduled while a domain is discarded' raise StandardError, 'Force delete procedure cannot be scheduled while a domain is discarded'
end end
type == :fast_track ? force_delete_fast_track : force_delete_soft
end
def force_delete_fast_track
preserve_current_statuses_for_force_delete preserve_current_statuses_for_force_delete
add_force_delete_statuses add_force_delete_statuses
self.force_delete_date = Time.zone.today + Setting.redemption_grace_period.days + 1.day self.force_delete_date = Time.zone.today + Setting.redemption_grace_period.days
self.force_delete_start = Time.zone.today
stop_all_pending_actions stop_all_pending_actions
allow_deletion allow_deletion
save(validate: false) save(validate: false)
end end
def force_delete_soft
preserve_current_statuses_for_force_delete
add_force_delete_statuses
calculate_soft_delete_date
stop_all_pending_actions
check_hold
allow_deletion
save(validate: false)
end
def cancel_force_delete def cancel_force_delete
restore_statuses_before_force_delete restore_statuses_before_force_delete
remove_force_delete_statuses remove_force_delete_statuses
self.force_delete_date = nil self.force_delete_date = nil
self.force_delete_start = nil
save(validate: false) save(validate: false)
end end
private
def check_hold def check_hold
if force_delete_start < valid_to && (force_delete_date + DAYS_TO_START_HOLD) > Time.zone.today if force_delete_start.present? && force_delete_start + DAYS_TO_START_HOLD < valid_to
statuses << DomainStatus::CLIENT_HOLD statuses << DomainStatus::CLIENT_HOLD
end end
end end
private def calculate_soft_delete_date
years = (valid_to.to_date - Time.zone.today).to_i / 365
soft_delete_dates(years) if years.positive?
end
def soft_delete_dates(years)
self.force_delete_start = valid_to - years.years
self.force_delete_date = force_delete_start + Setting.redemption_grace_period.days
end
def stop_all_pending_actions def stop_all_pending_actions
statuses.delete(DomainStatus::PENDING_UPDATE) statuses.delete(DomainStatus::PENDING_UPDATE)
@ -55,21 +81,12 @@ module Concerns::Domain::ForceDelete
statuses << DomainStatus::FORCE_DELETE statuses << DomainStatus::FORCE_DELETE
statuses << DomainStatus::SERVER_RENEW_PROHIBITED statuses << DomainStatus::SERVER_RENEW_PROHIBITED
statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED
statuses << DomainStatus::SERVER_UPDATE_PROHIBITED
statuses << DomainStatus::PENDING_DELETE
if (statuses & [DomainStatus::SERVER_HOLD, DomainStatus::CLIENT_HOLD]).empty?
statuses << DomainStatus::SERVER_MANUAL_INZONE
end
end end
def remove_force_delete_statuses def remove_force_delete_statuses
statuses.delete(DomainStatus::FORCE_DELETE) statuses.delete(DomainStatus::FORCE_DELETE)
statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED) statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED)
statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED) statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)
statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
statuses.delete(DomainStatus::PENDING_DELETE)
statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
statuses.delete(DomainStatus::CLIENT_HOLD) statuses.delete(DomainStatus::CLIENT_HOLD)
end end

232
test/models/domain/force_delete_test.rb
View file

@ -1,107 +1,155 @@
module Concerns::Domain::ForceDelete require 'test_helper'
extend ActiveSupport::Concern
DAYS_TO_START_HOLD = 15.days class NewDomainForceDeleteTest < ActiveSupport::TestCase
setup do
def force_delete_scheduled? @domain = domains(:shop)
statuses.include?(DomainStatus::FORCE_DELETE) Setting.redemption_grace_period = 45
end end
def schedule_force_delete(type: :fast_track) def test_schedules_force_delete_fast_track
if discarded? assert_not @domain.force_delete_scheduled?
raise StandardError 'Force delete procedure cannot be scheduled while a domain is discarded' travel_to Time.zone.parse('2010-07-05')
end
case type @domain.schedule_force_delete(type: :fast_track)
when :fast_track @domain.reload
force_delete_fast_track
when :soft assert @domain.force_delete_scheduled?
force_delete_soft assert_equal Date.parse('2010-08-19'), @domain.force_delete_date.to_date
else assert_equal Date.parse('2010-07-05'), @domain.force_delete_start.to_date
raise StandardError, 'Wrong type for force delete' end
def test_schedules_force_delete_soft_year_ahead
@domain.update(valid_to: Time.zone.parse('2012-08-05'))
assert_not @domain.force_delete_scheduled?
travel_to Time.zone.parse('2010-07-05')
@domain.schedule_force_delete(type: :soft)
@domain.reload
assert @domain.force_delete_scheduled?
assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date
assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
assert (@domain.statuses.include?(DomainStatus::CLIENT_HOLD))
end
def test_schedules_force_delete_soft_less_than_year_ahead
@domain.update_columns(valid_to: Time.zone.parse('2010-08-05'),
force_delete_date: nil)
assert_not @domain.force_delete_scheduled?
travel_to Time.zone.parse('2010-07-05')
@domain.schedule_force_delete(type: :soft)
@domain.reload
assert @domain.force_delete_scheduled?
assert_nil @domain.force_delete_date
assert_nil @domain.force_delete_start
end
def test_scheduling_soft_force_delete_adds_corresponding_statuses
statuses_to_be_added = [
DomainStatus::FORCE_DELETE,
DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED,
]
@domain.schedule_force_delete(type: :soft)
@domain.reload
assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added
end
def test_scheduling_fast_track_force_delete_adds_corresponding_statuses
statuses_to_be_added = [
DomainStatus::FORCE_DELETE,
DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED,
]
@domain.schedule_force_delete(type: :fast_track)
@domain.reload
assert (@domain.statuses & statuses_to_be_added) == statuses_to_be_added
end
def test_scheduling_force_delete_allows_domain_deletion
statuses_to_be_removed = [
DomainStatus::CLIENT_DELETE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED,
]
@domain.statuses = statuses_to_be_removed + %w[other-status]
@domain.schedule_force_delete(type: :fast_track)
@domain.reload
assert_empty @domain.statuses & statuses_to_be_removed
end
def test_scheduling_force_delete_stops_pending_actions
Setting.redemption_grace_period = 45
statuses_to_be_removed = [
DomainStatus::PENDING_UPDATE,
DomainStatus::PENDING_TRANSFER,
DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_CREATE,
]
@domain.statuses = statuses_to_be_removed + %w[other-status]
@domain.schedule_force_delete(type: :fast_track)
@domain.reload
assert_empty @domain.statuses & statuses_to_be_removed, 'Pending actions should be stopped'
end
def test_scheduling_force_delete_preserves_current_statuses
@domain.statuses = %w[test1 test2]
@domain.schedule_force_delete(type: :fast_track)
@domain.reload
assert_equal %w[test1 test2], @domain.statuses_before_force_delete
end
def test_scheduling_force_delete_bypasses_validation
@domain = domains(:invalid)
@domain.schedule_force_delete(type: :fast_track)
assert @domain.force_delete_scheduled?
end
def test_force_delete_cannot_be_scheduled_when_a_domain_is_discarded
@domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE])
assert_raises StandardError do
@domain.schedule_force_delete(type: :fast_track)
end end
end end
def force_delete_fast_track def test_cancels_force_delete
preserve_current_statuses_for_force_delete @domain.update_columns(statuses: [DomainStatus::FORCE_DELETE],
add_force_delete_statuses force_delete_date: Time.zone.parse('2010-07-05'),
self.force_delete_date = Time.zone.today + Setting.redemption_grace_period.days force_delete_start: Time.zone.parse('2010-07-05') - 45.days)
self.force_delete_start = Time.zone.today assert @domain.force_delete_scheduled?
stop_all_pending_actions
allow_deletion @domain.cancel_force_delete
save(validate: false) @domain.reload
assert_not @domain.force_delete_scheduled?
assert_nil @domain.force_delete_date
assert_nil @domain.force_delete_start
end end
def force_delete_soft def test_cancelling_force_delete_bypasses_validation
preserve_current_statuses_for_force_delete @domain = domains(:invalid)
add_force_delete_statuses @domain.schedule_force_delete(type: :fast_track)
calculate_soft_delete_date @domain.cancel_force_delete
stop_all_pending_actions assert_not @domain.force_delete_scheduled?
check_hold
allow_deletion
save(validate: false)
end end
def cancel_force_delete def test_cancelling_force_delete_removes_statuses_that_were_set_on_force_delete
restore_statuses_before_force_delete statuses = [
remove_force_delete_statuses DomainStatus::FORCE_DELETE,
self.force_delete_date = nil DomainStatus::SERVER_RENEW_PROHIBITED,
self.force_delete_start = nil DomainStatus::SERVER_TRANSFER_PROHIBITED,
save(validate: false) ]
end @domain.statuses = @domain.statuses + statuses
@domain.schedule_force_delete(type: :fast_track)
private @domain.cancel_force_delete
@domain.reload
def check_hold assert_empty @domain.statuses & statuses
if force_delete_start.present? &&
force_delete_start < valid_to &&
(force_delete_date + DAYS_TO_START_HOLD) > Time.zone.today
statuses << DomainStatus::CLIENT_HOLD
end
end
def calculate_soft_delete_date
years = (self.valid_to.to_date - Time.zone.today).to_i / 365
if years.positive?
self.force_delete_start = self.valid_to - years.years
self.force_delete_date = self.force_delete_start + Setting.redemption_grace_period.days
end
end
def stop_all_pending_actions
statuses.delete(DomainStatus::PENDING_UPDATE)
statuses.delete(DomainStatus::PENDING_TRANSFER)
statuses.delete(DomainStatus::PENDING_RENEW)
statuses.delete(DomainStatus::PENDING_CREATE)
end
def preserve_current_statuses_for_force_delete
self.statuses_before_force_delete = statuses.clone
end
def restore_statuses_before_force_delete
self.statuses = statuses_before_force_delete
self.statuses_before_force_delete = nil
end
def add_force_delete_statuses
statuses << DomainStatus::FORCE_DELETE
statuses << DomainStatus::SERVER_RENEW_PROHIBITED
statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED
end
def remove_force_delete_statuses
statuses.delete(DomainStatus::FORCE_DELETE)
statuses.delete(DomainStatus::SERVER_RENEW_PROHIBITED)
statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)
statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
statuses.delete(DomainStatus::PENDING_DELETE)
statuses.delete(DomainStatus::SERVER_MANUAL_INZONE)
statuses.delete(DomainStatus::CLIENT_HOLD)
end
def allow_deletion
statuses.delete(DomainStatus::CLIENT_DELETE_PROHIBITED)
statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
end end
end end