chore: App router migration (org/[orgSlug]/instant-meeting), add missing page (#16448)

* Create event repository

* Use repository in event.handler

* fix type check

* migrate org/instant-meeting

* add export default

* fix metadata

* move getServerSideProps from @server/lib to @lib

* fix

* fix

* revert unneeded changes

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

apps/web/app/future/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx

@@ -0,0 +1,42 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps as _PageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+import { headers, cookies } from "next/headers";
+
+import { getLayout } from "@calcom/features/MainLayoutAppDir";
+import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
+import { EventRepository } from "@calcom/lib/server/repository/event";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";
+
+import type { PageProps } from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";
+import Page from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";
+
+export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
+  const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
+  const { slug: eventSlug, user: username } = await getData(context);
+  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);
+
+  const org = isValidOrgDomain ? currentOrgDomain : null;
+
+  const event = await EventRepository.getPublicEvent({
+    username,
+    eventSlug,
+    isTeamEvent: true,
+    org,
+    fromRedirectOfNonOrgLink: context.query.orgRedirection === "true",
+  });
+
+  const profileName = event?.profile.name ?? "";
+  const title = event?.title ?? "";
+
+  return await _generateMetadata(
+    () => `${title} | ${profileName}`,
+    () => `${title}`
+  );
+};
+
+const getData = withAppDirSsr<PageProps>(getServerSideProps);
+export default WithLayout({ getLayout, getData, Page })<"P">;

apps/web/lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps.ts

@@ -0,0 +1,73 @@
+import type { GetServerSidePropsContext } from "next";
+import { z } from "zod";
+
+import { getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking";
+import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains";
+import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
+import slugify from "@calcom/lib/slugify";
+import prisma from "@calcom/prisma";
+
+const paramsSchema = z.object({
+  type: z.string().transform((s) => slugify(s)),
+  slug: z.string().transform((s) => slugify(s)),
+});
+
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
+  const { slug: teamSlug, type: meetingSlug } = paramsSchema.parse(context.params);
+  const { duration: queryDuration } = context.query;
+
+  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);
+
+  const team = await prisma.team.findFirst({
+    where: {
+      ...getSlugOrRequestedSlug(teamSlug),
+      parent: isValidOrgDomain && currentOrgDomain ? getSlugOrRequestedSlug(currentOrgDomain) : null,
+    },
+    select: {
+      id: true,
+      hideBranding: true,
+    },
+  });
+
+  if (!team) {
+    return {
+      notFound: true,
+    } as const;
+  }
+
+  const org = isValidOrgDomain ? currentOrgDomain : null;
+
+  const { ssrInit } = await import("@server/lib/ssr");
+  const ssr = await ssrInit(context);
+  const eventData = await ssr.viewer.public.event.fetch({
+    username: teamSlug,
+    eventSlug: meetingSlug,
+    isTeamEvent: true,
+    org,
+    fromRedirectOfNonOrgLink: context.query.orgRedirection === "true",
+  });
+
+  if (!eventData || !org) {
+    return {
+      notFound: true,
+    } as const;
+  }
+
+  return {
+    props: {
+      entity: eventData.entity,
+      duration: getMultipleDurationValue(
+        eventData.metadata?.multipleDuration,
+        queryDuration,
+        eventData.length
+      ),
+      booking: null,
+      user: teamSlug,
+      teamId: team.id,
+      slug: meetingSlug,
+      trpcState: ssr.dehydrate(),
+      isBrandingHidden: team?.hideBranding,
+      themeBasis: null,
+    },
+  };
+};

apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx

@@ -0,0 +1,41 @@
+"use client";
+
+import { Booker } from "@calcom/atoms/monorepo";
+import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
+import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
+
+import type { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";
+import type { inferSSRProps } from "@lib/types/inferSSRProps";
+import type { EmbedProps } from "@lib/withEmbedSsr";
+
+export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;
+
+function Type({ slug, user, booking, isEmbed, isBrandingHidden, entity, duration }: PageProps) {
+  return (
+    <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>
+      <BookerSeo
+        username={user}
+        eventSlug={slug}
+        rescheduleUid={undefined}
+        hideBranding={isBrandingHidden}
+        isTeamEvent
+        entity={entity}
+        bookingData={booking}
+      />
+      <Booker
+        username={user}
+        eventSlug={slug}
+        bookingData={booking}
+        hideBranding={isBrandingHidden}
+        isTeamEvent
+        isInstantMeeting
+        entity={entity}
+        duration={duration}
+      />
+    </main>
+  );
+}
+
+Type.isBookingPage = true;
+
+export default Type;

apps/web/pages/org/[orgSlug]/instant-meeting/team/[slug]/[type].tsx

@@ -1,119 +1,10 @@
-import type { GetServerSidePropsContext } from "next";
-import { z } from "zod";
-
-import { Booker } from "@calcom/atoms/monorepo";
-import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
-import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
-import { getMultipleDurationValue } from "@calcom/features/bookings/lib/get-booking";
-import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import slugify from "@calcom/lib/slugify";
-import prisma from "@calcom/prisma";
-
-import type { inferSSRProps } from "@lib/types/inferSSRProps";
-import type { EmbedProps } from "@lib/withEmbedSsr";
-
 import PageWrapper from "@components/PageWrapper";
 
-export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;
+import type { PageProps } from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";
+import Type from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view";
 
-export default function Type({
-  slug,
-  user,
-  booking,
-  isEmbed,
-  isBrandingHidden,
-  entity,
-  duration,
-}: PageProps) {
-  return (
-    <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>
-      <BookerSeo
-        username={user}
-        eventSlug={slug}
-        rescheduleUid={undefined}
-        hideBranding={isBrandingHidden}
-        isTeamEvent
-        entity={entity}
-        bookingData={booking}
-      />
-      <Booker
-        username={user}
-        eventSlug={slug}
-        bookingData={booking}
-        hideBranding={isBrandingHidden}
-        isTeamEvent
-        isInstantMeeting
-        entity={entity}
-        duration={duration}
-      />
-    </main>
-  );
-}
+const Page = (props: PageProps) => <Type {...props} />;
+Page.PageWrapper = PageWrapper;
 
-const paramsSchema = z.object({
-  type: z.string().transform((s) => slugify(s)),
-  slug: z.string().transform((s) => slugify(s)),
-});
-
-Type.PageWrapper = PageWrapper;
-Type.isBookingPage = true;
-
-export const getServerSideProps = async (context: GetServerSidePropsContext) => {
-  const { slug: teamSlug, type: meetingSlug } = paramsSchema.parse(context.params);
-  const { duration: queryDuration } = context.query;
-  const { ssrInit } = await import("@server/lib/ssr");
-  const ssr = await ssrInit(context);
-  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);
-
-  const team = await prisma.team.findFirst({
-    where: {
-      ...getSlugOrRequestedSlug(teamSlug),
-      parent: isValidOrgDomain && currentOrgDomain ? getSlugOrRequestedSlug(currentOrgDomain) : null,
-    },
-    select: {
-      id: true,
-      hideBranding: true,
-    },
-  });
-
-  if (!team) {
-    return {
-      notFound: true,
-    } as const;
-  }
-
-  const org = isValidOrgDomain ? currentOrgDomain : null;
-
-  const eventData = await ssr.viewer.public.event.fetch({
-    username: teamSlug,
-    eventSlug: meetingSlug,
-    isTeamEvent: true,
-    org,
-    fromRedirectOfNonOrgLink: context.query.orgRedirection === "true",
-  });
-
-  if (!eventData || !org) {
-    return {
-      notFound: true,
-    } as const;
-  }
-
-  return {
-    props: {
-      entity: eventData.entity,
-      duration: getMultipleDurationValue(
-        eventData.metadata?.multipleDuration,
-        queryDuration,
-        eventData.length
-      ),
-      booking: null,
-      user: teamSlug,
-      teamId: team.id,
-      slug: meetingSlug,
-      trpcState: ssr.dehydrate(),
-      isBrandingHidden: team?.hideBranding,
-      themeBasis: null,
-    },
-  };
-};
+export { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";
+export default Page;

packages/lib/server/repository/event.ts

@@ -0,0 +1,18 @@
+import { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
+import prisma from "@calcom/prisma";
+
+import type { TEventInputSchema } from "../../../trpc/server/routers/publicViewer/event.schema";
+
+export class EventRepository {
+  static async getPublicEvent(input: TEventInputSchema) {
+    const event = await getPublicEvent(
+      input.username,
+      input.eventSlug,
+      input.isTeamEvent,
+      input.org,
+      prisma,
+      input.fromRedirectOfNonOrgLink
+    );
+    return event;
+  }
+}

packages/trpc/server/routers/publicViewer/event.handler.ts

@@ -1,23 +1,13 @@
-import { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
-import type { PrismaClient } from "@calcom/prisma";
+import { EventRepository } from "@calcom/lib/server/repository/event";
 
 import type { TEventInputSchema } from "./event.schema";
 
 interface EventHandlerOptions {
-  ctx: { prisma: PrismaClient };
   input: TEventInputSchema;
 }
 
-export const eventHandler = async ({ ctx, input }: EventHandlerOptions) => {
-  const event = await getPublicEvent(
-    input.username,
-    input.eventSlug,
-    input.isTeamEvent,
-    input.org,
-    ctx.prisma,
-    input.fromRedirectOfNonOrgLink
-  );
-  return event;
+export const eventHandler = async ({ input }: EventHandlerOptions) => {
+  return await EventRepository.getPublicEvent(input);
 };
 
 export default eventHandler;