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

refactoring

Browse source
This commit is contained in:
Oleg Hasjanov 2021-05-17 14:30:58 +03:00
parent 0ccfd0d8d4
commit 4a8bdc14a1
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/interactions/domains/force_delete_email/base.rb
View file

@ -12,16 +12,20 @@ module Domains
Domain.where(registrant_id: registrant_ids) Domain.where(registrant_id: registrant_ids)
domains.each do |domain| domains.each do |domain|
if domain.force_delete_scheduled? && !domain.status_notes[DomainStatus::FORCE_DELETE].nil? before_execute_force_delete(domain)
added_additional_email_into_notes(domain)
else
process_force_delete(domain)
end
end end
end end
private private
def before_execute_force_delete(domain)
if domain.force_delete_scheduled? && !domain.status_notes[DomainStatus::FORCE_DELETE].nil?
added_additional_email_into_notes(domain)
else
process_force_delete(domain)
end
end
def process_force_delete(domain) def process_force_delete(domain)
domain.schedule_force_delete(type: :soft, domain.schedule_force_delete(type: :soft,
notify_by_email: true, notify_by_email: true,
@ -31,10 +35,10 @@ module Domains
end end
def added_additional_email_into_notes(domain) def added_additional_email_into_notes(domain)
unless domain.status_notes[DomainStatus::FORCE_DELETE].include? email return if domain.status_notes[DomainStatus::FORCE_DELETE].include? email
domain.status_notes[DomainStatus::FORCE_DELETE].concat(' ' + email)
domain.save(validate: false) domain.status_notes[DomainStatus::FORCE_DELETE].concat(' ' + email)
end domain.save(validate: false)
end end
def save_status_note(domain) def save_status_note(domain)

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

@ -414,8 +414,6 @@ class ForceDeleteTest < ActionMailer::TestCase
assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date
assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one
assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two
notification = @domain.registrar.notifications.last
assert notification.text.include? asserted_text
end end
def test_lifts_force_delete_if_contact_fixed def test_lifts_force_delete_if_contact_fixed