From 5e694ce5a099cf381eb2d85875aa3142acebbb1a Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 22 Aug 2023 13:07:56 +0300 Subject: [PATCH 1/3] fixed logging spam --- app/jobs/check_force_delete_lift.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/jobs/check_force_delete_lift.rb b/app/jobs/check_force_delete_lift.rb index 18c276056..3004d6042 100644 --- a/app/jobs/check_force_delete_lift.rb +++ b/app/jobs/check_force_delete_lift.rb @@ -33,22 +33,16 @@ class CheckForceDeleteLift < ApplicationJob event = registrant.validation_events.last next if event.blank? - domain_list(event).each { |d| refresh_status_notes(d, registrant) } + refresh_status_notes(domain, registrant) end end - def domain_list(event) - domain_contacts = Contact.where(email: event.email).map(&:domain_contacts).flatten - registrant_ids = Registrant.where(email: event.email).pluck(:id) - - (domain_contacts.map(&:domain).flatten + Domain.where(registrant_id: registrant_ids)).uniq - end - def refresh_status_notes(domain, registrant) return unless domain.status_notes[DomainStatus::FORCE_DELETE] - domain.status_notes[DomainStatus::FORCE_DELETE].slice!(registrant.email_history) + domain.status_notes[DomainStatus::FORCE_DELETE].slice!(registrant.email_history || '') domain.status_notes[DomainStatus::FORCE_DELETE].lstrip! - domain.save(validate: false) + + domain.save(validate: false) if domain.changed? end end From 7d9d688c295bb5a8928a2e608a8e9d917709814b Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 22 Aug 2023 14:09:31 +0300 Subject: [PATCH 2/3] added check email for contacts --- app/jobs/check_force_delete_lift.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/check_force_delete_lift.rb b/app/jobs/check_force_delete_lift.rb index 3004d6042..597105185 100644 --- a/app/jobs/check_force_delete_lift.rb +++ b/app/jobs/check_force_delete_lift.rb @@ -17,7 +17,7 @@ class CheckForceDeleteLift < ApplicationJob def find_domains_to_lift_force_delete Domain.where("'#{DomainStatus::FORCE_DELETE}' = ANY (statuses)") - .select { |d| d.registrant.need_to_lift_force_delete? } + .select { |d| d.registrant.need_to_lift_force_delete? && d.contacts.all?(&:need_to_lift_force_delete?) } end def find_domains_to_process(domains) From 2b4a0c11da8476b4a71cdcdec862168e9b0574fa Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 22 Aug 2023 14:17:27 +0300 Subject: [PATCH 3/3] added incldue to the dataset --- app/jobs/check_force_delete_lift.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/check_force_delete_lift.rb b/app/jobs/check_force_delete_lift.rb index 597105185..ab28a5561 100644 --- a/app/jobs/check_force_delete_lift.rb +++ b/app/jobs/check_force_delete_lift.rb @@ -16,7 +16,7 @@ class CheckForceDeleteLift < ApplicationJob private def find_domains_to_lift_force_delete - Domain.where("'#{DomainStatus::FORCE_DELETE}' = ANY (statuses)") + Domain.where("'#{DomainStatus::FORCE_DELETE}' = ANY (statuses)").includes(:registrant, :contacts) .select { |d| d.registrant.need_to_lift_force_delete? && d.contacts.all?(&:need_to_lift_force_delete?) } end