From 4685bac4b39a53107400e4961227a9a1eeeb0baf Mon Sep 17 00:00:00 2001
From: Pete Matsyburka <pete@docuseal.com>
Date: Sat, 23 Aug 2025 11:28:26 +0300
Subject: [PATCH] fix serializers

---
 lib/submissions/serialize_for_api.rb    |  2 +-
 lib/submitters/serialize_for_webhook.rb | 29 ++++++++++++++-----------
 lib/templates/serialize_for_api.rb      | 12 +++++-----
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/lib/submissions/serialize_for_api.rb b/lib/submissions/serialize_for_api.rb
index 3fcd5056..92ad96e1 100644
--- a/lib/submissions/serialize_for_api.rb
+++ b/lib/submissions/serialize_for_api.rb
@@ -40,7 +40,7 @@ module Submissions
         end
 
         json['status'] = 'completed'
-        json['completed_at'] = last_submitter.completed_at
+        json['completed_at'] = last_submitter.completed_at.as_json
       else
         json['documents'] = [] if with_documents
         json['status'] = build_status(submission, submitters)
diff --git a/lib/submitters/serialize_for_webhook.rb b/lib/submitters/serialize_for_webhook.rb
index 614cca2c..9ef81cbc 100644
--- a/lib/submitters/serialize_for_webhook.rb
+++ b/lib/submitters/serialize_for_webhook.rb
@@ -12,15 +12,16 @@ module Submitters
 
     def call(submitter)
       ActiveRecord::Associations::Preloader.new(
-        records: [submitter],
-        associations: [documents_attachments: :blob, attachments_attachments: :blob]
+        records: [submitter], associations: [documents_attachments: :blob, attachments_attachments: :blob]
       ).call
 
       values = build_values_array(submitter)
       documents = build_documents_array(submitter)
 
-      submitter_name = (submitter.submission.template_submitters ||
-                        submitter.submission.template.submitters).find { |e| e['uuid'] == submitter.uuid }['name']
+      submission = submitter.submission
+
+      submitter_name = (submission.template_submitters ||
+                        submission.template.submitters).find { |e| e['uuid'] == submitter.uuid }['name']
 
       decline_reason =
         submitter.declined_at? ? submitter.submission_events.find_by(event_type: :decline_form).data['reason'] : nil
@@ -32,16 +33,18 @@ module Submitters
                       'values' => values,
                       'documents' => documents,
                       'audit_log_url' => submitter.submission.audit_log_url,
-                      'submission_url' => r.submissions_preview_url(submitter.submission.slug,
-                                                                    **Docuseal.default_url_options),
-                      'template' => submitter.submission.template.as_json(
+                      'submission_url' => r.submissions_preview_url(submission.slug, **Docuseal.default_url_options),
+                      'template' => submission.template.as_json(
                         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),
-                        url: r.submissions_preview_url(submitter.submission.slug, **Docuseal.default_url_options)
+                        'id' => submission.id,
+                        'audit_log_url' => submission.audit_log_url,
+                        'combined_document_url' => submission.combined_document_url,
+                        'status' => build_submission_status(submission),
+                        'url' => r.submissions_preview_url(submission.slug, **Docuseal.default_url_options),
+                        'created_at' => submission.created_at.as_json
                       })
     end
 
@@ -63,7 +66,7 @@ module Submitters
 
         value = fetch_field_value(field, submitter.values[field['uuid']], attachments_index)
 
-        { field: field_name, value: }
+        { 'field' => field_name, 'value' => value }
       end
     end
 
@@ -85,7 +88,7 @@ module Submitters
 
         value = fetch_field_value(field, submitter.values[field['uuid']], attachments_index)
 
-        { name: field_name, uuid: field['uuid'], value:, readonly: field['readonly'] == true }
+        { 'name' => field_name, 'uuid' => field['uuid'], 'value' => value, 'readonly' => field['readonly'] == true }
       end
     end
 
@@ -103,7 +106,7 @@ module Submitters
 
     def build_documents_array(submitter)
       submitter.documents.map do |attachment|
-        { name: attachment.filename.base, url: rails_storage_proxy_url(attachment) }
+        { 'name' => attachment.filename.base, 'url' => rails_storage_proxy_url(attachment) }
       end
     end
 
diff --git a/lib/templates/serialize_for_api.rb b/lib/templates/serialize_for_api.rb
index b60f9023..1e1d2dcf 100644
--- a/lib/templates/serialize_for_api.rb
+++ b/lib/templates/serialize_for_api.rb
@@ -25,7 +25,7 @@ module Templates
                                         name: :preview_images)
                                  .preload(:blob)
 
-      json[:documents] = template.schema.filter_map do |item|
+      json['documents'] = template.schema.filter_map do |item|
         attachment = schema_documents.find { |e| e.uuid == item['attachment_uuid'] }
 
         unless attachment
@@ -38,11 +38,11 @@ module Templates
         first_page_blob ||= attachment.preview_images.joins(:blob).find_by(blob: { filename: ['0.jpg', '0.png'] })&.blob
 
         {
-          id: attachment.id,
-          uuid: attachment.uuid,
-          url: ActiveStorage::Blob.proxy_url(attachment.blob),
-          preview_image_url: first_page_blob && ActiveStorage::Blob.proxy_url(first_page_blob),
-          filename: attachment.filename
+          'id' => attachment.id,
+          'uuid' => attachment.uuid,
+          'url' => ActiveStorage::Blob.proxy_url(attachment.blob),
+          'preview_image_url' => first_page_blob && ActiveStorage::Blob.proxy_url(first_page_blob),
+          'filename' => attachment.filename
         }
       end