📈 Include pollId when capturing events (#555)

apps/web/src/components/create-poll.tsx

@@ -93,6 +93,7 @@ const Page: React.FunctionComponent<CreatePollPageProps> = ({
     onSuccess: (res) => {
       setIsRedirecting(true);
       posthog.capture("created poll", {
+        pollId: res.id,
         numberOfOptions: formData.options?.options?.length,
         optionsView: formData?.options?.view,
       });

apps/web/src/components/poll/mutations.ts

@@ -15,8 +15,9 @@ export const normalizeVotes = (
 
 export const useAddParticipantMutation = () => {
   return trpc.polls.participants.add.useMutation({
-    onSuccess: (_, { name }) => {
+    onSuccess: (_, { pollId, name }) => {
       posthog.capture("add participant", {
+        pollId,
         name,
       });
     },
@@ -61,8 +62,9 @@ export const useDeleteParticipantMutation = () => {
         },
       );
     },
-    onSuccess: (_, { participantId }) => {
+    onSuccess: (_, { pollId, participantId }) => {
       posthog.capture("remove participant", {
+        pollId,
         participantId,
       });
     },

apps/web/src/server/routers/polls.ts

@@ -94,73 +94,80 @@ export const polls = router({
         demo: z.boolean().optional(),
       }),
     )
-    .mutation(async ({ ctx, input }): Promise<{ urlId: string }> => {
+    .mutation(
-      const adminUrlId = await nanoid();
+      async ({ ctx, input }): Promise<{ id: string; urlId: string }> => {
-      const participantUrlId = await nanoid();
+        const adminUrlId = await nanoid();
-      let verified = false;
+        const participantUrlId = await nanoid();
+        let verified = false;
 
-      if (ctx.session.user.isGuest === false) {
+        if (ctx.session.user.isGuest === false) {
-        const user = await prisma.user.findUnique({
+          const user = await prisma.user.findUnique({
-          where: { id: ctx.session.user.id },
+            where: { id: ctx.session.user.id },
+          });
+
+          // If user is logged in with the same email address
+          if (user?.email === input.user.email) {
+            verified = true;
+          }
+        }
+
+        const poll = await prisma.poll.create({
+          select: {
+            adminUrlId: true,
+            id: true,
+            title: true,
+          },
+          data: {
+            id: await nanoid(),
+            title: input.title,
+            type: input.type,
+            timeZone: input.timeZone,
+            location: input.location,
+            description: input.description,
+            authorName: input.user.name,
+            demo: input.demo,
+            verified: verified,
+            notifications: verified,
+            adminUrlId,
+            participantUrlId,
+            user: {
+              connectOrCreate: {
+                where: {
+                  email: input.user.email,
+                },
+                create: {
+                  id: await nanoid(),
+                  ...input.user,
+                },
+              },
+            },
+            options: {
+              createMany: {
+                data: input.options.map((value) => ({
+                  value,
+                })),
+              },
+            },
+          },
         });
 
-        // If user is logged in with the same email address
+        const adminLink = absoluteUrl(`/admin/${adminUrlId}`);
-        if (user?.email === input.user.email) {
+        const participantLink = absoluteUrl(`/p/${participantUrlId}`);
-          verified = true;
-        }
-      }
 
-      const poll = await prisma.poll.create({
+        await sendEmail("NewPollEmail", {
-        data: {
+          to: input.user.email,
-          id: await nanoid(),
+          subject: `Let's find a date for ${poll.title}`,
-          title: input.title,
+          props: {
-          type: input.type,
+            title: poll.title,
-          timeZone: input.timeZone,
+            name: input.user.name,
-          location: input.location,
+            adminLink,
-          description: input.description,
+            participantLink,
-          authorName: input.user.name,
-          demo: input.demo,
-          verified: verified,
-          notifications: verified,
-          adminUrlId,
-          participantUrlId,
-          user: {
-            connectOrCreate: {
-              where: {
-                email: input.user.email,
-              },
-              create: {
-                id: await nanoid(),
-                ...input.user,
-              },
-            },
           },
-          options: {
+        });
-            createMany: {
-              data: input.options.map((value) => ({
-                value,
-              })),
-            },
-          },
-        },
-      });
 
-      const adminLink = absoluteUrl(`/admin/${adminUrlId}`);
+        return { id: poll.id, urlId: adminUrlId };
-      const participantLink = absoluteUrl(`/p/${participantUrlId}`);
+      },
-
+    ),
-      await sendEmail("NewPollEmail", {
-        to: input.user.email,
-        subject: `Let's find a date for ${poll.title}`,
-        props: {
-          title: poll.title,
-          name: input.user.name,
-          adminLink,
-          participantLink,
-        },
-      });
-
-      return { urlId: adminUrlId };
-    }),
   update: publicProcedure
     .input(
       z.object({