🐛 (analytics) Fix multi usage query timeout

baptisteArno · Oct 17, 2022 · 9cb7f8c · 9cb7f8c
1 parent 020a37c
commit 9cb7f8c
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 83 deletions.
diff --git a/apps/builder/components/shared/Graph/Edges/Edges.tsx b/apps/builder/components/shared/Graph/Edges/Edges.tsx
@@ -16,74 +16,72 @@ export const Edges = ({
   edges,
   answersCounts,
   onUnlockProPlanClick,
-}: Props) => {
-  return (
-    <chakra.svg
-      width="full"
-      height="full"
-      overflow="visible"
-      pos="absolute"
-      left="0"
-      top="0"
-      shapeRendering="geometricPrecision"
+}: Props) => (
+  <chakra.svg
+    width="full"
+    height="full"
+    overflow="visible"
+    pos="absolute"
+    left="0"
+    top="0"
+    shapeRendering="geometricPrecision"
+  >
+    <DrawingEdge />
+    {edges.map((edge) => (
+      <Edge key={edge.id} edge={edge} />
+    ))}
+    {answersCounts?.map((answerCount) => (
+      <DropOffEdge
+        key={answerCount.groupId}
+        answersCounts={answersCounts}
+        groupId={answerCount.groupId}
+        onUnlockProPlanClick={onUnlockProPlanClick}
+      />
+    ))}
+    <marker
+      id={'arrow'}
+      refX="8"
+      refY="4"
+      orient="auto"
+      viewBox="0 0 20 20"
+      markerUnits="userSpaceOnUse"
+      markerWidth="20"
+      markerHeight="20"
     >
-      <DrawingEdge />
-      {edges.map((edge) => (
-        <Edge key={edge.id} edge={edge} />
-      ))}
-      {answersCounts?.slice(1)?.map((answerCount) => (
-        <DropOffEdge
-          key={answerCount.groupId}
-          answersCounts={answersCounts}
-          groupId={answerCount.groupId}
-          onUnlockProPlanClick={onUnlockProPlanClick}
-        />
-      ))}
-      <marker
-        id={'arrow'}
-        refX="8"
-        refY="4"
-        orient="auto"
-        viewBox="0 0 20 20"
-        markerUnits="userSpaceOnUse"
-        markerWidth="20"
-        markerHeight="20"
-      >
-        <path
-          d="M7.07138888,5.50174526 L2.43017246,7.82235347 C1.60067988,8.23709976 0.592024983,7.90088146 0.177278692,7.07138888 C0.0606951226,6.83822174 0,6.58111307 0,6.32042429 L0,1.67920787 C0,0.751806973 0.751806973,0 1.67920787,0 C1.93989666,0 2.19700532,0.0606951226 2.43017246,0.177278692 L7,3 C7.82949258,3.41474629 8.23709976,3.92128809 7.82235347,4.75078067 C7.6598671,5.07575341 7.39636161,5.33925889 7.07138888,5.50174526 Z"
-          fill={colors.gray[400]}
-        />
-      </marker>
-      <marker
-        id={'blue-arrow'}
-        refX="8"
-        refY="4"
-        orient="auto"
-        viewBox="0 0 20 20"
-        markerUnits="userSpaceOnUse"
-        markerWidth="20"
-        markerHeight="20"
-      >
-        <path
-          d="M7.07138888,5.50174526 L2.43017246,7.82235347 C1.60067988,8.23709976 0.592024983,7.90088146 0.177278692,7.07138888 C0.0606951226,6.83822174 0,6.58111307 0,6.32042429 L0,1.67920787 C0,0.751806973 0.751806973,0 1.67920787,0 C1.93989666,0 2.19700532,0.0606951226 2.43017246,0.177278692 L7,3 C7.82949258,3.41474629 8.23709976,3.92128809 7.82235347,4.75078067 C7.6598671,5.07575341 7.39636161,5.33925889 7.07138888,5.50174526 Z"
-          fill={colors.blue[400]}
-        />
-      </marker>
-      <marker
-        id={'red-arrow'}
-        refX="8"
-        refY="4"
-        orient="auto"
-        viewBox="0 0 20 20"
-        markerUnits="userSpaceOnUse"
-        markerWidth="20"
-        markerHeight="20"
-      >
-        <path
-          d="M7.07138888,5.50174526 L2.43017246,7.82235347 C1.60067988,8.23709976 0.592024983,7.90088146 0.177278692,7.07138888 C0.0606951226,6.83822174 0,6.58111307 0,6.32042429 L0,1.67920787 C0,0.751806973 0.751806973,0 1.67920787,0 C1.93989666,0 2.19700532,0.0606951226 2.43017246,0.177278692 L7,3 C7.82949258,3.41474629 8.23709976,3.92128809 7.82235347,4.75078067 C7.6598671,5.07575341 7.39636161,5.33925889 7.07138888,5.50174526 Z"
-          fill="#e53e3e"
-        />
-      </marker>
-    </chakra.svg>
-  )
-}
+      <path
+        d="M7.07138888,5.50174526 L2.43017246,7.82235347 C1.60067988,8.23709976 0.592024983,7.90088146 0.177278692,7.07138888 C0.0606951226,6.83822174 0,6.58111307 0,6.32042429 L0,1.67920787 C0,0.751806973 0.751806973,0 1.67920787,0 C1.93989666,0 2.19700532,0.0606951226 2.43017246,0.177278692 L7,3 C7.82949258,3.41474629 8.23709976,3.92128809 7.82235347,4.75078067 C7.6598671,5.07575341 7.39636161,5.33925889 7.07138888,5.50174526 Z"
+        fill={colors.gray[400]}
+      />
+    </marker>
+    <marker
+      id={'blue-arrow'}
+      refX="8"
+      refY="4"
+      orient="auto"
+      viewBox="0 0 20 20"
+      markerUnits="userSpaceOnUse"
+      markerWidth="20"
+      markerHeight="20"
+    >
+      <path
+        d="M7.07138888,5.50174526 L2.43017246,7.82235347 C1.60067988,8.23709976 0.592024983,7.90088146 0.177278692,7.07138888 C0.0606951226,6.83822174 0,6.58111307 0,6.32042429 L0,1.67920787 C0,0.751806973 0.751806973,0 1.67920787,0 C1.93989666,0 2.19700532,0.0606951226 2.43017246,0.177278692 L7,3 C7.82949258,3.41474629 8.23709976,3.92128809 7.82235347,4.75078067 C7.6598671,5.07575341 7.39636161,5.33925889 7.07138888,5.50174526 Z"
+        fill={colors.blue[400]}
+      />
+    </marker>
+    <marker
+      id={'red-arrow'}
+      refX="8"
+      refY="4"
+      orient="auto"
+      viewBox="0 0 20 20"
+      markerUnits="userSpaceOnUse"
+      markerWidth="20"
+      markerHeight="20"
+    >
+      <path
+        d="M7.07138888,5.50174526 L2.43017246,7.82235347 C1.60067988,8.23709976 0.592024983,7.90088146 0.177278692,7.07138888 C0.0606951226,6.83822174 0,6.58111307 0,6.32042429 L0,1.67920787 C0,0.751806973 0.751806973,0 1.67920787,0 C1.93989666,0 2.19700532,0.0606951226 2.43017246,0.177278692 L7,3 C7.82949258,3.41474629 8.23709976,3.92128809 7.82235347,4.75078067 C7.6598671,5.07575341 7.39636161,5.33925889 7.07138888,5.50174526 Z"
+        fill="#e53e3e"
+      />
+    </marker>
+  </chakra.svg>
+)
diff --git a/apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts b/apps/builder/pages/api/typebots/[typebotId]/results/answers/count.ts
@@ -15,19 +15,22 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       where: canReadTypebot(typebotId, user),
       include: { publishedTypebot: true },
     })
-    if (!typebot) return res.status(404).send({ answersCounts: [] })
-    const answersCounts: { groupId: string; totalAnswers: number }[] =
-      await Promise.all(
-        (typebot.publishedTypebot as unknown as PublicTypebot).groups.map(
-          async (group) => {
-            const totalAnswers = await prisma.answer.count({
-              where: { groupId: group.id },
-            })
-            return { groupId: group.id, totalAnswers }
-          }
-        )
-      )
-    return res.status(200).send({ answersCounts })
+    const publishedTypebot =
+      typebot?.publishedTypebot as unknown as PublicTypebot
+    if (!publishedTypebot) return res.status(404).send({ answersCounts: [] })
+    const answersCounts = await prisma.answer.groupBy({
+      by: ['groupId'],
+      where: {
+        groupId: { in: publishedTypebot.groups.map((g) => g.id) },
+      },
+      _count: { _all: true },
+    })
+    return res.status(200).send({
+      answersCounts: answersCounts.map((answer) => ({
+        groupId: answer.groupId,
+        totalAnswers: answer._count._all,
+      })),
+    })
   }
   return methodNotAllowed(res)
 }