add submitter account_id

lib/submissions.rb

@@ -67,6 +67,7 @@ module Submissions
 
       submission.submitters.new(email: normalize_email(email),
                                 uuid: template.submitters.first['uuid'],
+                                account_id: user.account_id,
                                 preferences:,
                                 sent_at: mark_as_sent ? Time.current : nil)
 

lib/submissions/create_from_submitters.rb

@@ -155,16 +155,14 @@ module Submissions
       submitter_preferences = Submitters.normalize_preferences(submission.account, user, attrs)
       values = attrs[:values] || {}
 
-      phone_field_uuid =
-        (submission.template_fields || submission.template.fields).find do |f|
-          values[f['uuid']].present? && f['type'] == 'phone'
-        end&.dig('uuid')
+      phone_field_uuid = find_phone_field(submission, values)&.dig('uuid')
 
       submitter =
         submission.submitters.new(
           email:,
           phone: (attrs[:phone] || values[phone_field_uuid]).to_s.gsub(/[^0-9+]/, ''),
           name: attrs[:name],
+          account_id: user.account_id,
           external_id: attrs[:external_id].presence || attrs[:application_key],
           completed_at: attrs[:completed].present? ? Time.current : nil,
           values: values.except(phone_field_uuid),
@@ -183,6 +181,12 @@ module Submissions
       submitter
     end
 
+    def find_phone_field(submission, values)
+      (submission.template_fields || submission.template.fields).find do |f|
+        values[f['uuid']].present? && f['type'] == 'phone'
+      end
+    end
+
     def assign_completed_attributes(submitter)
       submitter.values = Submitters::SubmitValues.merge_default_values(submitter)
       submitter.values = Submitters::SubmitValues.merge_formula_values(submitter)