diff --git a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts index 0e92529ea628af..f25589cd57bf35 100644 --- a/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts +++ b/packages/app-store/routing-forms/playwright/tests/basic.e2e.ts @@ -325,14 +325,15 @@ test.describe("Routing Forms", () => { // TODO: Find a way to incorporate Routed To and Booked At into the report // @see https://github.com/calcom/cal.com/pull/17229 "Routed To", + "Assignment Reason", "Booked At", "Submitted At", ]); /* Last two columns are "Routed To" and "Booked At" */ expect(responses).toEqual([ - ["custom-page", "Option-2", "Option-2", "Option-2", "Option-2", "", "", expect.any(String)], - ["external-redirect", "Option-2", "Option-2", "Option-2", "Option-2", "", "", expect.any(String)], - ["event-routing", "Option-2", "Option-2", "Option-2", "Option-2", "", "", expect.any(String)], + ["custom-page", "Option-2", "Option-2", "Option-2", "Option-2", "", "", "", expect.any(String)], + ["external-redirect", "Option-2", "Option-2", "Option-2", "Option-2", "", "", "", expect.any(String)], + ["event-routing", "Option-2", "Option-2", "Option-2", "Option-2", "", "", "", expect.any(String)], ]); await page.goto(`apps/routing-forms/route-builder/${routingForm.id}`); diff --git a/packages/app-store/routing-forms/trpc/report.handler.ts b/packages/app-store/routing-forms/trpc/report.handler.ts index a88a995ec9ca46..4cd7adf96850e5 100644 --- a/packages/app-store/routing-forms/trpc/report.handler.ts +++ b/packages/app-store/routing-forms/trpc/report.handler.ts @@ -58,6 +58,12 @@ const getRows = async ({ ctx: { prisma }, input }: ReportHandlerOptions) => { user: { select: { id: true, name: true, email: true }, }, + assignmentReason: { + orderBy: { + createdAt: "desc", + }, + take: 1, + }, }, }, }, @@ -123,12 +129,13 @@ function presenter(args: { const formatDate = makeFormatDate(ctx.user.locale, ctx.user.timeZone); return { nextCursor, - headers: [...headers, "Routed To", "Booked At", "Submitted At"], + headers: [...headers, "Routed To", "Assignment Reason", "Booked At", "Submitted At"], responses: responses.map((r, i) => { const currentRow = rows[i]; return [ ...r, currentRow.routedToBooking?.user?.email || "", + currentRow.routedToBooking?.assignmentReason[0].reasonString || "", currentRow.routedToBooking?.createdAt ? formatDate(currentRow.routedToBooking.createdAt) : "", formatDate(currentRow.createdAt), ];