add webhook urls record

app/jobs/process_submitter_completion_job.rb

@@ -20,9 +20,25 @@ class ProcessSubmitterCompletionJob
       enqueue_completed_emails(submitter)
     end
 
-    return if Accounts.load_webhook_url(submitter.account).blank?
+    enqueue_completed_webhooks(submitter)
+  end
 
-    SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id })
+  def enqueue_completed_webhooks(submitter)
+    webhook_config = Accounts.load_webhook_config(submitter.account)
+
+    if webhook_config
+      SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                         'encrypted_config_id' => webhook_config.id })
+    end
+
+    webhook_ids = submitter.account.webhook_urls.where(
+      Arel::Table.new(:webhook_urls)[:events].matches('%"form.completed"%')
+    ).pluck(:id)
+
+    webhook_ids.each do |webhook_id|
+      SendFormCompletedWebhookRequestJob.perform_async({ 'submitter_id' => submitter.id,
+                                                         'webhook_url_id' => webhook_id })
+    end
   end
 
   def enqueue_completed_emails(submitter)

app/jobs/send_form_completed_webhook_request_job.rb

@@ -13,14 +13,11 @@ class SendFormCompletedWebhookRequestJob
     submitter = Submitter.find(params['submitter_id'])
 
     attempt = params['attempt'].to_i
-    url = Accounts.load_webhook_url(submitter.submission.account)
+
+    url = load_url(submitter, params)
 
     return if url.blank?
 
-    preferences = Accounts.load_webhook_preferences(submitter.submission.account)
-
-    return if preferences['form.completed'] == false
-
     Submissions::EnsureResultGenerated.call(submitter)
 
     ActiveStorage::Current.url_options = Docuseal.default_url_options
@@ -41,10 +38,28 @@ class SendFormCompletedWebhookRequestJob
     if (resp.nil? || resp.status.to_i >= 400) && attempt <= MAX_ATTEMPTS &&
        (!Docuseal.multitenant? || submitter.account.account_configs.exists?(key: :plan))
       SendFormCompletedWebhookRequestJob.perform_in((2**attempt).minutes, {
-                                                      'submitter_id' => submitter.id,
+                                                      **params,
                                                       'attempt' => attempt + 1,
                                                       'last_status' => resp&.status.to_i
                                                     })
     end
   end
+
+  def load_url(submitter, params)
+    if params['encrypted_config_id']
+      url = EncryptedConfig.find(params['encrypted_config_id']).value
+
+      return if url.blank?
+
+      preferences = Accounts.load_webhook_preferences(submitter.submission.account)
+
+      return if preferences['form.completed'] == false
+
+      url
+    elsif params['webhook_url_id']
+      webhook_url = submitter.account.webhook_urls.find(params['webhook_url_id'])
+
+      webhook_url.url if webhook_url.events.include?('form.completed')
+    end
+  end
 end