fix optimize query

lib/submitters/serialize_for_api.rb

@@ -27,6 +27,10 @@ module Submitters
         additional_attrs['fields'] = SerializeForWebhook.build_fields_array(submitter)
       end
 
+      if with_template
+        additional_attrs['template'] = submitter.submission.template.as_json(only: %i[id name created_at updated_at])
+      end
+
       additional_attrs['values'] = SerializeForWebhook.build_values_array(submitter) if with_values
       additional_attrs['documents'] = SerializeForWebhook.build_documents_array(submitter) if with_documents
       additional_attrs['preferences'] = submitter.preferences.except('default_values')
@@ -41,10 +45,7 @@ module Submitters
           Rails.application.routes.url_helpers.submit_form_url(slug: submitter.slug, **Docuseal.default_url_options)
       end
 
-      include_params = {}
+      submitter.as_json(SERIALIZE_PARAMS).merge(additional_attrs)
-      include_params[:template] = { only: %i[id name created_at updated_at] } if with_template
-
-      submitter.as_json(SERIALIZE_PARAMS.merge(include: include_params)).merge(additional_attrs)
     end
 
     def serialize_events(events)

lib/submitters/serialize_for_webhook.rb

@@ -34,8 +34,10 @@ module Submitters
                       'audit_log_url' => submitter.submission.audit_log_url,
                       'submission_url' => r.submissions_preview_url(submitter.submission.slug,
                                                                     **Docuseal.default_url_options),
-                      'template' => submitter.template.as_json(only: %i[id name external_id created_at updated_at],
+                      'template' => submitter.submission.template.as_json(
-                                                               methods: %i[folder_name]),
+                        only: %i[id name external_id created_at updated_at],
+                        methods: %i[folder_name]
+                      ),
                       'submission' => {
                         **submitter.submission.slice(:id, :audit_log_url, :combined_document_url, :created_at),
                         status: build_submission_status(submitter.submission),