fix: merge conflicts

packages/lib/server-only/template/create-document-from-direct-template.ts

@@ -19,7 +19,7 @@ import { z } from 'zod';
 
 import { mailer } from '@documenso/email/mailer';
 import { DocumentCreatedFromDirectTemplateEmailTemplate } from '@documenso/email/templates/document-created-from-direct-template';
-import { nanoid } from '@documenso/lib/universal/id';
+import { nanoid, prefixedId } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 import type { TSignFieldWithTokenMutationSchema } from '@documenso/trpc/server/field-router/schema';
 
@@ -276,6 +276,7 @@ export const createDocumentFromDirectTemplate = async ({
     // Create the document and non direct template recipients.
     const document = await tx.document.create({
       data: {
+        qrToken: prefixedId('qr'),
         source: DocumentSource.TEMPLATE_DIRECT_LINK,
         templateId: template.id,
         userId: template.userId,

packages/lib/server-only/template/create-document-from-template-legacy.ts

@@ -1,6 +1,6 @@
 import { DocumentSource, type RecipientRole } from '@prisma/client';
 
-import { nanoid } from '@documenso/lib/universal/id';
+import { nanoid, prefixedId } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 
 export type CreateDocumentFromTemplateLegacyOptions = {
@@ -70,6 +70,7 @@ export const createDocumentFromTemplateLegacy = async ({
 
   const document = await prisma.document.create({
     data: {
+      qrToken: prefixedId('qr'),
       source: DocumentSource.TEMPLATE,
       templateId: template.id,
       userId,
@@ -77,6 +78,7 @@ export const createDocumentFromTemplateLegacy = async ({
       title: template.title,
       visibility: template.team?.teamGlobalSettings?.documentVisibility,
       documentDataId: documentData.id,
+      useLegacyFieldInsertion: template.useLegacyFieldInsertion ?? false,
       recipients: {
         create: template.recipients.map((recipient) => ({
           email: recipient.email,

packages/lib/server-only/template/create-document-from-template.ts

@@ -9,11 +9,13 @@ import {
   SigningStatus,
   WebhookTriggerEvents,
 } from '@prisma/client';
+import { DateTime } from 'luxon';
 import { match } from 'ts-pattern';
 
-import { nanoid } from '@documenso/lib/universal/id';
+import { nanoid, prefixedId } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
 
+import { DEFAULT_DOCUMENT_DATE_FORMAT } from '../../constants/date-formats';
 import type { SupportedLanguageCodes } from '../../constants/i18n';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
@@ -372,6 +374,7 @@ export const createDocumentFromTemplate = async ({
   return await prisma.$transaction(async (tx) => {
     const document = await tx.document.create({
       data: {
+        qrToken: prefixedId('qr'),
         source: DocumentSource.TEMPLATE,
         externalId: externalId || template.externalId,
         templateId: template.id,
@@ -384,6 +387,7 @@ export const createDocumentFromTemplate = async ({
           globalActionAuth: templateAuthOptions.globalActionAuth,
         }),
         visibility: template.visibility || template.team?.teamGlobalSettings?.documentVisibility,
+        useLegacyFieldInsertion: template.useLegacyFieldInsertion ?? false,
         documentMeta: {
           create: {
             subject: override?.subject || template.templateMeta?.subject,
@@ -506,10 +510,8 @@ export const createDocumentFromTemplate = async ({
       fieldsToCreate = fieldsToCreate.concat(
         fields.map((field) => {
           const prefillField = prefillFields?.find((value) => value.id === field.id);
-          // Use type assertion to help TypeScript understand the structure
-          const updatedFieldMeta = getUpdatedFieldMeta(field, prefillField);
 
-          return {
+          const payload = {
             documentId: document.id,
             recipientId: recipient.id,
             type: field.type,
@@ -520,8 +522,38 @@ export const createDocumentFromTemplate = async ({
             height: field.height,
             customText: '',
             inserted: false,
-            fieldMeta: updatedFieldMeta,
+            fieldMeta: field.fieldMeta,
           };
+
+          if (prefillField) {
+            match(prefillField)
+              .with({ type: 'date' }, (selector) => {
+                if (!selector.value) {
+                  throw new AppError(AppErrorCode.INVALID_BODY, {
+                    message: `Date value is required for field ${field.id}`,
+                  });
+                }
+
+                const date = new Date(selector.value);
+
+                if (isNaN(date.getTime())) {
+                  throw new AppError(AppErrorCode.INVALID_BODY, {
+                    message: `Invalid date value for field ${field.id}: ${selector.value}`,
+                  });
+                }
+
+                payload.customText = DateTime.fromJSDate(date).toFormat(
+                  template.templateMeta?.dateFormat ?? DEFAULT_DOCUMENT_DATE_FORMAT,
+                );
+
+                payload.inserted = true;
+              })
+              .otherwise((selector) => {
+                payload.fieldMeta = getUpdatedFieldMeta(field, selector);
+              });
+          }
+
+          return payload;
         }),
       );
     });

packages/lib/server-only/template/create-template.ts

@@ -20,6 +20,7 @@ export const createTemplate = async ({
   userId,
   teamId,
   templateDocumentDataId,
+  folderId,
 }: CreateTemplateOptions) => {
   let team = null;
 
@@ -43,12 +44,46 @@ export const createTemplate = async ({
     }
   }
 
+  if (folderId) {
+    const folder = await prisma.folder.findFirst({
+      where: {
+        id: folderId,
+        ...(teamId
+          ? {
+              team: {
+                id: teamId,
+                members: {
+                  some: {
+                    userId,
+                  },
+                },
+              },
+            }
+          : {
+              userId,
+              teamId: null,
+            }),
+      },
+    });
+
+    if (!folder) {
+      throw new AppError(AppErrorCode.NOT_FOUND, {
+        message: 'Folder not found',
+      });
+    }
+  }
+
+  if (teamId && !team) {
+    throw new AppError(AppErrorCode.NOT_FOUND);
+  }
+
   return await prisma.template.create({
     data: {
       title,
       userId,
       templateDocumentDataId,
       teamId,
+      folderId: folderId,
       templateMeta: {
         create: {
           language: team?.teamGlobalSettings?.documentLanguage,

packages/lib/server-only/template/find-templates.ts

@@ -12,6 +12,7 @@ export type FindTemplatesOptions = {
   type?: Template['type'];
   page?: number;
   perPage?: number;
+  folderId?: string;
 };
 
 export const findTemplates = async ({
@@ -20,6 +21,7 @@ export const findTemplates = async ({
   type,
   page = 1,
   perPage = 10,
+  folderId,
 }: FindTemplatesOptions) => {
   const whereFilter: Prisma.TemplateWhereInput[] = [];
 
@@ -67,6 +69,12 @@ export const findTemplates = async ({
     );
   }
 
+  if (folderId) {
+    whereFilter.push({ folderId });
+  } else {
+    whereFilter.push({ folderId: null });
+  }
+
   const [data, count] = await Promise.all([
     prisma.template.findMany({
       where: {

packages/lib/server-only/template/get-template-by-id.ts

@@ -6,9 +6,15 @@ export type GetTemplateByIdOptions = {
   id: number;
   userId: number;
   teamId?: number;
+  folderId?: string | null;
 };
 
-export const getTemplateById = async ({ id, userId, teamId }: GetTemplateByIdOptions) => {
+export const getTemplateById = async ({
+  id,
+  userId,
+  teamId,
+  folderId = null,
+}: GetTemplateByIdOptions) => {
   const template = await prisma.template.findFirst({
     where: {
       id,
@@ -27,6 +33,7 @@ export const getTemplateById = async ({ id, userId, teamId }: GetTemplateByIdOpt
             userId,
             teamId: null,
           }),
+      ...(folderId ? { folderId } : {}),
     },
     include: {
       directLink: true,
@@ -41,6 +48,7 @@ export const getTemplateById = async ({ id, userId, teamId }: GetTemplateByIdOpt
           email: true,
         },
       },
+      folder: true,
     },
   });
 

packages/lib/server-only/template/update-template.ts

@@ -21,6 +21,7 @@ export type UpdateTemplateOptions = {
     publicTitle?: string;
     publicDescription?: string;
     type?: Template['type'];
+    useLegacyFieldInsertion?: boolean;
   };
   meta?: Partial<Omit<TemplateMeta, 'id' | 'templateId'>>;
 };
@@ -107,6 +108,7 @@ export const updateTemplate = async ({
       visibility: data?.visibility,
       publicDescription: data?.publicDescription,
       publicTitle: data?.publicTitle,
+      useLegacyFieldInsertion: data?.useLegacyFieldInsertion,
       authOptions,
       templateMeta: {
         upsert: {