add dynamic documents to template response

app/controllers/api/templates_controller.rb

@@ -9,20 +9,7 @@ module Api
 
       templates = paginate(templates.preload(:author, folder: :parent_folder))
 
-      schema_documents =
+      schema_documents, dynamic_documents, preview_image_attachments = preload_relations(templates)
-        ActiveStorage::Attachment.where(record_id: templates.map(&:id),
-                                        record_type: 'Template',
-                                        name: :documents,
-                                        uuid: templates.flat_map { |t| t.schema.pluck('attachment_uuid') })
-                                 .preload(:blob)
-
-      preview_image_attachments =
-        ActiveStorage::Attachment.joins(:blob)
-                                 .where(blob: { filename: ['0.png', '0.jpg'] })
-                                 .where(record_id: schema_documents.map(&:id),
-                                        record_type: 'ActiveStorage::Attachment',
-                                        name: :preview_images)
-                                 .preload(:blob)
 
       expires_at = Accounts.link_expires_at(current_account)
 
@@ -30,6 +17,7 @@ module Api
         data: templates.map do |t|
           Templates::SerializeForApi.call(t,
                                           schema_documents: schema_documents.select { |e| e.record_id == t.id },
+                                          dynamic_documents:,
                                           preview_image_attachments:,
                                           expires_at:)
         end,
@@ -88,6 +76,41 @@ module Api
 
     private
 
+    def preload_relations(templates)
+      schema_documents =
+        ActiveStorage::Attachment.where(record_id: templates.map(&:id),
+                                        record_type: 'Template',
+                                        name: :documents,
+                                        uuid: templates.flat_map { |t| t.schema.pluck('attachment_uuid') })
+                                 .preload(:blob)
+
+      dynamic_document_uuids =
+        templates.flat_map { |t| t.schema.select { |item| item['dynamic'] }.pluck('attachment_uuid') }
+
+      dynamic_documents =
+        if dynamic_document_uuids.present?
+          DynamicDocument.where(template: templates.map(&:id))
+                         .where(uuid: dynamic_document_uuids)
+                         .preload(current_version: { document_attachment: :blob })
+                         .select(:id, :uuid, :template_id, :sha1, :created_at, :updated_at)
+        else
+          DynamicDocument.none
+        end
+
+      preview_attachment_ids =
+        schema_documents.map(&:id) + dynamic_documents.filter_map { |d| d.current_version&.document_attachment&.id }
+
+      preview_image_attachments =
+        ActiveStorage::Attachment.joins(:blob)
+                                 .where(blob: { filename: ['0.png', '0.jpg'] })
+                                 .where(record_id: preview_attachment_ids,
+                                        record_type: 'ActiveStorage::Attachment',
+                                        name: :preview_images)
+                                 .preload(:blob)
+
+      [schema_documents, dynamic_documents, preview_image_attachments]
+    end
+
     def filter_templates(templates, params)
       templates = Templates.search(current_user, templates, params[:q])
       templates = params[:archived].in?(['true', true]) ? templates.archived : templates.active

app/models/dynamic_document.rb

@@ -28,6 +28,12 @@ class DynamicDocument < ApplicationRecord
 
   has_many :versions, class_name: 'DynamicDocumentVersion', dependent: :destroy
 
+  has_one :current_version, class_name: 'DynamicDocumentVersion',
+                            primary_key: %i[id sha1],
+                            foreign_key: %i[dynamic_document_id sha1],
+                            dependent: :destroy,
+                            inverse_of: :dynamic_document
+
   attribute :fields, :json
 
   before_validation :set_sha1

app/models/template.rb

@@ -75,7 +75,7 @@ class Template < ApplicationRecord
   has_many :dynamic_document_versions, through: :dynamic_documents, source: :versions
 
   has_many :schema_dynamic_documents, lambda { |e|
-    where(uuid: e.schema.select { |e| e['dynamic'] }.pluck('attachment_uuid'))
+    where(uuid: e.schema.select { |item| item['dynamic'] }.pluck('attachment_uuid'))
   }, class_name: 'DynamicDocument', dependent: :destroy, inverse_of: :template
 
   scope :active, -> { where(archived_at: nil) }

lib/templates/serialize_for_api.rb

@@ -14,27 +14,25 @@ module Templates
 
     module_function
 
-    def call(template, schema_documents: template.schema_documents.preload(:blob), preview_image_attachments: nil,
+    def call(template, schema_documents: template.schema_documents.preload(:blob), dynamic_documents: nil,
-             expires_at: Accounts.link_expires_at(Account.new(id: template.account_id)))
+             preview_image_attachments: nil, expires_at: Accounts.link_expires_at(Account.new(id: template.account_id)))
       json = template.as_json(SERIALIZE_PARAMS)
 
-      preview_image_attachments ||=
+      dynamic_documents ||= preload_dynamic_documents(template)
-        ActiveStorage::Attachment.joins(:blob)
+
-                                 .where(blob: { filename: ['0.jpg', '0.png'] })
+      preview_image_attachments ||= preload_preview_image_attachments(schema_documents, dynamic_documents)
-                                 .where(record_id: schema_documents.map(&:id),
-                                        record_type: 'ActiveStorage::Attachment',
-                                        name: :preview_images)
-                                 .preload(:blob)
 
       json['documents'] = template.schema.filter_map do |item|
-        attachment = schema_documents.find { |e| e.uuid == item['attachment_uuid'] }
+        if item['dynamic']
+          dynamic_document = dynamic_documents.find { |e| e.uuid == item['attachment_uuid'] }
 
-        unless attachment
+          attachment = dynamic_document.current_version&.document_attachment
-          Rollbar.error("Documents missing: #{template.id}") if defined?(Rollbar)
-
-          next
         end
 
+        attachment ||= schema_documents.find { |e| e.uuid == item['attachment_uuid'] }
+
+        next unless attachment
+
         first_page_blob = preview_image_attachments.find { |e| e.record_id == attachment.id }&.blob
         first_page_blob ||= attachment.preview_images.joins(:blob).find_by(blob: { filename: ['0.jpg', '0.png'] })&.blob
 
@@ -49,5 +47,26 @@ module Templates
 
       json
     end
+
+    def preload_dynamic_documents(template)
+      return DynamicDocument.none if template.schema.none? { |item| item['dynamic'] }
+
+      template.schema_dynamic_documents
+              .preload(current_version: { document_attachment: :blob })
+              .select(:id, :uuid, :template_id, :sha1, :created_at, :updated_at)
+    end
+
+    def preload_preview_image_attachments(schema_documents, dynamic_documents)
+      record_ids =
+        schema_documents.map(&:id) +
+        dynamic_documents.filter_map { |d| d.current_version&.document_attachment&.id }
+
+      ActiveStorage::Attachment.joins(:blob)
+                               .where(blob: { filename: ['0.jpg', '0.png'] })
+                               .where(record_id: record_ids,
+                                      record_type: 'ActiveStorage::Attachment',
+                                      name: :preview_images)
+                               .preload(:blob)
+    end
   end
 end