didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix serializers

Browse Source
This commit is contained in:
Pete Matsyburka
2025-08-23 11:28:26 +03:00
parent a05275cc08
commit 4685bac4b3
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/submissions/serialize_for_api.rb
+1 -1
View File
@@ -40,7 +40,7 @@ module Submissions
end end
json['status'] = 'completed' json['status'] = 'completed'
json['completed_at'] = last_submitter.completed_at json['completed_at'] = last_submitter.completed_at.as_json
else else
json['documents'] = [] if with_documents json['documents'] = [] if with_documents
json['status'] = build_status(submission, submitters) json['status'] = build_status(submission, submitters)
lib/submitters/serialize_for_webhook.rb
+16 -13
View File
@@ -12,15 +12,16 @@ module Submitters
def call(submitter) def call(submitter)
ActiveRecord::Associations::Preloader.new( ActiveRecord::Associations::Preloader.new(
records: [submitter], records: [submitter], associations: [documents_attachments: :blob, attachments_attachments: :blob]
associations: [documents_attachments: :blob, attachments_attachments: :blob]
).call ).call
values = build_values_array(submitter) values = build_values_array(submitter)
documents = build_documents_array(submitter) documents = build_documents_array(submitter)
submitter_name = (submitter.submission.template_submitters || submission = submitter.submission
submitter.submission.template.submitters).find { |e| e['uuid'] == submitter.uuid }['name']
submitter_name = (submission.template_submitters ||
submission.template.submitters).find { |e| e['uuid'] == submitter.uuid }['name']
decline_reason = decline_reason =
submitter.declined_at? ? submitter.submission_events.find_by(event_type: :decline_form).data['reason'] : nil submitter.declined_at? ? submitter.submission_events.find_by(event_type: :decline_form).data['reason'] : nil
@@ -32,16 +33,18 @@ module Submitters
'values' => values, 'values' => values,
'documents' => documents, 'documents' => documents,
'audit_log_url' => submitter.submission.audit_log_url, 'audit_log_url' => submitter.submission.audit_log_url,
'submission_url' => r.submissions_preview_url(submitter.submission.slug, 'submission_url' => r.submissions_preview_url(submission.slug, **Docuseal.default_url_options),
**Docuseal.default_url_options), 'template' => submission.template.as_json(
'template' => submitter.submission.template.as_json(
only: %i[id name external_id created_at updated_at], only: %i[id name external_id created_at updated_at],
methods: %i[folder_name] methods: %i[folder_name]
), ),
'submission' => { 'submission' => {
**submitter.submission.slice(:id, :audit_log_url, :combined_document_url, :created_at), 'id' => submission.id,
status: build_submission_status(submitter.submission), 'audit_log_url' => submission.audit_log_url,
url: r.submissions_preview_url(submitter.submission.slug, **Docuseal.default_url_options) '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 end
@@ -63,7 +66,7 @@ module Submitters
value = fetch_field_value(field, submitter.values[field['uuid']], attachments_index) value = fetch_field_value(field, submitter.values[field['uuid']], attachments_index)
{ field: field_name, value: } { 'field' => field_name, 'value' => value }
end end
end end
@@ -85,7 +88,7 @@ module Submitters
value = fetch_field_value(field, submitter.values[field['uuid']], attachments_index) 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
end end
@@ -103,7 +106,7 @@ module Submitters
def build_documents_array(submitter) def build_documents_array(submitter)
submitter.documents.map do |attachment| 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
end end
lib/templates/serialize_for_api.rb
+6 -6
View File
@@ -25,7 +25,7 @@ module Templates
name: :preview_images) name: :preview_images)
.preload(:blob) .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'] } attachment = schema_documents.find { |e| e.uuid == item['attachment_uuid'] }
unless attachment 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 first_page_blob ||= attachment.preview_images.joins(:blob).find_by(blob: { filename: ['0.jpg', '0.png'] })&.blob
{ {
id: attachment.id, 'id' => attachment.id,
uuid: attachment.uuid, 'uuid' => attachment.uuid,
url: ActiveStorage::Blob.proxy_url(attachment.blob), 'url' => ActiveStorage::Blob.proxy_url(attachment.blob),
preview_image_url: first_page_blob && ActiveStorage::Blob.proxy_url(first_page_blob), 'preview_image_url' => first_page_blob && ActiveStorage::Blob.proxy_url(first_page_blob),
filename: attachment.filename 'filename' => attachment.filename
} }
end end