From dbbe3acb2a333cfcc92a4b4b901464204280cfdd Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Sat, 15 Oct 2022 13:14:56 -0300 Subject: [PATCH 1/2] fix check force delete lift poll messages --- app/jobs/check_force_delete_lift.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/jobs/check_force_delete_lift.rb b/app/jobs/check_force_delete_lift.rb index 4ad43fb4a..524c4bcdc 100644 --- a/app/jobs/check_force_delete_lift.rb +++ b/app/jobs/check_force_delete_lift.rb @@ -6,8 +6,8 @@ class CheckForceDeleteLift < ApplicationJob .select { |d| d.registrant.need_to_lift_force_delete? } handle_refresh_status(domains) if domains.present? - domains = Domain.where("force_delete_data->'template_name' = ?", 'invalid_email') - .where("force_delete_data->'force_delete_type' = ?", 'soft') + domains = (domains + Domain.where("force_delete_data->'template_name' = ?", 'invalid_email') + .where("force_delete_data->'force_delete_type' = ?", 'soft')).uniq domains.each do |domain| Domains::ForceDeleteLift::Base.run(domain: domain) @@ -39,15 +39,5 @@ class CheckForceDeleteLift < ApplicationJob domain.status_notes[DomainStatus::FORCE_DELETE].slice!(registrant.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 - - 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 From 62f18c0358cfafb3f8d5c398f708800ba23f7aab Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Sun, 16 Oct 2022 07:55:24 -0300 Subject: [PATCH 2/2] fix test --- test/models/domain/force_delete_test.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 7032a1f91..c333b12df 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -457,8 +457,6 @@ class ForceDeleteTest < ActionMailer::TestCase domain.reload assert_nil domain.status_notes[DomainStatus::FORCE_DELETE] - notification = domain.registrar.notifications.last(2).first - assert notification.text.include? asserted_text assert_not domain.force_delete_scheduled? end