From 660b24710ec375c3102cc2c28ee85332bf5b9682 Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Thu, 10 Sep 2026 10:22:06 +0300
Subject: [PATCH] do not email archived user

---
 app/controllers/submit_form_decline_controller.rb | 3 ++-
 app/jobs/process_submitter_completion_job.rb      | 2 +-
 lib/users.rb                                      | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/submit_form_decline_controller.rb b/app/controllers/submit_form_decline_controller.rb
index ca50e60c..139175cf 100644
--- a/app/controllers/submit_form_decline_controller.rb
+++ b/app/controllers/submit_form_decline_controller.rb
@@ -26,7 +26,8 @@ class SubmitFormDeclineController < ApplicationController
 
     user = @submitter.submission.created_by_user || @submitter.template.author
 
-    if user.user_configs.find_by(key: UserConfig::RECEIVE_DECLINED_EMAIL)&.value != false
+    if Users.send_emails?(user) &&
+       user.user_configs.find_by(key: UserConfig::RECEIVE_DECLINED_EMAIL)&.value != false
       SubmitterMailer.declined_email(@submitter, user).deliver_later!
     end
 
diff --git a/app/jobs/process_submitter_completion_job.rb b/app/jobs/process_submitter_completion_job.rb
index a6c02dc6..1dc1da13 100644
--- a/app/jobs/process_submitter_completion_job.rb
+++ b/app/jobs/process_submitter_completion_job.rb
@@ -133,7 +133,7 @@ class ProcessSubmitterCompletionJob
       user_submitter = submission.submitters.find { |s| s.email == user.email }
 
       is_sent_to_user =
-        if user.role != 'integration' &&
+        if user.role != 'integration' && Users.send_emails?(user) &&
            (!user_submitter || user_submitter.preferences['send_email'] == false || !is_copy_email_enabled) &&
            user.user_configs.find_by(key: UserConfig::RECEIVE_COMPLETED_EMAIL)&.value != false
           SubmitterMailer.completed_email(submitter, user).deliver_later!
diff --git a/lib/users.rb b/lib/users.rb
index 49989a4f..9508fb78 100644
--- a/lib/users.rb
+++ b/lib/users.rb
@@ -3,6 +3,10 @@
 module Users
   module_function
 
+  def send_emails?(user)
+    !user.archived_at?
+  end
+
   def generate_csv(users)
     headers = %w[email first_name last_name role current_sign_in_at last_sign_in_at updated_at created_at]