From 08aa902e07afaeb0cd1769eb94a2657d52942cbe Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Mon, 26 May 2025 11:58:47 +0300
Subject: [PATCH] set from user id

---
 app/mailers/application_mailer.rb | 10 +++++++---
 app/mailers/submitter_mailer.rb   | 10 +++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 4f2cca3d..945994ed 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -20,7 +20,7 @@ class ApplicationMailer < ActionMailer::Base
   end
 
   def set_message_metadata
-    message.instance_variable_set(:@message_metadata, @message_metadata)
+    message.instance_variable_set(:@message_metadata, @message_metadata || {})
   end
 
   def set_message_uuid
@@ -28,10 +28,14 @@ class ApplicationMailer < ActionMailer::Base
   end
 
   def assign_message_metadata(tag, record)
-    @message_metadata = {
+    @message_metadata = (@message_metadata || {}).merge(
       'tag' => tag,
       'record_id' => record.id,
       'record_type' => record.class.name
-    }
+    )
+  end
+
+  def put_metadata(attrs)
+    @message_metadata = (@message_metadata || {}).merge(attrs)
   end
 end
diff --git a/app/mailers/submitter_mailer.rb b/app/mailers/submitter_mailer.rb
index acddfdbb..769995ed 100644
--- a/app/mailers/submitter_mailer.rb
+++ b/app/mailers/submitter_mailer.rb
@@ -233,9 +233,17 @@ class SubmitterMailer < ApplicationMailer
   def from_address_for_submitter(submitter)
     if submitter.submission.source.in?(%w[api embed]) &&
        (from_email = AccountConfig.find_by(account: submitter.account, key: 'integration_from_email')&.value.presence)
+      user = submitter.account.users.find_by(email: from_email)
+
+      put_metadata('from_user_id' => user.id)
+
       from_email
     else
-      (submitter.submission.created_by_user || submitter.submission.template.author).friendly_name
+      user = submitter.submission.created_by_user || submitter.submission.template.author
+
+      put_metadata('from_user_id' => user.id)
+
+      user.friendly_name
     end
   end
 end