fix: merge conflicts

packages/trpc/server/document-router/update-document.ts

@@ -1,6 +1,6 @@
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta';
-import { updateDocument } from '@documenso/lib/server-only/document/update-document';
+import { updateEnvelope } from '@documenso/lib/server-only/envelope/update-envelope';
+import { mapSecondaryIdToDocumentId } from '@documenso/lib/utils/envelope';
 import { isValidExpirySettings } from '@documenso/lib/utils/expiry';
 
 import { authenticatedProcedure } from '../trpc';
@@ -8,13 +8,13 @@ import {
   ZUpdateDocumentRequestSchema,
   ZUpdateDocumentResponseSchema,
 } from './update-document.types';
-import { updateDocumentMeta } from './update-document.types';
+import { updateDocumentMeta as updateDocumentTrpcMeta } from './update-document.types';
 
 /**
  * Public route.
  */
 export const updateDocumentRoute = authenticatedProcedure
-  .meta(updateDocumentMeta)
+  .meta(updateDocumentTrpcMeta)
   .input(ZUpdateDocumentRequestSchema)
   .output(ZUpdateDocumentResponseSchema)
   .mutation(async ({ input, ctx }) => {
@@ -38,37 +38,23 @@ export const updateDocumentRoute = authenticatedProcedure
       });
     }
 
-    if (Object.values(meta).length > 0) {
-      await upsertDocumentMeta({
-        userId: ctx.user.id,
-        teamId,
-        documentId,
-        subject: meta.subject,
-        message: meta.message,
-        timezone: meta.timezone,
-        dateFormat: meta.dateFormat,
-        language: meta.language,
-        typedSignatureEnabled: meta.typedSignatureEnabled,
-        uploadSignatureEnabled: meta.uploadSignatureEnabled,
-        drawSignatureEnabled: meta.drawSignatureEnabled,
-        redirectUrl: meta.redirectUrl,
-        distributionMethod: meta.distributionMethod,
-        signingOrder: meta.signingOrder,
-        allowDictateNextSigner: meta.allowDictateNextSigner,
-        emailId: meta.emailId,
-        emailReplyTo: meta.emailReplyTo,
-        emailSettings: meta.emailSettings,
-        expiryAmount: meta.expiryAmount,
-        expiryUnit: meta.expiryUnit,
-        requestMetadata: ctx.metadata,
-      });
-    }
-
-    return await updateDocument({
+    const envelope = await updateEnvelope({
       userId,
       teamId,
-      documentId,
+      id: {
+        type: 'documentId',
+        id: documentId,
+      },
       data,
+      meta,
       requestMetadata: ctx.metadata,
     });
+
+    const mappedDocument = {
+      ...envelope,
+      id: mapSecondaryIdToDocumentId(envelope.secondaryId),
+      envelopeId: envelope.id,
+    };
+
+    return mappedDocument;
   });