application_key -> external_id

lib/submissions/create_from_submitters.rb

@@ -135,7 +135,7 @@ module Submissions
         email:,
         phone: attrs[:phone].to_s.gsub(/[^0-9+]/, ''),
         name: attrs[:name],
-        application_key: attrs[:application_key],
+        external_id: attrs[:external_id].presence || attrs[:application_key],
         completed_at: attrs[:completed] ? Time.current : nil,
         sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
         values: attrs[:values] || {},

lib/submitters/serialize_for_api.rb

@@ -18,9 +18,9 @@ module Submitters
 
       serialize_params = {
         include: {},
-        only: %i[id slug uuid name email phone completed_at application_key
+        only: %i[id slug uuid name email phone completed_at external_id
                  opened_at sent_at created_at updated_at],
-        methods: %i[status]
+        methods: %i[status application_key]
       }
 
       serialize_params[:include][:template] = { only: %i[id name created_at updated_at] } if with_template

lib/submitters/serialize_for_webhook.rb

@@ -16,7 +16,8 @@ module Submitters
       submitter_name = (submitter.submission.template_submitters ||
                         submitter.submission.template.submitters).find { |e| e['uuid'] == submitter.uuid }['name']
 
-      submitter.as_json(include: [template: { only: %i[id name created_at updated_at] }])
+      submitter.as_json(methods: %i[application_key],
+                        include: [template: { only: %i[id name external_id created_at updated_at] }])
                .except('uuid', 'values', 'slug')
                .merge('values' => values,
                       'documents' => documents,

lib/templates/clone.rb

@@ -4,12 +4,12 @@ module Templates
   module Clone
     module_function
 
-    def call(original_template, author:, application_key: nil, name: nil, folder_name: nil)
+    def call(original_template, author:, external_id: nil, name: nil, folder_name: nil)
       original_template_account = original_template.account
 
       template = original_template_account.templates.new
 
-      template.application_key = application_key
+      template.external_id = external_id
       template.author = author
       template.name = name || "#{original_template.name} (Clone)"