chore: merged main

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

@@ -16,6 +16,7 @@ import { prefixedId } from '../../universal/id';
 import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
 import { determineDocumentVisibility } from '../../utils/document-visibility';
+import { buildTeamWhereQuery } from '../../utils/teams';
 import { getTeamById } from '../team/get-team';
 import { getTeamSettings } from '../team/get-team-settings';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@@ -58,8 +59,10 @@ export const createDocument = async ({
     const folder = await prisma.folder.findFirst({
       where: {
         id: folderId,
-        userId,
-        teamId,
+        team: buildTeamWhereQuery({
+          teamId,
+          userId,
+        }),
       },
       select: {
         visibility: true,

packages/lib/server-only/document/resend-document.ts

@@ -54,14 +54,7 @@ export const resendDocument = async ({
   const document = await prisma.document.findUnique({
     where: documentWhereInput,
     include: {
-      recipients: {
-        where: {
-          id: {
-            in: recipients,
-          },
-          signingStatus: SigningStatus.NOT_SIGNED,
-        },
-      },
+      recipients: true,
       documentMeta: true,
       team: {
         select: {
@@ -90,6 +83,11 @@ export const resendDocument = async ({
     throw new Error('Can not send completed document');
   }
 
+  const recipientsToRemind = document.recipients.filter(
+    (recipient) =>
+      recipients.includes(recipient.id) && recipient.signingStatus === SigningStatus.NOT_SIGNED,
+  );
+
   const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
     document.documentMeta,
   ).recipientSigningRequest;
@@ -106,7 +104,7 @@ export const resendDocument = async ({
   });
 
   await Promise.all(
-    document.recipients.map(async (recipient) => {
+    recipientsToRemind.map(async (recipient) => {
       if (recipient.role === RecipientRole.CC) {
         return;
       }