From 7bf5d9cf640b16c41b1b5921693fa49807f32883 Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Thu, 4 Sep 2025 07:44:54 -0400 Subject: [PATCH] perf: import enums from `@calcom/prisma/enums` (#23582) * wip * fix imports in the rest * rest * fix mistake --- apps/api/v1/pages/api/event-types/_post.ts | 2 +- .../2024-04-15/controllers/bookings.controller.ts | 2 +- .../ee/bookings/2024-08-13/services/input.service.ts | 2 +- apps/api/v2/src/lib/roles/constants.ts | 2 +- .../decorators/roles/membership-roles.decorator.ts | 3 ++- .../oauth-client-users.controller.ts | 6 ++---- .../oauth-client-webhooks.controller.ts | 3 ++- .../oauth-clients/oauth-clients.controller.ts | 2 +- .../services/oauth-clients-users.service.ts | 3 ++- .../inputs/create-organization-attribute.input.ts | 3 ++- .../inputs/update-organization-attribute.input.ts | 3 ++- .../organizations-event-types.e2e-spec.ts | 3 ++- .../event-types/services/output.service.ts | 12 ++++++++++-- .../inputs/create-organization-membership.input.ts | 3 ++- .../inputs/update-organization-membership.input.ts | 3 ++- .../teams/index/outputs/organization-team.output.ts | 2 +- .../create-organization-team-membership.input.ts | 3 ++- .../update-organization-team-membership.input.ts | 3 ++- .../index/inputs/create-organization-user.input.ts | 3 ++- .../index/services/organizations-users-service.ts | 3 ++- .../inputs/create-team-membership.input.ts | 3 ++- .../inputs/update-team-membership.input.ts | 5 +++-- .../memberships/outputs/team-membership.output.ts | 3 ++- .../teams/teams/outputs/teams/get-team.output.ts | 3 +-- .../teams/teams/outputs/teams/get-teams.output.ts | 3 +-- .../teams/teams/outputs/teams/update-team.output.ts | 3 +-- apps/api/v2/src/modules/users/users.repository.ts | 3 ++- .../v2/src/modules/webhooks/inputs/webhook.input.ts | 3 ++- .../src/modules/webhooks/outputs/webhook.output.ts | 2 +- .../modules/workflows/inputs/workflow-step.input.ts | 3 ++- .../workflows/inputs/workflow-trigger.input.ts | 3 ++- .../v2/src/modules/workflows/workflows.repository.ts | 3 ++- .../repository/membership.repository.fixture.ts | 4 +++- apps/web/app/(use-page-wrapper)/auth/error/page.tsx | 2 +- .../app/api/auth/two-factor/totp/disable/route.ts | 2 +- .../EventTypeConferencingAppSettings.tsx | 2 +- apps/web/lib/handleOrgRedirect.test.ts | 2 +- apps/web/lib/pages/auth/verify-email.test.ts | 2 +- apps/web/lib/pages/auth/verify-email.ts | 2 +- apps/web/lib/reschedule/[uid]/getServerSideProps.ts | 2 +- .../lib/team/[slug]/[type]/getServerSideProps.tsx | 2 +- apps/web/lib/team/[slug]/getServerSideProps.tsx | 2 +- .../modules/settings/admin/components/UsersTable.tsx | 2 +- apps/web/playwright/booking-limits.e2e.ts | 2 +- apps/web/playwright/booking-pages.e2e.ts | 2 +- apps/web/playwright/bookings-list.e2e.ts | 3 +-- apps/web/playwright/dynamic-booking-pages.e2e.ts | 2 +- apps/web/playwright/embed-code-generator.e2e.ts | 2 +- apps/web/playwright/lib/orgMigration.ts | 2 +- .../organization/organization-invitation.e2e.ts | 2 +- apps/web/playwright/reschedule.e2e.ts | 2 +- apps/web/playwright/webhook.e2e.ts | 2 +- .../server/lib/[user]/[type]/getServerSideProps.ts | 2 +- apps/web/server/lib/[user]/getServerSideProps.ts | 3 ++- .../utils/bookingScenario/getSampleUserInSession.ts | 3 +-- .../pages/route-builder/[...appPages].tsx | 2 +- .../routing-forms/trpc/onFormSubmission.test.ts | 2 +- packages/app-store/routing-forms/trpc/utils.ts | 2 +- .../bookings/lib/handleNewRecurringBooking.ts | 2 +- .../api/webhook/_customer.subscription.updated.ts | 2 +- .../features/ee/organizations/pages/organization.tsx | 2 +- .../ee/teams/components/RoundRobinSettings.tsx | 2 +- .../lib/bookings/filterHostsByLeadThreshold.test.ts | 2 +- packages/lib/server/repository/membership.ts | 2 +- packages/lib/server/repository/workflow.ts | 2 +- packages/lib/service/attribute/utils.ts | 2 +- .../admin/getSMSLockStateTeamsUsers.handler.ts | 2 +- .../routers/viewer/admin/setSMSLockState.handler.ts | 2 +- .../routers/viewer/attributes/create.handler.ts | 3 ++- .../routers/viewer/attributes/delete.handler.ts | 2 +- .../server/routers/viewer/attributes/edit.handler.ts | 2 +- .../viewer/attributes/toggleActive.handler.ts | 2 +- .../routers/viewer/eventTypes/update.handler.ts | 2 +- .../viewer/me/checkForInvalidAppCredentials.ts | 2 +- packages/trpc/server/routers/viewer/slots/util.ts | 3 +-- 75 files changed, 110 insertions(+), 86 deletions(-) diff --git a/apps/api/v1/pages/api/event-types/_post.ts b/apps/api/v1/pages/api/event-types/_post.ts index ea87dd6a06..73258bef97 100644 --- a/apps/api/v1/pages/api/event-types/_post.ts +++ b/apps/api/v1/pages/api/event-types/_post.ts @@ -4,7 +4,7 @@ import type { NextApiRequest } from "next"; import { HttpError } from "@calcom/lib/http-error"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { schemaEventTypeCreateBodyParams, schemaEventTypeReadPublic } from "~/lib/validations/event-type"; import { canUserAccessTeamWithRole } from "~/pages/api/teams/[teamId]/_auth-middleware"; diff --git a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts index c23d85ca08..c797f5096b 100644 --- a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts +++ b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts @@ -38,7 +38,6 @@ import { } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; import { ApiQuery, ApiExcludeController as DocsExcludeController } from "@nestjs/swagger"; -import { CreationSource } from "@prisma/client"; import { Request } from "express"; import { NextApiRequest } from "next/types"; import { v4 as uuidv4 } from "uuid"; @@ -65,6 +64,7 @@ import { } from "@calcom/platform-types"; import { ApiResponse } from "@calcom/platform-types"; import { PrismaClient } from "@calcom/prisma"; +import { CreationSource } from "@calcom/prisma/enums"; type BookingRequest = Request & { userId?: number; diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts b/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts index 4ed19b9130..db74fb7e7f 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts @@ -22,7 +22,6 @@ import { UsersRepository } from "@/modules/users/users.repository"; import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common"; import { Logger } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; -import { CreationSource } from "@prisma/client"; import { isURL, isPhoneNumber } from "class-validator"; import { Request } from "express"; import { DateTime } from "luxon"; @@ -46,6 +45,7 @@ import { } from "@calcom/platform-types"; import { BookingInputLocation_2024_08_13 } from "@calcom/platform-types/bookings/2024-08-13/inputs/location.input"; import { EventType } from "@calcom/prisma/client"; +import { CreationSource } from "@calcom/prisma/enums"; type BookingRequest = NextApiRequest & { userId: number | undefined; diff --git a/apps/api/v2/src/lib/roles/constants.ts b/apps/api/v2/src/lib/roles/constants.ts index 03a9db1840..bef321ceb0 100644 --- a/apps/api/v2/src/lib/roles/constants.ts +++ b/apps/api/v2/src/lib/roles/constants.ts @@ -1,4 +1,4 @@ -import { MembershipRole } from "@prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; export const SYSTEM_ADMIN_ROLE = "SYSADMIN"; export const ORG_ROLES = [ diff --git a/apps/api/v2/src/modules/auth/decorators/roles/membership-roles.decorator.ts b/apps/api/v2/src/modules/auth/decorators/roles/membership-roles.decorator.ts index 1165605374..9a6a46a420 100644 --- a/apps/api/v2/src/modules/auth/decorators/roles/membership-roles.decorator.ts +++ b/apps/api/v2/src/modules/auth/decorators/roles/membership-roles.decorator.ts @@ -1,4 +1,5 @@ import { Reflector } from "@nestjs/core"; -import { MembershipRole } from "@prisma/client"; + +import { MembershipRole } from "@calcom/prisma/enums"; export const MembershipRoles = Reflector.createDecorator(); diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts index e8b30a13d3..e9614c37ac 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.ts @@ -1,5 +1,4 @@ import { API_VERSIONS_VALUES } from "@/lib/api-versions"; -import { Locales } from "@/lib/enums/locales"; import { MembershipRoles } from "@/modules/auth/decorators/roles/membership-roles.decorator"; import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard"; import { OrganizationRolesGuard } from "@/modules/auth/guards/organization-roles/organization-roles.guard"; @@ -7,7 +6,6 @@ import { GetManagedUsersInput } from "@/modules/oauth-clients/controllers/oauth- import { CreateManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output"; import { GetManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-user.output"; import { GetManagedUsersOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-users.output"; -import { ManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/managed-user.output"; import { TOKENS_DOCS } from "@/modules/oauth-clients/controllers/oauth-flow/oauth-flow.controller"; import { KeysResponseDto } from "@/modules/oauth-clients/controllers/oauth-flow/responses/KeysResponse.dto"; import { OAuthClientGuard } from "@/modules/oauth-clients/guards/oauth-client-guard"; @@ -34,10 +32,10 @@ import { NotFoundException, } from "@nestjs/common"; import { ApiOperation, ApiTags as DocsTags, ApiHeader } from "@nestjs/swagger"; -import { User, MembershipRole } from "@prisma/client"; -import { plainToInstance } from "class-transformer"; +import { User } from "@prisma/client"; import { SUCCESS_STATUS, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; +import { MembershipRole } from "@calcom/prisma/enums"; @Controller({ path: "/v2/oauth-clients/:clientId/users", diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.ts index c141f0df36..aa51235ade 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.ts @@ -17,11 +17,12 @@ import { OAuthClientWebhooksService } from "@/modules/webhooks/services/oauth-cl import { WebhooksService } from "@/modules/webhooks/services/webhooks.service"; import { Controller, Post, Body, UseGuards, Get, Param, Query, Delete, Patch } from "@nestjs/common"; import { ApiHeader, ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger"; -import { Webhook, MembershipRole } from "@prisma/client"; +import { Webhook } from "@prisma/client"; import { plainToClass } from "class-transformer"; import { SUCCESS_STATUS, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; import { SkipTakePagination } from "@calcom/platform-types"; +import { MembershipRole } from "@calcom/prisma/enums"; import { OAuthClientGuard } from "../../guards/oauth-client-guard"; diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.ts index 4d630423be..b8ab68fa8e 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.ts @@ -37,10 +37,10 @@ import { ApiExcludeEndpoint, ApiHeader, } from "@nestjs/swagger"; -import { User, MembershipRole } from "@prisma/client"; import { SUCCESS_STATUS } from "@calcom/platform-constants"; import { CreateOAuthClientInput, UpdateOAuthClientInput, Pagination } from "@calcom/platform-types"; +import { MembershipRole } from "@calcom/prisma/enums"; @Controller({ path: "/v2/oauth-clients", diff --git a/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts b/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts index 05254657ca..64a1f7c6d8 100644 --- a/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts +++ b/apps/api/v2/src/modules/oauth-clients/services/oauth-clients-users.service.ts @@ -8,9 +8,10 @@ import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-us import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input"; import { UsersRepository } from "@/modules/users/users.repository"; import { BadRequestException, ConflictException, Injectable, Logger } from "@nestjs/common"; -import { User, CreationSource, PlatformOAuthClient } from "@prisma/client"; +import { User, PlatformOAuthClient } from "@prisma/client"; import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries"; +import { CreationSource } from "@calcom/prisma/enums"; @Injectable() export class OAuthClientUsersService { diff --git a/apps/api/v2/src/modules/organizations/attributes/index/inputs/create-organization-attribute.input.ts b/apps/api/v2/src/modules/organizations/attributes/index/inputs/create-organization-attribute.input.ts index 273024ec8e..0fbdf239d8 100644 --- a/apps/api/v2/src/modules/organizations/attributes/index/inputs/create-organization-attribute.input.ts +++ b/apps/api/v2/src/modules/organizations/attributes/index/inputs/create-organization-attribute.input.ts @@ -1,6 +1,5 @@ import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input"; import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { AttributeType } from "@prisma/client"; import { Type } from "class-transformer"; import { IsArray, @@ -12,6 +11,8 @@ import { ValidateNested, } from "class-validator"; +import { AttributeType } from "@calcom/prisma/enums"; + export class CreateOrganizationAttributeInput { @IsString() @IsNotEmpty() diff --git a/apps/api/v2/src/modules/organizations/attributes/index/inputs/update-organization-attribute.input.ts b/apps/api/v2/src/modules/organizations/attributes/index/inputs/update-organization-attribute.input.ts index 6e0483f418..3aa738f698 100644 --- a/apps/api/v2/src/modules/organizations/attributes/index/inputs/update-organization-attribute.input.ts +++ b/apps/api/v2/src/modules/organizations/attributes/index/inputs/update-organization-attribute.input.ts @@ -1,7 +1,8 @@ import { ApiPropertyOptional } from "@nestjs/swagger"; -import { AttributeType } from "@prisma/client"; import { IsBoolean, IsEnum, IsOptional, IsString } from "class-validator"; +import { AttributeType } from "@calcom/prisma/enums"; + export class UpdateOrganizationAttributeInput { @IsString() @IsOptional() diff --git a/apps/api/v2/src/modules/organizations/event-types/organizations-event-types.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/organizations-event-types.e2e-spec.ts index 7616d6931e..1d6231c2d5 100644 --- a/apps/api/v2/src/modules/organizations/event-types/organizations-event-types.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/event-types/organizations-event-types.e2e-spec.ts @@ -6,7 +6,7 @@ import { UsersModule } from "@/modules/users/users.module"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import { SchedulingType, User } from "@prisma/client"; +import { User } from "@prisma/client"; import * as request from "supertest"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; @@ -33,6 +33,7 @@ import { UpdateTeamEventTypeInput_2024_06_14, } from "@calcom/platform-types"; import { Team } from "@calcom/prisma/client"; +import { SchedulingType } from "@calcom/prisma/enums"; describe("Organizations Event Types Endpoints", () => { describe("User Authentication - User is Org Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts b/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts index 2c6fe32577..433bb00e9e 100644 --- a/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts +++ b/apps/api/v2/src/modules/organizations/event-types/services/output.service.ts @@ -2,10 +2,18 @@ import { OutputEventTypesService_2024_06_14 } from "@/ee/event-types/event-types import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-event-types.repository"; import { UsersRepository } from "@/modules/users/users.repository"; import { Injectable } from "@nestjs/common"; -import type { EventType, User, Schedule, Host, DestinationCalendar, CalVideoSettings } from "@prisma/client"; -import { SchedulingType, Team } from "@prisma/client"; +import type { + Team, + EventType, + User, + Schedule, + Host, + DestinationCalendar, + CalVideoSettings, +} from "@prisma/client"; import { HostPriority, TeamEventTypeResponseHost } from "@calcom/platform-types"; +import { SchedulingType } from "@calcom/prisma/enums"; type EventTypeRelations = { users: User[]; diff --git a/apps/api/v2/src/modules/organizations/memberships/inputs/create-organization-membership.input.ts b/apps/api/v2/src/modules/organizations/memberships/inputs/create-organization-membership.input.ts index bcb0ac094e..e2f168d46f 100644 --- a/apps/api/v2/src/modules/organizations/memberships/inputs/create-organization-membership.input.ts +++ b/apps/api/v2/src/modules/organizations/memberships/inputs/create-organization-membership.input.ts @@ -1,7 +1,8 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class CreateOrgMembershipDto { @IsInt() @ApiProperty() diff --git a/apps/api/v2/src/modules/organizations/memberships/inputs/update-organization-membership.input.ts b/apps/api/v2/src/modules/organizations/memberships/inputs/update-organization-membership.input.ts index d21119613c..b82c7f894e 100644 --- a/apps/api/v2/src/modules/organizations/memberships/inputs/update-organization-membership.input.ts +++ b/apps/api/v2/src/modules/organizations/memberships/inputs/update-organization-membership.input.ts @@ -1,7 +1,8 @@ import { ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { IsBoolean, IsOptional, IsEnum } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class UpdateOrgMembershipDto { @IsOptional() @IsBoolean() diff --git a/apps/api/v2/src/modules/organizations/teams/index/outputs/organization-team.output.ts b/apps/api/v2/src/modules/organizations/teams/index/outputs/organization-team.output.ts index a652cd6dfb..eba24ba92c 100644 --- a/apps/api/v2/src/modules/organizations/teams/index/outputs/organization-team.output.ts +++ b/apps/api/v2/src/modules/organizations/teams/index/outputs/organization-team.output.ts @@ -1,10 +1,10 @@ import { ApiProperty } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { Expose, Type } from "class-transformer"; import { IsEnum, IsString, ValidateNested } from "class-validator"; import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants"; import { OrgTeamOutputDto } from "@calcom/platform-types"; +import { MembershipRole } from "@calcom/prisma/enums"; export class OrgMeTeamOutputDto extends OrgTeamOutputDto { @IsString() diff --git a/apps/api/v2/src/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input.ts b/apps/api/v2/src/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input.ts index f455b2753d..7b933b0550 100644 --- a/apps/api/v2/src/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input.ts +++ b/apps/api/v2/src/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input.ts @@ -1,7 +1,8 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class CreateOrgTeamMembershipDto { @IsInt() @ApiProperty() diff --git a/apps/api/v2/src/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input.ts b/apps/api/v2/src/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input.ts index 704ac7b824..7bddff9d5f 100644 --- a/apps/api/v2/src/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input.ts +++ b/apps/api/v2/src/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input.ts @@ -1,7 +1,8 @@ import { ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { IsBoolean, IsOptional, IsEnum } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class UpdateOrgTeamMembershipDto { @IsOptional() @IsBoolean() diff --git a/apps/api/v2/src/modules/organizations/users/index/inputs/create-organization-user.input.ts b/apps/api/v2/src/modules/organizations/users/index/inputs/create-organization-user.input.ts index 2e8bbac85d..7984ae9971 100644 --- a/apps/api/v2/src/modules/organizations/users/index/inputs/create-organization-user.input.ts +++ b/apps/api/v2/src/modules/organizations/users/index/inputs/create-organization-user.input.ts @@ -1,8 +1,9 @@ import { CreateUserInput } from "@/modules/users/inputs/create-user.input"; import { ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { IsString, IsOptional, IsBoolean, IsEnum } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class CreateOrganizationUserInput extends CreateUserInput { @IsOptional() @IsString() diff --git a/apps/api/v2/src/modules/organizations/users/index/services/organizations-users-service.ts b/apps/api/v2/src/modules/organizations/users/index/services/organizations-users-service.ts index 0b050cf238..dbcb943be7 100644 --- a/apps/api/v2/src/modules/organizations/users/index/services/organizations-users-service.ts +++ b/apps/api/v2/src/modules/organizations/users/index/services/organizations-users-service.ts @@ -4,10 +4,11 @@ import { UpdateOrganizationUserInput } from "@/modules/organizations/users/index import { OrganizationsUsersRepository } from "@/modules/organizations/users/index/organizations-users.repository"; import { CreateUserInput } from "@/modules/users/inputs/create-user.input"; import { Injectable, ConflictException, ForbiddenException } from "@nestjs/common"; -import { Team, CreationSource } from "@prisma/client"; +import { Team } from "@prisma/client"; import { plainToInstance } from "class-transformer"; import { createNewUsersConnectToOrgIfExists } from "@calcom/platform-libraries"; +import { CreationSource } from "@calcom/prisma/enums"; @Injectable() export class OrganizationsUsersService { diff --git a/apps/api/v2/src/modules/teams/memberships/inputs/create-team-membership.input.ts b/apps/api/v2/src/modules/teams/memberships/inputs/create-team-membership.input.ts index 0e12f97d9f..e255cd792a 100644 --- a/apps/api/v2/src/modules/teams/memberships/inputs/create-team-membership.input.ts +++ b/apps/api/v2/src/modules/teams/memberships/inputs/create-team-membership.input.ts @@ -1,7 +1,8 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class CreateTeamMembershipInput { @IsInt() @ApiProperty({ type: Number }) diff --git a/apps/api/v2/src/modules/teams/memberships/inputs/update-team-membership.input.ts b/apps/api/v2/src/modules/teams/memberships/inputs/update-team-membership.input.ts index 16addbfad2..a7f12185b9 100644 --- a/apps/api/v2/src/modules/teams/memberships/inputs/update-team-membership.input.ts +++ b/apps/api/v2/src/modules/teams/memberships/inputs/update-team-membership.input.ts @@ -1,7 +1,8 @@ -import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; +import { ApiPropertyOptional } from "@nestjs/swagger"; import { IsBoolean, IsOptional, IsEnum } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + export class UpdateTeamMembershipInput { @IsOptional() @IsBoolean() diff --git a/apps/api/v2/src/modules/teams/memberships/outputs/team-membership.output.ts b/apps/api/v2/src/modules/teams/memberships/outputs/team-membership.output.ts index 4616aef746..2d76521e8f 100644 --- a/apps/api/v2/src/modules/teams/memberships/outputs/team-membership.output.ts +++ b/apps/api/v2/src/modules/teams/memberships/outputs/team-membership.output.ts @@ -1,8 +1,9 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { Expose, Transform, Type } from "class-transformer"; import { IsBoolean, IsInt, IsObject, IsOptional, IsString, ValidateNested } from "class-validator"; +import { MembershipRole } from "@calcom/prisma/enums"; + class MembershipUserOutputDto { @IsOptional() @IsString() diff --git a/apps/api/v2/src/modules/teams/teams/outputs/teams/get-team.output.ts b/apps/api/v2/src/modules/teams/teams/outputs/teams/get-team.output.ts index 066604be9a..58fef199c9 100644 --- a/apps/api/v2/src/modules/teams/teams/outputs/teams/get-team.output.ts +++ b/apps/api/v2/src/modules/teams/teams/outputs/teams/get-team.output.ts @@ -1,7 +1,6 @@ import { ApiProperty } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { Expose, Type } from "class-transformer"; -import { IsEnum, IsString, ValidateNested } from "class-validator"; +import { IsEnum, ValidateNested } from "class-validator"; import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants"; import { TeamOutputDto } from "@calcom/platform-types"; diff --git a/apps/api/v2/src/modules/teams/teams/outputs/teams/get-teams.output.ts b/apps/api/v2/src/modules/teams/teams/outputs/teams/get-teams.output.ts index 66f55aeb71..c403623545 100644 --- a/apps/api/v2/src/modules/teams/teams/outputs/teams/get-teams.output.ts +++ b/apps/api/v2/src/modules/teams/teams/outputs/teams/get-teams.output.ts @@ -1,7 +1,6 @@ import { ApiProperty } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { Expose, Type } from "class-transformer"; -import { IsEnum, IsString, ValidateNested } from "class-validator"; +import { IsEnum, ValidateNested } from "class-validator"; import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants"; import { TeamOutputDto } from "@calcom/platform-types"; diff --git a/apps/api/v2/src/modules/teams/teams/outputs/teams/update-team.output.ts b/apps/api/v2/src/modules/teams/teams/outputs/teams/update-team.output.ts index 2b0f4b493a..7113e5ecc7 100644 --- a/apps/api/v2/src/modules/teams/teams/outputs/teams/update-team.output.ts +++ b/apps/api/v2/src/modules/teams/teams/outputs/teams/update-team.output.ts @@ -1,7 +1,6 @@ import { ApiProperty } from "@nestjs/swagger"; -import { MembershipRole } from "@prisma/client"; import { Expose, Type } from "class-transformer"; -import { IsEnum, IsString, ValidateNested } from "class-validator"; +import { IsEnum, ValidateNested } from "class-validator"; import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants"; import { TeamOutputDto } from "@calcom/platform-types"; diff --git a/apps/api/v2/src/modules/users/users.repository.ts b/apps/api/v2/src/modules/users/users.repository.ts index ce05add22f..6de084b3ad 100644 --- a/apps/api/v2/src/modules/users/users.repository.ts +++ b/apps/api/v2/src/modules/users/users.repository.ts @@ -4,7 +4,8 @@ import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-us import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input"; import { Injectable, NotFoundException } from "@nestjs/common"; import type { Profile, User, Team, Prisma } from "@prisma/client"; -import { CreationSource } from "@prisma/client"; + +import { CreationSource } from "@calcom/prisma/enums"; export type UserWithProfile = User & { movedToProfile?: (Profile & { organization: Pick }) | null; diff --git a/apps/api/v2/src/modules/webhooks/inputs/webhook.input.ts b/apps/api/v2/src/modules/webhooks/inputs/webhook.input.ts index cf495f0dca..3acbfd9325 100644 --- a/apps/api/v2/src/modules/webhooks/inputs/webhook.input.ts +++ b/apps/api/v2/src/modules/webhooks/inputs/webhook.input.ts @@ -1,7 +1,8 @@ import { ApiProperty, ApiPropertyOptional, PartialType } from "@nestjs/swagger"; -import { WebhookTriggerEvents } from "@prisma/client"; import { IsArray, IsBoolean, IsEnum, IsOptional, IsString } from "class-validator"; +import { WebhookTriggerEvents } from "@calcom/prisma/enums"; + export class CreateWebhookInputDto { @IsString() @IsOptional() diff --git a/apps/api/v2/src/modules/webhooks/outputs/webhook.output.ts b/apps/api/v2/src/modules/webhooks/outputs/webhook.output.ts index 0a9af83814..eb6e76d721 100644 --- a/apps/api/v2/src/modules/webhooks/outputs/webhook.output.ts +++ b/apps/api/v2/src/modules/webhooks/outputs/webhook.output.ts @@ -1,9 +1,9 @@ import { ApiProperty } from "@nestjs/swagger"; -import { WebhookTriggerEvents } from "@prisma/client"; import { Expose, Type } from "class-transformer"; import { IsBoolean, IsEnum, IsInt, IsString, ValidateNested, IsArray } from "class-validator"; import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants"; +import { WebhookTriggerEvents } from "@calcom/prisma/enums"; export class WebhookOutputDto { @IsInt() diff --git a/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts b/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts index 49988697cf..3b4925c519 100644 --- a/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts +++ b/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts @@ -1,8 +1,9 @@ import { ApiProperty } from "@nestjs/swagger"; -import { WorkflowActions, WorkflowTemplates } from "@prisma/client"; import { Type } from "class-transformer"; import { IsNumber, IsBoolean, IsString, ValidateNested, IsIn } from "class-validator"; +import { WorkflowActions, WorkflowTemplates } from "@calcom/prisma/enums"; + export const EMAIL_HOST = "email_host"; export const EMAIL_ATTENDEE = "email_attendee"; export const EMAIL_ADDRESS = "email_address"; diff --git a/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts b/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts index 8eb62ab401..dc1723972c 100644 --- a/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts +++ b/apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts @@ -1,8 +1,9 @@ import { ApiProperty } from "@nestjs/swagger"; -import { TimeUnit, WorkflowTriggerEvents } from "@prisma/client"; import { Type } from "class-transformer"; import { IsIn, IsNumber, IsString, ValidateNested } from "class-validator"; +import { TimeUnit, WorkflowTriggerEvents } from "@calcom/prisma/enums"; + export const BEFORE_EVENT = "beforeEvent"; export const EVENT_CANCELLED = "eventCancelled"; export const NEW_EVENT = "newEvent"; diff --git a/apps/api/v2/src/modules/workflows/workflows.repository.ts b/apps/api/v2/src/modules/workflows/workflows.repository.ts index 411be2f8e8..95940be457 100644 --- a/apps/api/v2/src/modules/workflows/workflows.repository.ts +++ b/apps/api/v2/src/modules/workflows/workflows.repository.ts @@ -2,11 +2,12 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service"; import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; import { UserWithProfile } from "@/modules/users/users.repository"; import { Injectable } from "@nestjs/common"; -import { TimeUnit, Workflow, WorkflowStep, WorkflowTriggerEvents } from "@prisma/client"; import { TUpdateInputSchema } from "@calcom/platform-libraries/workflows"; import { updateWorkflow } from "@calcom/platform-libraries/workflows"; import { PrismaClient } from "@calcom/prisma"; +import type { Workflow, WorkflowStep } from "@calcom/prisma/client"; +import { TimeUnit, WorkflowTriggerEvents } from "@calcom/prisma/enums"; export type WorkflowType = Workflow & { activeOn: { eventTypeId: number }[]; steps: WorkflowStep[] }; diff --git a/apps/api/v2/test/fixtures/repository/membership.repository.fixture.ts b/apps/api/v2/test/fixtures/repository/membership.repository.fixture.ts index 7613a67119..bf056f4a59 100644 --- a/apps/api/v2/test/fixtures/repository/membership.repository.fixture.ts +++ b/apps/api/v2/test/fixtures/repository/membership.repository.fixture.ts @@ -1,7 +1,9 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service"; import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; import { TestingModule } from "@nestjs/testing"; -import { Membership, MembershipRole, Prisma, Team, User } from "@prisma/client"; +import { Membership, Prisma, Team, User } from "@prisma/client"; + +import { MembershipRole } from "@calcom/prisma/enums"; export class MembershipRepositoryFixture { private prismaReadClient: PrismaReadService["prisma"]; diff --git a/apps/web/app/(use-page-wrapper)/auth/error/page.tsx b/apps/web/app/(use-page-wrapper)/auth/error/page.tsx index 41120d164b..48cc2ced27 100644 --- a/apps/web/app/(use-page-wrapper)/auth/error/page.tsx +++ b/apps/web/app/(use-page-wrapper)/auth/error/page.tsx @@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import Link from "next/link"; import { z } from "zod"; -import { IdentityProvider } from "@calcom/prisma/client"; +import { IdentityProvider } from "@calcom/prisma/enums"; import { Button } from "@calcom/ui/components/button"; import { Icon } from "@calcom/ui/components/icon"; diff --git a/apps/web/app/api/auth/two-factor/totp/disable/route.ts b/apps/web/app/api/auth/two-factor/totp/disable/route.ts index ce0551be13..952711f51b 100644 --- a/apps/web/app/api/auth/two-factor/totp/disable/route.ts +++ b/apps/web/app/api/auth/two-factor/totp/disable/route.ts @@ -10,7 +10,7 @@ import { verifyPassword } from "@calcom/features/auth/lib/verifyPassword"; import { symmetricDecrypt } from "@calcom/lib/crypto"; import { totpAuthenticatorCheck } from "@calcom/lib/totp"; import prisma from "@calcom/prisma"; -import { IdentityProvider } from "@calcom/prisma/client"; +import { IdentityProvider } from "@calcom/prisma/enums"; import { buildLegacyRequest } from "@lib/buildLegacyCtx"; diff --git a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx index c983a9f7fc..4214e51884 100644 --- a/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx +++ b/apps/web/components/apps/installation/EventTypeConferencingAppSettings.tsx @@ -10,7 +10,7 @@ import Locations from "@calcom/features/eventtypes/components/locations/Location import type { LocationFormValues } from "@calcom/features/eventtypes/lib/types"; import type { SingleValueLocationOption } from "@calcom/features/form/components/LocationSelect"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { SchedulingType } from "@calcom/prisma/client"; +import { SchedulingType } from "@calcom/prisma/enums"; import { trpc } from "@calcom/trpc/react"; import { Label } from "@calcom/ui/components/form"; import { Skeleton, SkeletonText, SkeletonContainer } from "@calcom/ui/components/skeleton"; diff --git a/apps/web/lib/handleOrgRedirect.test.ts b/apps/web/lib/handleOrgRedirect.test.ts index b38785c3e8..cbff4bb665 100644 --- a/apps/web/lib/handleOrgRedirect.test.ts +++ b/apps/web/lib/handleOrgRedirect.test.ts @@ -3,7 +3,7 @@ import type { ParsedUrlQuery } from "querystring"; import { vi, describe, it, expect, beforeEach, afterEach } from "vitest"; import * as constants from "@calcom/lib/constants"; -import { RedirectType } from "@calcom/prisma/client"; +import { RedirectType } from "@calcom/prisma/enums"; import { handleOrgRedirect, getRedirectWithOriginAndSearchString } from "./handleOrgRedirect"; diff --git a/apps/web/lib/pages/auth/verify-email.test.ts b/apps/web/lib/pages/auth/verify-email.test.ts index eb4c9eabcb..68a62ae01f 100644 --- a/apps/web/lib/pages/auth/verify-email.test.ts +++ b/apps/web/lib/pages/auth/verify-email.test.ts @@ -2,7 +2,7 @@ import { organizationScenarios } from "@calcom/lib/server/repository/__mocks__/o import { describe, it, expect, beforeEach, vi } from "vitest"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { CreationSource } from "@calcom/prisma/enums"; import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler"; diff --git a/apps/web/lib/pages/auth/verify-email.ts b/apps/web/lib/pages/auth/verify-email.ts index 9973f33805..1df92535ec 100644 --- a/apps/web/lib/pages/auth/verify-email.ts +++ b/apps/web/lib/pages/auth/verify-email.ts @@ -7,7 +7,7 @@ import { WEBAPP_URL } from "@calcom/lib/constants"; import { IS_STRIPE_ENABLED } from "@calcom/lib/constants"; import { OrganizationRepository } from "@calcom/lib/server/repository/organization"; import { prisma } from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { CreationSource } from "@calcom/prisma/enums"; import { userMetadata } from "@calcom/prisma/zod-utils"; import { inviteMembersWithNoInviterPermissionCheck } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler"; diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts index f18ea866df..cdf3726e48 100644 --- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts +++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts @@ -11,7 +11,7 @@ import { getSafe } from "@calcom/lib/getSafe"; import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat"; import { UserRepository } from "@calcom/lib/server/repository/user"; import prisma, { bookingMinimalSelect } from "@calcom/prisma"; -import { BookingStatus } from "@calcom/prisma/client"; +import { BookingStatus } from "@calcom/prisma/enums"; const querySchema = z.object({ uid: z.string(), diff --git a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx index ccb38afc3c..f0c7ab8d3b 100644 --- a/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx +++ b/apps/web/lib/team/[slug]/[type]/getServerSideProps.tsx @@ -12,7 +12,7 @@ import { shouldHideBrandingForTeamEvent } from "@calcom/lib/hideBranding"; import slugify from "@calcom/lib/slugify"; import prisma from "@calcom/prisma"; import type { User } from "@calcom/prisma/client"; -import { BookingStatus, RedirectType, SchedulingType } from "@calcom/prisma/client"; +import { BookingStatus, RedirectType, SchedulingType } from "@calcom/prisma/enums"; import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils"; import { handleOrgRedirect } from "@lib/handleOrgRedirect"; diff --git a/apps/web/lib/team/[slug]/getServerSideProps.tsx b/apps/web/lib/team/[slug]/getServerSideProps.tsx index 9f71ad2b48..02552a0ddf 100644 --- a/apps/web/lib/team/[slug]/getServerSideProps.tsx +++ b/apps/web/lib/team/[slug]/getServerSideProps.tsx @@ -16,7 +16,7 @@ import slugify from "@calcom/lib/slugify"; import { stripMarkdown } from "@calcom/lib/stripMarkdown"; import prisma from "@calcom/prisma"; import type { Team, OrganizationSettings } from "@calcom/prisma/client"; -import { RedirectType } from "@calcom/prisma/client"; +import { RedirectType } from "@calcom/prisma/enums"; import { teamMetadataSchema } from "@calcom/prisma/zod-utils"; import { handleOrgRedirect } from "@lib/handleOrgRedirect"; diff --git a/apps/web/modules/settings/admin/components/UsersTable.tsx b/apps/web/modules/settings/admin/components/UsersTable.tsx index d4dd2d32d9..680053a915 100644 --- a/apps/web/modules/settings/admin/components/UsersTable.tsx +++ b/apps/web/modules/settings/admin/components/UsersTable.tsx @@ -1,7 +1,7 @@ import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { SMSLockState } from "@calcom/prisma/client"; +import { SMSLockState } from "@calcom/prisma/enums"; import { trpc } from "@calcom/trpc/react"; import { Avatar } from "@calcom/ui/components/avatar"; import type { IconName } from "@calcom/ui/components/icon"; diff --git a/apps/web/playwright/booking-limits.e2e.ts b/apps/web/playwright/booking-limits.e2e.ts index 1fe2e78971..b45591218a 100644 --- a/apps/web/playwright/booking-limits.e2e.ts +++ b/apps/web/playwright/booking-limits.e2e.ts @@ -9,7 +9,7 @@ import dayjs from "@calcom/dayjs"; import { intervalLimitKeyToUnit } from "@calcom/lib/intervalLimits/intervalLimit"; import type { IntervalLimit } from "@calcom/lib/intervalLimits/intervalLimitSchema"; import prisma from "@calcom/prisma"; -import { BookingStatus } from "@calcom/prisma/client"; +import { BookingStatus } from "@calcom/prisma/enums"; import { entries } from "@calcom/prisma/zod-utils"; import { test } from "./lib/fixtures"; diff --git a/apps/web/playwright/booking-pages.e2e.ts b/apps/web/playwright/booking-pages.e2e.ts index 4646d29396..213d47db96 100644 --- a/apps/web/playwright/booking-pages.e2e.ts +++ b/apps/web/playwright/booking-pages.e2e.ts @@ -4,7 +4,7 @@ import { JSDOM } from "jsdom"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { generateHashedLink } from "@calcom/lib/generateHashedLink"; import { randomString } from "@calcom/lib/random"; -import { SchedulingType } from "@calcom/prisma/client"; +import { SchedulingType } from "@calcom/prisma/enums"; import type { Schedule, TimeRange } from "@calcom/types/schedule"; import { test, todo } from "./lib/fixtures"; diff --git a/apps/web/playwright/bookings-list.e2e.ts b/apps/web/playwright/bookings-list.e2e.ts index 73787836ac..e339de5281 100644 --- a/apps/web/playwright/bookings-list.e2e.ts +++ b/apps/web/playwright/bookings-list.e2e.ts @@ -2,8 +2,7 @@ import { expect } from "@playwright/test"; import type { Page } from "@playwright/test"; import prisma from "@calcom/prisma"; -import { BookingStatus } from "@calcom/prisma/client"; -import { MembershipRole, SchedulingType } from "@calcom/prisma/enums"; +import { BookingStatus, MembershipRole, SchedulingType } from "@calcom/prisma/enums"; import { addFilter } from "./filter-helpers"; import { createTeamEventType } from "./fixtures/users"; diff --git a/apps/web/playwright/dynamic-booking-pages.e2e.ts b/apps/web/playwright/dynamic-booking-pages.e2e.ts index b29701ea01..93be129d62 100644 --- a/apps/web/playwright/dynamic-booking-pages.e2e.ts +++ b/apps/web/playwright/dynamic-booking-pages.e2e.ts @@ -1,6 +1,6 @@ import { expect } from "@playwright/test"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { test } from "./lib/fixtures"; import { diff --git a/apps/web/playwright/embed-code-generator.e2e.ts b/apps/web/playwright/embed-code-generator.e2e.ts index 2bc0c6490a..dd7450052f 100644 --- a/apps/web/playwright/embed-code-generator.e2e.ts +++ b/apps/web/playwright/embed-code-generator.e2e.ts @@ -5,7 +5,7 @@ import { parse } from "node-html-parser"; import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains"; import { EMBED_LIB_URL, WEBAPP_URL } from "@calcom/lib/constants"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { test } from "./lib/fixtures"; diff --git a/apps/web/playwright/lib/orgMigration.ts b/apps/web/playwright/lib/orgMigration.ts index abda65acc7..92663bd65a 100644 --- a/apps/web/playwright/lib/orgMigration.ts +++ b/apps/web/playwright/lib/orgMigration.ts @@ -6,8 +6,8 @@ import { safeStringify } from "@calcom/lib/safeStringify"; import { ProfileRepository } from "@calcom/lib/server/repository/profile"; import prisma from "@calcom/prisma"; import type { Team, User } from "@calcom/prisma/client"; -import { RedirectType } from "@calcom/prisma/client"; import { Prisma } from "@calcom/prisma/client"; +import { RedirectType } from "@calcom/prisma/enums"; import type { MembershipRole } from "@calcom/prisma/enums"; import { teamMetadataSchema, teamMetadataStrictSchema } from "@calcom/prisma/zod-utils"; diff --git a/apps/web/playwright/organization/organization-invitation.e2e.ts b/apps/web/playwright/organization/organization-invitation.e2e.ts index 6483a9f02a..61776fb113 100644 --- a/apps/web/playwright/organization/organization-invitation.e2e.ts +++ b/apps/web/playwright/organization/organization-invitation.e2e.ts @@ -2,7 +2,7 @@ import type { Browser, Page } from "@playwright/test"; import { expect } from "@playwright/test"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { SchedulingType } from "@calcom/prisma/enums"; import { test } from "../lib/fixtures"; diff --git a/apps/web/playwright/reschedule.e2e.ts b/apps/web/playwright/reschedule.e2e.ts index 3ea39b49f1..2dc45dba99 100644 --- a/apps/web/playwright/reschedule.e2e.ts +++ b/apps/web/playwright/reschedule.e2e.ts @@ -3,7 +3,7 @@ import { expect } from "@playwright/test"; import dayjs from "@calcom/dayjs"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { BookingStatus } from "@calcom/prisma/enums"; import { bookingMetadataSchema } from "@calcom/prisma/zod-utils"; diff --git a/apps/web/playwright/webhook.e2e.ts b/apps/web/playwright/webhook.e2e.ts index 2edb7d1326..c2705e5a75 100644 --- a/apps/web/playwright/webhook.e2e.ts +++ b/apps/web/playwright/webhook.e2e.ts @@ -3,7 +3,7 @@ import { v4 as uuidv4 } from "uuid"; import dayjs from "@calcom/dayjs"; import prisma from "@calcom/prisma"; -import { BookingStatus } from "@calcom/prisma/client"; +import { BookingStatus } from "@calcom/prisma/enums"; import { test } from "./lib/fixtures"; import { diff --git a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts index 9846073240..8a59e29515 100644 --- a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts +++ b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts @@ -13,7 +13,7 @@ import { EventRepository } from "@calcom/lib/server/repository/event"; import { UserRepository } from "@calcom/lib/server/repository/user"; import slugify from "@calcom/lib/slugify"; import prisma from "@calcom/prisma"; -import { BookingStatus, RedirectType } from "@calcom/prisma/client"; +import { BookingStatus, RedirectType } from "@calcom/prisma/enums"; import { handleOrgRedirect } from "@lib/handleOrgRedirect"; diff --git a/apps/web/server/lib/[user]/getServerSideProps.ts b/apps/web/server/lib/[user]/getServerSideProps.ts index 48ffa0357d..01ae5c25b4 100644 --- a/apps/web/server/lib/[user]/getServerSideProps.ts +++ b/apps/web/server/lib/[user]/getServerSideProps.ts @@ -14,7 +14,8 @@ import { safeStringify } from "@calcom/lib/safeStringify"; import { UserRepository } from "@calcom/lib/server/repository/user"; import { stripMarkdown } from "@calcom/lib/stripMarkdown"; import prisma from "@calcom/prisma"; -import { RedirectType, type EventType, type User } from "@calcom/prisma/client"; +import { type EventType, type User } from "@calcom/prisma/client"; +import { RedirectType } from "@calcom/prisma/enums"; import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils"; import type { UserProfile } from "@calcom/types/UserProfile"; diff --git a/apps/web/test/utils/bookingScenario/getSampleUserInSession.ts b/apps/web/test/utils/bookingScenario/getSampleUserInSession.ts index 56b472ad4f..e024d39f32 100644 --- a/apps/web/test/utils/bookingScenario/getSampleUserInSession.ts +++ b/apps/web/test/utils/bookingScenario/getSampleUserInSession.ts @@ -1,5 +1,4 @@ -import { UserPermissionRole } from "@calcom/prisma/client"; -import { IdentityProvider } from "@calcom/prisma/enums"; +import { IdentityProvider, UserPermissionRole } from "@calcom/prisma/enums"; export const getSampleUserInSession = function () { return { diff --git a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx index 032d2b6181..51482dbcad 100644 --- a/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx +++ b/packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx @@ -15,7 +15,7 @@ import { useOrgBranding } from "@calcom/features/ee/organizations/context/provid import { areTheySiblingEntities } from "@calcom/lib/entityPermissionUtils.shared"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { buildEmptyQueryValue, raqbQueryValueUtils } from "@calcom/lib/raqb/raqbUtils"; -import { SchedulingType } from "@calcom/prisma/client"; +import { SchedulingType } from "@calcom/prisma/enums"; import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import type { inferSSRProps } from "@calcom/types/inferSSRProps"; diff --git a/packages/app-store/routing-forms/trpc/onFormSubmission.test.ts b/packages/app-store/routing-forms/trpc/onFormSubmission.test.ts index f9a3404803..e51ad422c0 100644 --- a/packages/app-store/routing-forms/trpc/onFormSubmission.test.ts +++ b/packages/app-store/routing-forms/trpc/onFormSubmission.test.ts @@ -4,7 +4,7 @@ import { describe, it, vi, expect, beforeEach, afterEach } from "vitest"; import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks"; import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload"; -import { WebhookTriggerEvents } from "@calcom/prisma/client"; +import { WebhookTriggerEvents } from "@calcom/prisma/enums"; import { _onFormSubmission } from "./utils"; diff --git a/packages/app-store/routing-forms/trpc/utils.ts b/packages/app-store/routing-forms/trpc/utils.ts index 0757660de2..5cca3bf78f 100644 --- a/packages/app-store/routing-forms/trpc/utils.ts +++ b/packages/app-store/routing-forms/trpc/utils.ts @@ -7,7 +7,7 @@ import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPay import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import logger from "@calcom/lib/logger"; import { withReporting } from "@calcom/lib/sentryWrapper"; -import { WebhookTriggerEvents } from "@calcom/prisma/client"; +import { WebhookTriggerEvents } from "@calcom/prisma/enums"; import type { Ensure } from "@calcom/types/utils"; import type { SerializableField, OrderedResponses } from "../types/types"; diff --git a/packages/features/bookings/lib/handleNewRecurringBooking.ts b/packages/features/bookings/lib/handleNewRecurringBooking.ts index c2f0eb7f65..f188c0fe20 100644 --- a/packages/features/bookings/lib/handleNewRecurringBooking.ts +++ b/packages/features/bookings/lib/handleNewRecurringBooking.ts @@ -1,7 +1,7 @@ import type { CreateBookingMeta, CreateRecurringBookingData } from "@calcom/features/bookings/lib/dto/types"; import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking"; import type { BookingResponse } from "@calcom/features/bookings/types"; -import { SchedulingType } from "@calcom/prisma/client"; +import { SchedulingType } from "@calcom/prisma/enums"; import type { AppsStatus } from "@calcom/types/Calendar"; import type { RegularBookingService } from "./handleNewBooking"; diff --git a/packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts b/packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts index 13ab237e1a..02e307db36 100644 --- a/packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts +++ b/packages/features/ee/billing/api/webhook/_customer.subscription.updated.ts @@ -1,6 +1,6 @@ import { PrismaPhoneNumberRepository } from "@calcom/lib/server/repository/PrismaPhoneNumberRepository"; import { prisma } from "@calcom/prisma"; -import { PhoneNumberSubscriptionStatus } from "@calcom/prisma/client"; +import { PhoneNumberSubscriptionStatus } from "@calcom/prisma/enums"; import type { SWHMap } from "./__handler"; import { HttpCode } from "./__handler"; diff --git a/packages/features/ee/organizations/pages/organization.tsx b/packages/features/ee/organizations/pages/organization.tsx index 239443680d..e5700c8f28 100644 --- a/packages/features/ee/organizations/pages/organization.tsx +++ b/packages/features/ee/organizations/pages/organization.tsx @@ -2,7 +2,7 @@ import type { GetServerSidePropsContext } from "next"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; import { FeaturesRepository } from "@calcom/features/flags/features.repository"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; export const getServerSideProps = async ({ req }: GetServerSidePropsContext) => { const prisma = await import("@calcom/prisma").then((mod) => mod.default); diff --git a/packages/features/ee/teams/components/RoundRobinSettings.tsx b/packages/features/ee/teams/components/RoundRobinSettings.tsx index 702ca2afaf..a9aed3fba5 100644 --- a/packages/features/ee/teams/components/RoundRobinSettings.tsx +++ b/packages/features/ee/teams/components/RoundRobinSettings.tsx @@ -5,7 +5,7 @@ import { useForm } from "react-hook-form"; import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner"; import SectionBottomActions from "@calcom/features/settings/SectionBottomActions"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { RRResetInterval, RRTimestampBasis } from "@calcom/prisma/client"; +import { RRResetInterval, RRTimestampBasis } from "@calcom/prisma/enums"; import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import { Button } from "@calcom/ui/components/button"; diff --git a/packages/lib/bookings/filterHostsByLeadThreshold.test.ts b/packages/lib/bookings/filterHostsByLeadThreshold.test.ts index 7167ec19d8..1c72b8dfed 100644 --- a/packages/lib/bookings/filterHostsByLeadThreshold.test.ts +++ b/packages/lib/bookings/filterHostsByLeadThreshold.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it, vi, afterEach, beforeEach } from "vitest"; import { getLuckyUserService } from "@calcom/lib/di/containers/LuckyUser"; import prisma from "@calcom/prisma"; -import { RRResetInterval } from "@calcom/prisma/client"; +import { RRResetInterval } from "@calcom/prisma/enums"; import { filterHostsByLeadThreshold, errorCodes } from "./filterHostsByLeadThreshold"; diff --git a/packages/lib/server/repository/membership.ts b/packages/lib/server/repository/membership.ts index 73ca74fa5a..efab4aac26 100644 --- a/packages/lib/server/repository/membership.ts +++ b/packages/lib/server/repository/membership.ts @@ -1,5 +1,5 @@ import { availabilityUserSelect, prisma, type PrismaTransaction, type PrismaClient } from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import type { Prisma, Membership } from "@calcom/prisma/client"; import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; diff --git a/packages/lib/server/repository/workflow.ts b/packages/lib/server/repository/workflow.ts index da78c4cae9..50a14c0ce5 100644 --- a/packages/lib/server/repository/workflow.ts +++ b/packages/lib/server/repository/workflow.ts @@ -8,7 +8,7 @@ import type { WorkflowStep } from "@calcom/ee/workflows/lib/types"; import { hasFilter } from "@calcom/features/filters/lib/hasFilter"; import { HttpError } from "@calcom/lib/http-error"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import type { Prisma } from "@calcom/prisma/client"; import { WorkflowMethods } from "@calcom/prisma/enums"; import type { TFilteredListInputSchema } from "@calcom/trpc/server/routers/viewer/workflows/filteredList.schema"; diff --git a/packages/lib/service/attribute/utils.ts b/packages/lib/service/attribute/utils.ts index 7edaad5d6f..789bc4b0e7 100644 --- a/packages/lib/service/attribute/utils.ts +++ b/packages/lib/service/attribute/utils.ts @@ -2,7 +2,7 @@ * Utility functions for attribute service. Shared across server and client. */ import slugify from "@calcom/lib/slugify"; -import { AttributeType } from "@calcom/prisma/client"; +import { AttributeType } from "@calcom/prisma/enums"; import type { AttributeOptionAssignment, BulkAttributeAssigner } from "./types"; diff --git a/packages/trpc/server/routers/viewer/admin/getSMSLockStateTeamsUsers.handler.ts b/packages/trpc/server/routers/viewer/admin/getSMSLockStateTeamsUsers.handler.ts index dcf438c3de..3fb62df21d 100644 --- a/packages/trpc/server/routers/viewer/admin/getSMSLockStateTeamsUsers.handler.ts +++ b/packages/trpc/server/routers/viewer/admin/getSMSLockStateTeamsUsers.handler.ts @@ -1,5 +1,5 @@ import { prisma } from "@calcom/prisma"; -import { SMSLockState } from "@calcom/prisma/client"; +import { SMSLockState } from "@calcom/prisma/enums"; import type { TrpcSessionUser } from "../../../types"; diff --git a/packages/trpc/server/routers/viewer/admin/setSMSLockState.handler.ts b/packages/trpc/server/routers/viewer/admin/setSMSLockState.handler.ts index 505013cb16..59828b948c 100644 --- a/packages/trpc/server/routers/viewer/admin/setSMSLockState.handler.ts +++ b/packages/trpc/server/routers/viewer/admin/setSMSLockState.handler.ts @@ -1,5 +1,5 @@ import { prisma } from "@calcom/prisma"; -import { SMSLockState } from "@calcom/prisma/client"; +import { SMSLockState } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/attributes/create.handler.ts b/packages/trpc/server/routers/viewer/attributes/create.handler.ts index 4f75ac1dfb..b7b5d5e193 100644 --- a/packages/trpc/server/routers/viewer/attributes/create.handler.ts +++ b/packages/trpc/server/routers/viewer/attributes/create.handler.ts @@ -3,7 +3,8 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permi import slugify from "@calcom/lib/slugify"; import prisma from "@calcom/prisma"; import type { Attribute } from "@calcom/prisma/client"; -import { Prisma, MembershipRole } from "@calcom/prisma/client"; +import { Prisma } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/attributes/delete.handler.ts b/packages/trpc/server/routers/viewer/attributes/delete.handler.ts index 714e18f6b5..2a347f8e84 100644 --- a/packages/trpc/server/routers/viewer/attributes/delete.handler.ts +++ b/packages/trpc/server/routers/viewer/attributes/delete.handler.ts @@ -1,7 +1,7 @@ import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/attributes/edit.handler.ts b/packages/trpc/server/routers/viewer/attributes/edit.handler.ts index 4be352cee0..960b37d8d1 100644 --- a/packages/trpc/server/routers/viewer/attributes/edit.handler.ts +++ b/packages/trpc/server/routers/viewer/attributes/edit.handler.ts @@ -2,7 +2,7 @@ import { Resource } from "@calcom/features/pbac/domain/types/permission-registry import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; import slugify from "@calcom/lib/slugify"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/attributes/toggleActive.handler.ts b/packages/trpc/server/routers/viewer/attributes/toggleActive.handler.ts index e9b19522f3..0c9e53afc3 100644 --- a/packages/trpc/server/routers/viewer/attributes/toggleActive.handler.ts +++ b/packages/trpc/server/routers/viewer/attributes/toggleActive.handler.ts @@ -1,7 +1,7 @@ import { Resource } from "@calcom/features/pbac/domain/types/permission-registry"; import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permissions"; import prisma from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts index ebf03e1f14..8d8423ef09 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts @@ -19,7 +19,7 @@ import { ScheduleRepository } from "@calcom/lib/server/repository/schedule"; import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService"; import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts"; import type { PrismaClient } from "@calcom/prisma"; -import { WorkflowTriggerEvents } from "@calcom/prisma/client"; +import { WorkflowTriggerEvents } from "@calcom/prisma/enums"; import { SchedulingType, EventTypeAutoTranslatedField, RRTimestampBasis } from "@calcom/prisma/enums"; import { eventTypeAppMetadataOptionalSchema } from "@calcom/prisma/zod-utils"; import { eventTypeLocations } from "@calcom/prisma/zod-utils"; diff --git a/packages/trpc/server/routers/viewer/me/checkForInvalidAppCredentials.ts b/packages/trpc/server/routers/viewer/me/checkForInvalidAppCredentials.ts index 31f0b855a3..f723b6e735 100644 --- a/packages/trpc/server/routers/viewer/me/checkForInvalidAppCredentials.ts +++ b/packages/trpc/server/routers/viewer/me/checkForInvalidAppCredentials.ts @@ -1,7 +1,7 @@ import { getAppFromSlug } from "@calcom/app-store/utils"; import { type InvalidAppCredentialBannerProps } from "@calcom/features/users/components/InvalidAppCredentialsBanner"; import { prisma } from "@calcom/prisma"; -import { MembershipRole } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import type { TrpcSessionUser } from "@calcom/trpc/server/types"; type checkInvalidAppCredentialsOptions = { diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts index bfed607ab4..71ff80d08a 100644 --- a/packages/trpc/server/routers/viewer/slots/util.ts +++ b/packages/trpc/server/routers/viewer/slots/util.ts @@ -53,8 +53,7 @@ import type { TeamRepository } from "@calcom/lib/server/repository/team"; import type { UserRepository } from "@calcom/lib/server/repository/user"; import { withSelectedCalendars } from "@calcom/lib/server/repository/user"; import getSlots from "@calcom/lib/slots"; -import { PeriodType } from "@calcom/prisma/client"; -import { SchedulingType } from "@calcom/prisma/enums"; +import { SchedulingType, PeriodType } from "@calcom/prisma/enums"; import type { EventBusyDate, EventBusyDetails } from "@calcom/types/Calendar"; import type { CredentialForCalendarService } from "@calcom/types/Credential";