🗃️ Write faster prisma queries

baptisteArno · Dec 8, 2022 · 7eac2c7 · 7eac2c7 · vercel · Dec 8, 2022
1 parent fe8a531
commit 7eac2c7
Show file tree

Hide file tree

Showing 23 changed files with 235 additions and 134 deletions.
diff --git a/...lder/src/features/blocks/integrations/webhook/api/procedures/getResultExampleProcedure.ts b/...lder/src/features/blocks/integrations/webhook/api/procedures/getResultExampleProcedure.ts
@@ -1,6 +1,6 @@
 import { getLinkedTypebots } from '@/features/blocks/logic/typebotLink/api'
 import prisma from '@/lib/prisma'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, Webhook } from 'models'
@@ -40,7 +40,7 @@ export const getResultExampleProcedure = authenticatedProcedure
   )
   .query(async ({ input: { typebotId, blockId }, ctx: { user } }) => {
     const typebot = (await prisma.typebot.findFirst({
-      where: canReadTypebot(typebotId, user),
+      where: canReadTypebots(typebotId, user),
       select: {
         groups: true,
         edges: true,

diff --git a/...der/src/features/blocks/integrations/webhook/api/procedures/listWebhookBlocksProcedure.ts b/...der/src/features/blocks/integrations/webhook/api/procedures/listWebhookBlocksProcedure.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Group, Typebot, Webhook, WebhookBlock } from 'models'
@@ -36,7 +36,7 @@ export const listWebhookBlocksProcedure = authenticatedProcedure
   )
   .query(async ({ input: { typebotId }, ctx: { user } }) => {
     const typebot = (await prisma.typebot.findFirst({
-      where: canReadTypebot(typebotId, user),
+      where: canReadTypebots(typebotId, user),
       select: {
         groups: true,
         webhooks: true,

diff --git a/...lder/src/features/blocks/integrations/webhook/api/procedures/subscribeWebhookProcedure.ts b/...lder/src/features/blocks/integrations/webhook/api/procedures/subscribeWebhookProcedure.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canWriteTypebot } from '@/utils/api/dbRules'
+import { canWriteTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, Webhook, WebhookBlock } from 'models'
@@ -31,7 +31,7 @@ export const subscribeWebhookProcedure = authenticatedProcedure
   )
   .query(async ({ input: { typebotId, blockId, url }, ctx: { user } }) => {
     const typebot = (await prisma.typebot.findFirst({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
       select: {
         groups: true,
         webhooks: true,

diff --git a/...er/src/features/blocks/integrations/webhook/api/procedures/unsubscribeWebhookProcedure.ts b/...er/src/features/blocks/integrations/webhook/api/procedures/unsubscribeWebhookProcedure.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canWriteTypebot } from '@/utils/api/dbRules'
+import { canWriteTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, Webhook, WebhookBlock } from 'models'
@@ -30,7 +30,7 @@ export const unsubscribeWebhookProcedure = authenticatedProcedure
   )
   .query(async ({ input: { typebotId, blockId }, ctx: { user } }) => {
     const typebot = (await prisma.typebot.findFirst({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
       select: {
         groups: true,
         webhooks: true,

diff --git a/apps/builder/src/features/results/api/archiveResults.ts b/apps/builder/src/features/results/api/archiveResults.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canWriteTypebot } from '@/utils/api/dbRules'
+import { canWriteTypebots } from '@/utils/api/dbRules'
 import { deleteFiles } from '@/utils/api/storage'
 import { User, Prisma } from 'db'
 import { InputBlockType, Typebot } from 'models'
@@ -14,7 +14,7 @@ export const archiveResults = async ({
   resultsFilter?: Prisma.ResultWhereInput
 }) => {
   const typebot = await prisma.typebot.findFirst({
-    where: canWriteTypebot(typebotId, user),
+    where: canWriteTypebots(typebotId, user),
     select: { groups: true },
   })
   if (!typebot) return { success: false }

diff --git a/apps/builder/src/features/results/api/procedures/deleteResultsProcedure.ts b/apps/builder/src/features/results/api/procedures/deleteResultsProcedure.ts
@@ -1,4 +1,4 @@
-import { canWriteTypebot } from '@/utils/api/dbRules'
+import { canWriteTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
@@ -34,7 +34,7 @@ export const deleteResultsProcedure = authenticatedProcedure
       user,
       resultsFilter: {
         id: (idsArray?.length ?? 0) > 0 ? { in: idsArray } : undefined,
-        typebot: canWriteTypebot(typebotId, user),
+        typebot: canWriteTypebots(typebotId, user),
       },
     })
 

diff --git a/apps/builder/src/features/results/api/procedures/getResultLogsProcedure.ts b/apps/builder/src/features/results/api/procedures/getResultLogsProcedure.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { logSchema } from 'models'
 import { z } from 'zod'
@@ -22,9 +22,14 @@ export const getResultLogsProcedure = authenticatedProcedure
   )
   .output(z.object({ logs: z.array(logSchema) }))
   .query(async ({ input: { typebotId, resultId }, ctx: { user } }) => {
+    const typebot = await prisma.typebot.findFirst({
+      where: canReadTypebots(typebotId, user),
+      select: { id: true },
+    })
+    if (!typebot) throw new Error('Typebot not found')
     const logs = await prisma.log.findMany({
       where: {
-        result: { id: resultId, typebot: canReadTypebot(typebotId, user) },
+        result: { id: resultId, typebotId: typebot.id },
       },
     })
 

diff --git a/apps/builder/src/features/results/api/procedures/getResultsProcedure.ts b/apps/builder/src/features/results/api/procedures/getResultsProcedure.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { authenticatedProcedure } from '@/utils/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ResultWithAnswers, resultWithAnswersSchema } from 'models'
@@ -38,11 +38,17 @@ export const getResultsProcedure = authenticatedProcedure
         message: 'limit must be between 1 and 200',
       })
     const { cursor } = input
+    const typebot = await prisma.typebot.findFirst({
+      where: canReadTypebots(input.typebotId, user),
+      select: { id: true },
+    })
+    if (!typebot)
+      throw new TRPCError({ code: 'NOT_FOUND', message: 'Typebot not found' })
     const results = (await prisma.result.findMany({
       take: limit + 1,
       cursor: cursor ? { id: cursor } : undefined,
       where: {
-        typebot: canReadTypebot(input.typebotId, user),
+        typebotId: typebot.id,
         answers: { some: {} },
       },
       orderBy: {

diff --git a/apps/builder/src/pages/api/publicTypebots/[id].ts b/apps/builder/src/pages/api/publicTypebots/[id].ts
@@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs'
 import prisma from '@/lib/prisma'
 import { InputBlockType, PublicTypebot } from 'models'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canPublishFileInput, canWriteTypebot } from '@/utils/api/dbRules'
+import { canPublishFileInput, canWriteTypebots } from '@/utils/api/dbRules'
 import { getAuthenticatedUser } from '@/features/auth/api'
 import { badRequest, methodNotAllowed, notAuthenticated } from 'utils/api'
 
@@ -39,7 +39,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     await prisma.publicTypebot.deleteMany({
       where: {
         id: publishedTypebotId,
-        typebot: canWriteTypebot(typebotId, user),
+        typebot: canWriteTypebots(typebotId, user),
       },
     })
     return res.send({ success: true })

diff --git a/apps/builder/src/pages/api/typebots/[typebotId].ts b/apps/builder/src/pages/api/typebots/[typebotId].ts
@@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs'
 import { CollaborationType } from 'db'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebot, canWriteTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots, canWriteTypebots } from '@/utils/api/dbRules'
 import { methodNotAllowed, notAuthenticated } from 'utils/api'
 import { getAuthenticatedUser } from '@/features/auth/api'
 import { archiveResults } from '@/features/results/api'
@@ -15,7 +15,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'GET') {
     const typebot = await prisma.typebot.findFirst({
       where: {
-        ...canReadTypebot(typebotId, user),
+        ...canReadTypebots(typebotId, user),
         isArchived: { not: true },
       },
       include: {
@@ -46,26 +46,27 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     })
     if (!success) return res.status(500).send({ success: false })
     await prisma.publicTypebot.deleteMany({
-      where: { typebot: canWriteTypebot(typebotId, user) },
+      where: { typebot: canWriteTypebots(typebotId, user) },
     })
     const typebots = await prisma.typebot.updateMany({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
       data: { isArchived: true },
     })
     return res.send({ typebots })
   }
   if (req.method === 'PUT') {
     const data = typeof req.body === 'string' ? JSON.parse(req.body) : req.body
     const existingTypebot = await prisma.typebot.findFirst({
-      where: canReadTypebot(typebotId, user),
+      where: canReadTypebots(typebotId, user),
+      select: { updatedAt: true },
     })
     if (
       existingTypebot &&
       existingTypebot?.updatedAt > new Date(data.updatedAt)
     )
       return res.send({ message: 'Found newer version of typebot in database' })
     const typebots = await prisma.typebot.updateMany({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
       data: {
         ...data,
         theme: data.theme ?? undefined,
@@ -78,7 +79,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'PATCH') {
     const data = typeof req.body === 'string' ? JSON.parse(req.body) : req.body
     const typebots = await prisma.typebot.updateMany({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
       data,
     })
     return res.send({ typebots })

diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/analytics/answersCount.ts b/apps/builder/src/pages/api/typebots/[typebotId]/analytics/answersCount.ts
@@ -4,16 +4,16 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { methodNotAllowed, notAuthenticated } from 'utils/api'
 import { withSentry } from '@sentry/nextjs'
 import { getAuthenticatedUser } from '@/features/auth/api'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
   if (!user) return notAuthenticated(res)
   if (req.method === 'GET') {
     const typebotId = req.query.typebotId as string
     const typebot = await prisma.typebot.findFirst({
-      where: canReadTypebot(typebotId, user),
-      include: { publishedTypebot: true },
+      where: canReadTypebots(typebotId, user),
+      select: { publishedTypebot: true },
     })
     const publishedTypebot =
       typebot?.publishedTypebot as unknown as PublicTypebot

diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts b/apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts
@@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs'
 import prisma from '@/lib/prisma'
 import { Stats } from 'models'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { getAuthenticatedUser } from '@/features/auth/api'
 import { methodNotAllowed, notAuthenticated } from 'utils/api'
 
@@ -12,23 +12,27 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'GET') {
     const typebotId = req.query.typebotId as string
 
+    const typebot = await prisma.typebot.findFirst({
+      where: canReadTypebots(typebotId, user),
+      select: { id: true },
+    })
+
+    if (!typebot) return res.status(404).send({ message: 'Typebot not found' })
+
     const totalViews = await prisma.result.count({
       where: {
-        typebotId,
-        typebot: canReadTypebot(typebotId, user),
+        typebotId: typebot.id,
       },
     })
     const totalStarts = await prisma.result.count({
       where: {
-        typebotId,
-        typebot: canReadTypebot(typebotId, user),
+        typebotId: typebot.id,
         answers: { some: {} },
       },
     })
     const totalCompleted = await prisma.result.count({
       where: {
-        typebotId,
-        typebot: canReadTypebot(typebotId, user),
+        typebotId: typebot.id,
         isCompleted: true,
       },
     })

diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts b/apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts
@@ -1,7 +1,7 @@
 import { withSentry } from '@sentry/nextjs'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { getAuthenticatedUser } from '@/features/auth/api'
 import { methodNotAllowed, notAuthenticated, notFound } from 'utils/api'
 
@@ -11,7 +11,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'GET') {
     const typebotId = req.query.typebotId as string
     const typebot = await prisma.typebot.findFirst({
-      where: canReadTypebot(typebotId, user),
+      where: canReadTypebots(typebotId, user),
+      select: { groups: true },
     })
     if (!typebot) return notFound(res)
     return res.send({ groups: typebot.groups })

diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts b/apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts
@@ -1,7 +1,7 @@
 import { withSentry } from '@sentry/nextjs'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/utils/api/dbRules'
 import { getAuthenticatedUser } from '@/features/auth/api'
 import { methodNotAllowed, notAuthenticated } from 'utils/api'
 
@@ -11,7 +11,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const typebotId = req.query.typebotId as string
   if (req.method === 'GET') {
     const collaborators = await prisma.collaboratorsOnTypebots.findMany({
-      where: { typebot: canReadTypebot(typebotId, user) },
+      where: { typebot: canReadTypebots(typebotId, user) },
       include: { user: { select: { name: true, image: true, email: true } } },
     })
     return res.send({

diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts b/apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts
@@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs'
 import { CollaborationType, WorkspaceRole } from 'db'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebot, canWriteTypebot } from '@/utils/api/dbRules'
+import { canReadTypebots, canWriteTypebots } from '@/utils/api/dbRules'
 import {
   badRequest,
   forbidden,
@@ -19,15 +19,15 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const typebotId = req.query.typebotId as string
   if (req.method === 'GET') {
     const invitations = await prisma.invitation.findMany({
-      where: { typebotId, typebot: canReadTypebot(typebotId, user) },
+      where: { typebotId, typebot: canReadTypebots(typebotId, user) },
     })
     return res.send({
       invitations,
     })
   }
   if (req.method === 'POST') {
     const typebot = await prisma.typebot.findFirst({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
       include: { workspace: { select: { name: true } } },
     })
     if (!typebot || !typebot.workspaceId) return forbidden(res)

diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/webhooks.ts b/apps/builder/src/pages/api/typebots/[typebotId]/webhooks.ts
@@ -2,7 +2,7 @@ import { withSentry } from '@sentry/nextjs'
 import prisma from '@/lib/prisma'
 import { defaultWebhookAttributes } from 'models'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canWriteTypebot } from '@/utils/api/dbRules'
+import { canWriteTypebots } from '@/utils/api/dbRules'
 import { getAuthenticatedUser } from '@/features/auth/api'
 import { forbidden, methodNotAllowed, notAuthenticated } from 'utils/api'
 
@@ -12,7 +12,8 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === 'POST') {
     const typebotId = req.query.typebotId as string
     const typebot = await prisma.typebot.findFirst({
-      where: canWriteTypebot(typebotId, user),
+      where: canWriteTypebots(typebotId, user),
+      select: { id: true },
     })
     if (!typebot) return forbidden(res)
     const webhook = await prisma.webhook.create({