From 5b276dd7294a1f558ed743dae4ab003e21f77a2d Mon Sep 17 00:00:00 2001
From: Oleg Hasjanov <oleg.phenomenon@gmail.com>
Date: Fri, 21 May 2021 12:36:04 +0300
Subject: [PATCH] changed list of email received

---
 app/models/domain.rb                          |  5 ++--
 .../expire_period/process_expired_test.rb     | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 test/interactions/expire_period/process_expired_test.rb

diff --git a/app/models/domain.rb b/app/models/domain.rb
index 127643f54..9afde0891 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -671,9 +671,8 @@ class Domain < ApplicationRecord
   end
 
   def expired_domain_contact_emails
-    force_delete_contact_emails.reject do |email|
-      BouncedMailAddress.where(email: email).count.positive?
-    end
+    (primary_contact_emails +
+    ["info@#{name}", "#{prepared_domain_name}@#{name}"]).uniq
   end
 
   def all_related_emails
diff --git a/test/interactions/expire_period/process_expired_test.rb b/test/interactions/expire_period/process_expired_test.rb
new file mode 100644
index 000000000..1b60ce319
--- /dev/null
+++ b/test/interactions/expire_period/process_expired_test.rb
@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class StartTest < ActiveSupport::TestCase
+  include ActionMailer::TestHelper
+
+  setup do
+    @domain = domains(:shop)
+    @domain.update(expire_time: Time.zone.now - 1.day)
+    ActionMailer::Base.deliveries.clear
+  end
+
+  def test_expired_domain_contact_emails_should_not_contain_tech_contacts
+    contact_list = []
+    @domain.tech_contacts.each do |contact|
+      contact_list << contact.email
+    end
+
+    email_address = @domain.expired_domain_contact_emails
+    email = DomainExpireMailer.expired_soft(domain: @domain,
+                                            registrar: @domain.registrar,
+                                            email: email_address).deliver_now
+
+    email.to.each do |received|
+      assert_not contact_list.include? received
+    end
+  end
+end