adjust completed webhook sending

app/jobs/process_submitter_completion_job.rb

@@ -10,19 +10,18 @@ class ProcessSubmitterCompletionJob < ApplicationJob
 
     Submissions::EnsureResultGenerated.call(submitter)
 
-    if submitter.account.encrypted_configs.exists?(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    if is_all_completed && submitter.completed_at == submitter.submission.submitters.maximum(:completed_at)
-      SendFormCompletedWebhookRequestJob.perform_later(submitter)
+      Submissions::GenerateAuditTrail.call(submitter.submission)
+
+      enqueue_completed_emails(submitter)
     end
 
-    return unless is_all_completed
+    return if Accounts.load_webhook_configs(submitter.account).blank?
-    return if submitter.completed_at != submitter.submission.submitters.maximum(:completed_at)
 
-    Submissions::GenerateAuditTrail.call(submitter.submission)
+    SendFormCompletedWebhookRequestJob.perform_later(submitter)
-
-    enqueue_emails(submitter)
   end
 
-  def enqueue_emails(submitter)
+  def enqueue_completed_emails(submitter)
     user = submitter.submission.created_by_user || submitter.template.author
 
     if submitter.template.account.users.exists?(id: user.id)

lib/accounts.rb

@@ -47,9 +47,13 @@ module Accounts
   end
 
   def load_webhook_configs(account)
-    EncryptedConfig.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY) unless Docuseal.multitenant?
+    configs = account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
 
-    account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    unless Docuseal.multitenant?
+      configs ||= Account.order(:id).first.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    end
+
+    configs
   end
 
   def load_signing_pkcs(account)