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

Fix check force delete lift bug

Browse source
This commit is contained in:
Thiago Youssef 2022-08-14 13:16:47 -03:00
parent fdb4c21dfc
commit ff1dded49f
3 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/jobs/check_force_delete_job.rb
View file

@ -3,41 +3,9 @@ class CheckForceDeleteJob < ApplicationJob
contacts = Contact.find(contact_ids)
contacts.each do |contact|
email = contact.email
next unless contact.need_to_start_force_delete?
if contact.need_to_start_force_delete?
Domains::ForceDeleteEmail::Base.run(email: email)
elsif contact.need_to_lift_force_delete?
domain_list(email).each { |domain| refresh_status_notes(contact, domain) }
end
Domains::ForceDeleteEmail::Base.run(email: contact.email)
end
end
private
def refresh_status_notes(contact, domain)
force_delete_emails = domain.status_notes[DomainStatus::FORCE_DELETE]
return unless force_delete_emails
force_delete_emails.slice!(contact.email_history)
force_delete_emails.lstrip!
domain.save(validate: false)
notify_registrar(domain) unless force_delete_emails.empty?
end
def domain_list(email)
domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten
registrant_ids = Registrant.where(email: email).pluck(:id)
(domain_contacts.map(&:domain).flatten + Domain.where(registrant_id: registrant_ids)).uniq
end
def notify_registrar(domain)
domain.registrar.notifications.create!(text: I18n.t('force_delete_auto_email',
domain_name: domain.name,
outzone_date: domain.outzone_date,
purge_date: domain.purge_date,
email: domain.status_notes[DomainStatus::FORCE_DELETE]))
end
end

33
app/models/validation_event.rb
View file

@ -35,6 +35,8 @@ class ValidationEvent < ApplicationRecord
scope :smtp, -> { where('event_data @> ?', { 'check_level': 'smtp' }.to_json) }
scope :by_object, ->(object) { where(validation_eventable: object) }
after_create :check_force_delete_lift
def self.validated_ids_by(klass)
old_records
.successful
@ -57,4 +59,35 @@ class ValidationEvent < ApplicationRecord
def object
validation_eventable
end
private
def check_force_delete_lift
return unless object.need_to_lift_force_delete?
domain_list.each do |domain|
next unless domain.status_notes[DomainStatus::FORCE_DELETE]
domain.status_notes[DomainStatus::FORCE_DELETE].slice!(object.email_history)
domain.status_notes[DomainStatus::FORCE_DELETE].lstrip!
domain.save(validate: false)
notify_registrar(domain) unless domain.status_notes[DomainStatus::FORCE_DELETE].empty?
end
end
def domain_list
domain_contacts = Contact.where(email: email).map(&:domain_contacts).flatten
registrant_ids = Registrant.where(email: email).pluck(:id)
(domain_contacts.map(&:domain).flatten + Domain.where(registrant_id: registrant_ids)).uniq
end
def notify_registrar(domain)
domain.registrar.notifications.create!(text: I18n.t('force_delete_auto_email',
domain_name: domain.name,
outzone_date: domain.outzone_date,
purge_date: domain.purge_date,
email: domain.status_notes[DomainStatus::FORCE_DELETE]))
end
end

3
lib/tasks/check_force_delete.rake
View file

@ -3,8 +3,7 @@ task check_force_delete: :environment do
validations = ValidationEvent.failed.where(validation_eventable_type: 'Contact').uniq(&:validation_eventable_id)
invalid_contact_ids = validations.select do |validation|
contact = validation.validation_eventable
contact.need_to_start_force_delete? || contact.need_to_lift_force_delete?
validation.validation_eventable.need_to_start_force_delete?
end.pluck(:validation_eventable_id)
CheckForceDeleteJob.perform_later(invalid_contact_ids) if invalid_contact_ids.present?