use external account id to match correctly in webhook payload

Author: ryanarakawa

app/controllers/api/submissions_controller.rb

@@ -13,7 +13,7 @@ def index
       submissions = Submissions.search(current_user, @submissions, params[:q])
       submissions = filter_submissions(submissions, params)
 
-      submissions = paginate(submissions.preload(:created_by_user, :submitters,
+      submissions = paginate(submissions.preload(:account, :created_by_user, :submitters,
                                                  template: :folder,
                                                  combined_document_attachment: :blob,
                                                  audit_trail_attachment: :blob))

app/jobs/send_template_preferences_updated_webhook_request_job.rb

@@ -15,8 +15,8 @@ def perform(params = {})
 
     data = {
       id: template.id,
-      account_id: template.account_id,
-      partnership_id: template.partnership_id,
+      external_account_id: template.account&.external_account_id,
+      external_partnership_id: template.partnership&.external_partnership_id,
       external_id: template.external_id,
       application_key: template.application_key,
       submitters_order: template.preferences['submitters_order']

lib/submissions/serialize_for_api.rb

@@ -24,6 +24,7 @@ def call(submission, submitters = nil, params = {}, with_events: true, with_docu
 
       json = submission.as_json(SERIALIZE_PARAMS)
 
+      json['external_account_id'] = submission.account&.external_account_id
       json['created_by_user'] ||= nil
 
       if with_events

lib/submitters/serialize_for_webhook.rb

@@ -13,7 +13,7 @@ module SerializeForWebhook
     def call(submitter)
       ActiveRecord::Associations::Preloader.new(
         records: [submitter],
-        associations: [documents_attachments: :blob, attachments_attachments: :blob]
+        associations: [:account, { documents_attachments: :blob, attachments_attachments: :blob }]
       ).call
 
       values = build_values_array(submitter)
@@ -26,7 +26,8 @@ def call(submitter)
         submitter.declined_at? ? submitter.submission_events.find_by(event_type: :decline_form).data['reason'] : nil
 
       submitter.as_json(SERIALIZE_PARAMS)
-               .merge('decline_reason' => decline_reason,
+               .merge('external_account_id' => submitter.account&.external_account_id,
+                      'decline_reason' => decline_reason,
                       'role' => submitter_name,
                       'preferences' => submitter.preferences.except('default_values'),
                       'values' => values,

spec/jobs/send_template_preferences_updated_webhook_request_job_spec.rb

@@ -27,8 +27,8 @@
           'timestamp' => /.*/,
           'data' => {
             'id' => template.id,
-            'account_id' => template.account_id,
-            'partnership_id' => template.partnership_id,
+            'external_account_id' => template.account&.external_account_id,
+            'external_partnership_id' => template.partnership&.external_partnership_id,
             'external_id' => template.external_id,
             'application_key' => template.application_key,
             'submitters_order' => 'employee_then_manager'
@@ -53,8 +53,8 @@
           'timestamp' => /.*/,
           'data' => {
             'id' => template.id,
-            'account_id' => template.account_id,
-            'partnership_id' => template.partnership_id,
+            'external_account_id' => template.account&.external_account_id,
+            'external_partnership_id' => template.partnership&.external_partnership_id,
             'external_id' => template.external_id,
             'application_key' => template.application_key,
             'submitters_order' => 'simultaneous'
@@ -114,8 +114,8 @@
           'timestamp' => /.*/,
           'data' => {
             'id' => template.id,
-            'account_id' => template.account_id,
-            'partnership_id' => template.partnership_id,
+            'external_account_id' => template.account&.external_account_id,
+            'external_partnership_id' => template.partnership&.external_partnership_id,
             'external_id' => template.external_id,
             'application_key' => template.application_key,
             'submitters_order' => 'single_sided'

spec/requests/submissions_spec.rb

@@ -286,6 +286,7 @@ def index_submission_body(submission)
     {
       id: submission.id,
       account_id: submission.account_id,
+      external_account_id: submission.account&.external_account_id,
       name: submission.name,
       source: 'link',
       submitters_order: 'employee_then_manager',
@@ -346,6 +347,7 @@ def show_submission_body(submission)
     {
       id: submission.id,
       account_id: submission.account_id,
+      external_account_id: submission.account&.external_account_id,
       name: submission.name,
       source: 'link',
       status: 'pending',