From 00a7389af31e7e8f12851036b1670708d94deede Mon Sep 17 00:00:00 2001
From: Catalin Pit <25515812+catalinpit@users.noreply.github.com>
Date: Wed, 28 Feb 2024 08:10:38 +0200
Subject: [PATCH] chore: implemented feedback

---
 .../public-api/test-credentials.ts            |  2 +-
 .../webhooks/zapier/list-documents.ts         | 24 ++++++++++---------
 .../server-only/webhooks/zapier/subscribe.ts  |  4 ++--
 .../webhooks/zapier/unsubscribe.ts            |  4 ++--
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/lib/server-only/public-api/test-credentials.ts b/packages/lib/server-only/public-api/test-credentials.ts
index debbf9836..2e20d79c4 100644
--- a/packages/lib/server-only/public-api/test-credentials.ts
+++ b/packages/lib/server-only/public-api/test-credentials.ts
@@ -9,7 +9,7 @@ export const testCredentialsHandler = async (req: NextApiRequest, res: NextApiRe
     const result = await validateApiToken({ authorization });
 
     return res.status(200).json({
-      name: result.userId ? result.user.name : result.team?.name,
+      name: result.team?.name ?? result.user.name,
     });
   } catch (err) {
     return res.status(500).json({
diff --git a/packages/lib/server-only/webhooks/zapier/list-documents.ts b/packages/lib/server-only/webhooks/zapier/list-documents.ts
index 433b58d5b..56649fac8 100644
--- a/packages/lib/server-only/webhooks/zapier/list-documents.ts
+++ b/packages/lib/server-only/webhooks/zapier/list-documents.ts
@@ -2,7 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 
 import { findDocuments } from '@documenso/lib/server-only/document/find-documents';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
-import type { Recipient, Webhook } from '@documenso/prisma/client';
+import type { Webhook } from '@documenso/prisma/client';
 
 import { getWebhooksByTeamId } from '../get-webhooks-by-team-id';
 import { getWebhooksByUserId } from '../get-webhooks-by-user-id';
@@ -14,23 +14,25 @@ export const listDocumentsHandler = async (req: NextApiRequest, res: NextApiResp
     const { user, userId, teamId } = await validateApiToken({ authorization });
 
     let allWebhooks: Webhook[] = [];
-    let documents;
-    let recipients: Recipient[] = [];
+
+    const documents = await findDocuments({
+      userId: userId ?? user.id,
+      teamId: teamId ?? undefined,
+      perPage: 1,
+    });
+
+    const recipients = await getRecipientsForDocument({
+      documentId: documents.data[0].id,
+      userId: userId ?? user.id,
+      teamId: teamId ?? undefined,
+    });
 
     if (userId) {
-      documents = await findDocuments({ userId });
       allWebhooks = await getWebhooksByUserId(userId);
-      recipients = await getRecipientsForDocument({ documentId: documents.data[0].id, userId });
     }
 
     if (teamId) {
-      documents = await findDocuments({ userId: user.id, teamId });
       allWebhooks = await getWebhooksByTeamId(teamId, user.id);
-      recipients = await getRecipientsForDocument({
-        documentId: documents.data[0].id,
-        userId: user.id,
-        teamId,
-      });
     }
 
     if (documents && documents.data.length > 0 && allWebhooks.length > 0 && recipients.length > 0) {
diff --git a/packages/lib/server-only/webhooks/zapier/subscribe.ts b/packages/lib/server-only/webhooks/zapier/subscribe.ts
index 0a5863ba7..90c68e063 100644
--- a/packages/lib/server-only/webhooks/zapier/subscribe.ts
+++ b/packages/lib/server-only/webhooks/zapier/subscribe.ts
@@ -18,8 +18,8 @@ export const subscribeHandler = async (req: NextApiRequest, res: NextApiResponse
         eventTriggers: [eventTrigger],
         secret: null,
         enabled: true,
-        userId: result.userId ? result.userId : result.user.id,
-        teamId: result.userId ? undefined : result.teamId,
+        userId: result.userId ?? result.user.id,
+        teamId: result.teamId ?? undefined,
       },
     });
 
diff --git a/packages/lib/server-only/webhooks/zapier/unsubscribe.ts b/packages/lib/server-only/webhooks/zapier/unsubscribe.ts
index 9de419005..07fa75e11 100644
--- a/packages/lib/server-only/webhooks/zapier/unsubscribe.ts
+++ b/packages/lib/server-only/webhooks/zapier/unsubscribe.ts
@@ -15,8 +15,8 @@ export const unsubscribeHandler = async (req: NextApiRequest, res: NextApiRespon
     const deletedWebhook = await prisma.webhook.delete({
       where: {
         id: webhookId,
-        userId: result.userId ? result.userId : result.user.id,
-        teamId: result.userId ? undefined : result.teamId,
+        userId: result.userId ?? result.user.id,
+        teamId: result.teamId ?? undefined,
       },
     });