From 086bae03d3631330f35e5ff1f3edfc2f6d8531f0 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Mon, 8 Sep 2025 07:38:46 -0400 Subject: [PATCH] refactor: move a constant to a dedicated file in App store package (#23671) * define DailyLocationType in app-store/locations.ts * update imports --- packages/app-store/constants.ts | 2 ++ packages/app-store/locations.ts | 3 ++- packages/features/bookings/lib/handleCancelBooking.ts | 2 +- .../scheduleNoShowTriggers.integration-test.ts | 2 +- .../bookings/lib/handleNewBooking/scheduleNoShowTriggers.ts | 2 +- packages/lib/defaultEvents.ts | 2 +- packages/lib/server/getDefaultLocations.ts | 2 +- packages/lib/videoClient.ts | 2 +- .../trpc/server/routers/viewer/bookings/editLocation.schema.ts | 2 +- .../server/routers/viewer/eventTypes/heavy/create.handler.ts | 2 +- .../server/routers/viewer/eventTypes/heavy/update.handler.ts | 2 +- 11 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/app-store/constants.ts b/packages/app-store/constants.ts index ab3cd2d5fb..7a20c9e8fa 100644 --- a/packages/app-store/constants.ts +++ b/packages/app-store/constants.ts @@ -1,3 +1,5 @@ export const MeetLocationType = "integrations:google:meet"; export const MSTeamsLocationType = "integrations:office365_video"; + +export const DailyLocationType = "integrations:daily"; diff --git a/packages/app-store/locations.ts b/packages/app-store/locations.ts index 7e646b7d7c..3be5e783f2 100644 --- a/packages/app-store/locations.ts +++ b/packages/app-store/locations.ts @@ -13,10 +13,12 @@ import type { EventLocationTypeFromAppMeta } from "../types/App"; import { MeetLocationType as importedMeetLocationType, MSTeamsLocationType as importedMSTeamsLocationType, + DailyLocationType as importedDailyLocationType, } from "./constants"; export const MeetLocationType = importedMeetLocationType; export const MSTeamsLocationType = importedMSTeamsLocationType; +export const DailyLocationType = importedDailyLocationType; export type DefaultEventLocationType = { default: true; @@ -69,7 +71,6 @@ export type EventLocationTypeFromApp = Ensure< export type EventLocationType = DefaultEventLocationType | EventLocationTypeFromApp; -export const DailyLocationType = "integrations:daily"; export const CalVideoLocationType = DailyLocationType; /** diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts index 047a15a108..cac3852e37 100644 --- a/packages/features/bookings/lib/handleCancelBooking.ts +++ b/packages/features/bookings/lib/handleCancelBooking.ts @@ -1,8 +1,8 @@ import type { Prisma, WorkflowReminder } from "@prisma/client"; import type { z } from "zod"; +import { DailyLocationType } from "@calcom/app-store/constants"; import { FAKE_DAILY_CREDENTIAL } from "@calcom/app-store/dailyvideo/lib/VideoApiAdapter"; -import { DailyLocationType } from "@calcom/app-store/locations"; import dayjs from "@calcom/dayjs"; import { sendCancelledEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; diff --git a/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.integration-test.ts b/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.integration-test.ts index 5a1c3cfa99..e7aea35896 100644 --- a/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.integration-test.ts +++ b/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.integration-test.ts @@ -1,7 +1,7 @@ import type { Booking, User, Webhook } from "@prisma/client"; import { afterAll, beforeAll, describe, expect, test, vi } from "vitest"; -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import { getMeetingSessionsFromRoomName } from "@calcom/features/tasker/tasks/triggerNoShow/getMeetingSessionsFromRoomName"; import { triggerHostNoShow } from "@calcom/features/tasker/tasks/triggerNoShow/triggerHostNoShow"; import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload"; diff --git a/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.ts b/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.ts index c85452202f..3765521d97 100644 --- a/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.ts +++ b/packages/features/bookings/lib/handleNewBooking/scheduleNoShowTriggers.ts @@ -1,4 +1,4 @@ -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import dayjs from "@calcom/dayjs"; import tasker from "@calcom/features/tasker"; import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks"; diff --git a/packages/lib/defaultEvents.ts b/packages/lib/defaultEvents.ts index c79383abed..8ccd6463b0 100644 --- a/packages/lib/defaultEvents.ts +++ b/packages/lib/defaultEvents.ts @@ -1,6 +1,6 @@ import type { Prisma, SelectedCalendar } from "@prisma/client"; -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import slugify from "@calcom/lib/slugify"; import { PeriodType, SchedulingType } from "@calcom/prisma/enums"; import type { userSelect } from "@calcom/prisma/selects"; diff --git a/packages/lib/server/getDefaultLocations.ts b/packages/lib/server/getDefaultLocations.ts index 275647a6ff..4c41d40848 100644 --- a/packages/lib/server/getDefaultLocations.ts +++ b/packages/lib/server/getDefaultLocations.ts @@ -1,5 +1,5 @@ import getAppKeysFromSlug from "@calcom/app-store/_utils/getAppKeysFromSlug"; -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import getApps from "@calcom/app-store/utils"; import { getUsersCredentialsIncludeServiceAccountKey } from "@calcom/lib/server/getUsersCredentials"; import { userMetadata as userMetadataSchema } from "@calcom/prisma/zod-utils"; diff --git a/packages/lib/videoClient.ts b/packages/lib/videoClient.ts index 4025e0d0a9..473718e127 100644 --- a/packages/lib/videoClient.ts +++ b/packages/lib/videoClient.ts @@ -1,8 +1,8 @@ import short from "short-uuid"; import { v5 as uuidv5 } from "uuid"; +import { DailyLocationType } from "@calcom/app-store/constants"; import { getDailyAppKeys } from "@calcom/app-store/dailyvideo/lib/getDailyAppKeys"; -import { DailyLocationType } from "@calcom/app-store/locations"; import { VideoApiAdapterMap } from "@calcom/app-store/video.adapters.generated"; import { sendBrokenIntegrationEmail } from "@calcom/emails"; import { getUid } from "@calcom/lib/CalEventParser"; diff --git a/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts b/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts index 2fbf0e8a4e..1849b3f597 100644 --- a/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts +++ b/packages/trpc/server/routers/viewer/bookings/editLocation.schema.ts @@ -1,6 +1,6 @@ import { z } from "zod"; -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import { commonBookingSchema } from "./types"; diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts index 75cae763a5..e20710a5c4 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/create.handler.ts @@ -1,6 +1,6 @@ import { Prisma } from "@prisma/client"; -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import { getDefaultLocations } from "@calcom/lib/server/getDefaultLocations"; import { EventTypeRepository } from "@calcom/lib/server/repository/eventTypeRepository"; import type { PrismaClient } from "@calcom/prisma"; diff --git a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts index cc511959f6..8e215a2863 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/heavy/update.handler.ts @@ -2,7 +2,7 @@ import { Prisma } from "@prisma/client"; import type { NextApiResponse, GetServerSidePropsContext } from "next"; import type { appDataSchemas } from "@calcom/app-store/apps.schemas.generated"; -import { DailyLocationType } from "@calcom/app-store/locations"; +import { DailyLocationType } from "@calcom/app-store/constants"; import updateChildrenEventTypes from "@calcom/features/ee/managed-event-types/lib/handleChildrenEventTypes"; import { allowDisablingAttendeeConfirmationEmails,