fix: Update prisma enums to platform libs (#23604)

* fix: Cant import from prisma/enums, import requires platform-libraries

* Bumped @calcom/prisma-libraries

* Migrate a leftover @calcom/prisma/client import

* Added missing WorkflowTriggerEvents
This commit is contained in:
Alex van Andel
2025-09-04 23:51:49 +00:00
committed by GitHub
parent 6f05142447
commit 0bf95ec568
36 changed files with 51 additions and 45 deletions
+1 -1
View File
@@ -38,7 +38,7 @@
"@axiomhq/winston": "^1.2.0",
"@calcom/platform-constants": "*",
"@calcom/platform-enums": "*",
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.338",
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.340",
"@calcom/platform-types": "*",
"@calcom/platform-utils": "*",
"@calcom/prisma": "*",
@@ -57,6 +57,7 @@ import {
getBookingForReschedule,
ErrorCode,
} from "@calcom/platform-libraries";
import { CreationSource } from "@calcom/platform-libraries";
import {
GetBookingsInput_2024_04_15,
CancelBookingInput_2024_04_15,
@@ -64,7 +65,6 @@ 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;
@@ -29,6 +29,7 @@ import { NextApiRequest } from "next/types";
import { v4 as uuidv4 } from "uuid";
import { z } from "zod";
import { CreationSource } from "@calcom/platform-libraries";
import { EventTypeMetaDataSchema } from "@calcom/platform-libraries/event-types";
import {
CancelBookingInput,
@@ -45,7 +46,6 @@ 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;
@@ -30,6 +30,7 @@ import {
NoticeThresholdUnitEnum,
FrequencyInput,
} from "@calcom/platform-enums";
import { SchedulingType } from "@calcom/platform-libraries";
import {
ApiSuccessResponse,
CreateEventTypeInput_2024_06_14,
@@ -39,7 +40,6 @@ import {
NotesDefaultFieldInput_2024_06_14,
UpdateEventTypeInput_2024_06_14,
} from "@calcom/platform-types";
import { SchedulingType } from "@calcom/prisma/enums";
const orderBySlug = (a: { slug: string }, b: { slug: string }) => {
if (a.slug < b.slug) return -1;
+1 -1
View File
@@ -1,4 +1,4 @@
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export const SYSTEM_ADMIN_ROLE = "SYSADMIN";
export const ORG_ROLES = [
@@ -1,5 +1,5 @@
import { Reflector } from "@nestjs/core";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export const MembershipRoles = Reflector.createDecorator<MembershipRole[]>();
@@ -6,7 +6,7 @@ import { UserWithProfile } from "@/modules/users/users.repository";
import { Injectable, CanActivate, ExecutionContext, ForbiddenException } from "@nestjs/common";
import { Reflector } from "@nestjs/core";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
@Injectable()
export class OrganizationRolesGuard implements CanActivate {
@@ -1,7 +1,7 @@
import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
import { Injectable } from "@nestjs/common";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
@Injectable()
export class MembershipsRepository {
@@ -35,7 +35,7 @@ import { ApiOperation, ApiTags as DocsTags, ApiHeader } from "@nestjs/swagger";
import { User } from "@prisma/client";
import { SUCCESS_STATUS, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
@Controller({
path: "/v2/oauth-clients/:clientId/users",
@@ -21,8 +21,8 @@ import { Webhook } from "@prisma/client";
import { plainToClass } from "class-transformer";
import { SUCCESS_STATUS, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
import { MembershipRole } from "@calcom/platform-libraries";
import { SkipTakePagination } from "@calcom/platform-types";
import { MembershipRole } from "@calcom/prisma/enums";
import { OAuthClientGuard } from "../../guards/oauth-client-guard";
@@ -5,12 +5,10 @@ import { MembershipRoles } from "@/modules/auth/decorators/roles/membership-role
import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
import { OrganizationRolesGuard } from "@/modules/auth/guards/organization-roles/organization-roles.guard";
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 { CreateOAuthClientResponseDto } from "@/modules/oauth-clients/controllers/oauth-clients/responses/CreateOAuthClientResponse.dto";
import { GetOAuthClientResponseDto } from "@/modules/oauth-clients/controllers/oauth-clients/responses/GetOAuthClientResponse.dto";
import { GetOAuthClientsResponseDto } from "@/modules/oauth-clients/controllers/oauth-clients/responses/GetOAuthClientsResponse.dto";
import { OAuthClientGuard } from "@/modules/oauth-clients/guards/oauth-client-guard";
import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
import { OAuthClientUsersOutputService } from "@/modules/oauth-clients/services/oauth-clients-users-output.service";
import { OAuthClientsService } from "@/modules/oauth-clients/services/oauth-clients/oauth-clients.service";
import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
@@ -39,8 +37,8 @@ import {
} from "@nestjs/swagger";
import { SUCCESS_STATUS } from "@calcom/platform-constants";
import { MembershipRole } from "@calcom/platform-libraries";
import { CreateOAuthClientInput, UpdateOAuthClientInput, Pagination } from "@calcom/platform-types";
import { MembershipRole } from "@calcom/prisma/enums";
@Controller({
path: "/v2/oauth-clients",
@@ -11,7 +11,7 @@ import { BadRequestException, ConflictException, Injectable, Logger } from "@nes
import { User, PlatformOAuthClient } from "@prisma/client";
import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries";
import { CreationSource } from "@calcom/prisma/enums";
import { CreationSource } from "@calcom/platform-libraries";
@Injectable()
export class OAuthClientUsersService {
@@ -11,7 +11,7 @@ import {
ValidateNested,
} from "class-validator";
import { AttributeType } from "@calcom/prisma/enums";
import { AttributeType } from "@calcom/platform-libraries";
export class CreateOrganizationAttributeInput {
@IsString()
@@ -1,7 +1,7 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsEnum, IsOptional, IsString } from "class-validator";
import { AttributeType } from "@calcom/prisma/enums";
import { AttributeType } from "@calcom/platform-libraries";
export class UpdateOrganizationAttributeInput {
@IsString()
@@ -24,6 +24,7 @@ import {
ConfirmationPolicyEnum,
NoticeThresholdUnitEnum,
} from "@calcom/platform-enums";
import { SchedulingType } from "@calcom/platform-libraries";
import {
ApiSuccessResponse,
CreateTeamEventTypeInput_2024_06_14,
@@ -33,7 +34,6 @@ 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", () => {
@@ -7,12 +7,12 @@ import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
import { UsersRepository } from "@/modules/users/users.repository";
import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
import { SchedulingType } from "@calcom/platform-libraries";
import {
CreateTeamEventTypeInput_2024_06_14,
UpdateTeamEventTypeInput_2024_06_14,
HostPriority,
} from "@calcom/platform-types";
import { SchedulingType } from "@calcom/prisma/client";
export type TransformedCreateTeamEventTypeInput = Awaited<
ReturnType<InstanceType<typeof InputOrganizationsEventTypesService>["transformInputCreateTeamEventType"]>
@@ -12,8 +12,8 @@ import type {
CalVideoSettings,
} from "@prisma/client";
import { SchedulingType } from "@calcom/platform-libraries";
import { HostPriority, TeamEventTypeResponseHost } from "@calcom/platform-types";
import { SchedulingType } from "@calcom/prisma/enums";
type EventTypeRelations = {
users: User[];
@@ -1,7 +1,7 @@
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class CreateOrgMembershipDto {
@IsInt()
@@ -1,7 +1,7 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsOptional, IsEnum } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class UpdateOrgMembershipDto {
@IsOptional()
@@ -3,8 +3,8 @@ import { Expose, Type } from "class-transformer";
import { IsEnum, IsString, ValidateNested } from "class-validator";
import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
import { MembershipRole } from "@calcom/platform-libraries";
import { OrgTeamOutputDto } from "@calcom/platform-types";
import { MembershipRole } from "@calcom/prisma/enums";
export class OrgMeTeamOutputDto extends OrgTeamOutputDto {
@IsString()
@@ -1,7 +1,7 @@
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class CreateOrgTeamMembershipDto {
@IsInt()
@@ -1,7 +1,7 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsOptional, IsEnum } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class UpdateOrgTeamMembershipDto {
@IsOptional()
@@ -2,7 +2,7 @@ import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsString, IsOptional, IsBoolean, IsEnum } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class CreateOrganizationUserInput extends CreateUserInput {
@IsOptional()
@@ -8,7 +8,7 @@ import { Team } from "@prisma/client";
import { plainToInstance } from "class-transformer";
import { createNewUsersConnectToOrgIfExists } from "@calcom/platform-libraries";
import { CreationSource } from "@calcom/prisma/enums";
import { CreationSource } from "@calcom/platform-libraries";
@Injectable()
export class OrganizationsUsersService {
@@ -1,7 +1,7 @@
import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class CreateTeamMembershipInput {
@IsInt()
@@ -1,7 +1,7 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsBoolean, IsOptional, IsEnum } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class UpdateTeamMembershipInput {
@IsOptional()
@@ -2,7 +2,7 @@ import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
import { Expose, Transform, Type } from "class-transformer";
import { IsBoolean, IsInt, IsObject, IsOptional, IsString, ValidateNested } from "class-validator";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
class MembershipUserOutputDto {
@IsOptional()
@@ -5,7 +5,7 @@ import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-us
import { Injectable, NotFoundException } from "@nestjs/common";
import type { Profile, User, Team, Prisma } from "@prisma/client";
import { CreationSource } from "@calcom/prisma/enums";
import { CreationSource } from "@calcom/platform-libraries";
export type UserWithProfile = User & {
movedToProfile?: (Profile & { organization: Pick<Team, "isPlatform" | "id" | "slug" | "name"> }) | null;
@@ -1,7 +1,7 @@
import { ApiProperty, ApiPropertyOptional, PartialType } from "@nestjs/swagger";
import { IsArray, IsBoolean, IsEnum, IsOptional, IsString } from "class-validator";
import { WebhookTriggerEvents } from "@calcom/prisma/enums";
import { WebhookTriggerEvents } from "@calcom/platform-libraries";
export class CreateWebhookInputDto {
@IsString()
@@ -3,7 +3,7 @@ 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";
import { WebhookTriggerEvents } from "@calcom/platform-libraries";
export class WebhookOutputDto {
@IsInt()
@@ -2,7 +2,7 @@ import { ApiProperty } from "@nestjs/swagger";
import { Type } from "class-transformer";
import { IsNumber, IsBoolean, IsString, ValidateNested, IsIn } from "class-validator";
import { WorkflowActions, WorkflowTemplates } from "@calcom/prisma/enums";
import { WorkflowActions, WorkflowTemplates } from "@calcom/platform-libraries";
export const EMAIL_HOST = "email_host";
export const EMAIL_ATTENDEE = "email_attendee";
@@ -2,7 +2,7 @@ import { ApiProperty } from "@nestjs/swagger";
import { Type } from "class-transformer";
import { IsIn, IsNumber, IsString, ValidateNested } from "class-validator";
import { TimeUnit, WorkflowTriggerEvents } from "@calcom/prisma/enums";
import { TimeUnit, WorkflowTriggerEvents } from "@calcom/platform-libraries";
export const BEFORE_EVENT = "beforeEvent";
export const EVENT_CANCELLED = "eventCancelled";
@@ -3,11 +3,11 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
import { UserWithProfile } from "@/modules/users/users.repository";
import { Injectable } from "@nestjs/common";
import { TimeUnit, WorkflowTriggerEvents } from "@calcom/platform-libraries";
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[] };
@@ -3,7 +3,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
import { TestingModule } from "@nestjs/testing";
import { Membership, Prisma, Team, User } from "@prisma/client";
import { MembershipRole } from "@calcom/prisma/enums";
import { MembershipRole } from "@calcom/platform-libraries";
export class MembershipRepositoryFixture {
private prismaReadClient: PrismaReadService["prisma"];
+12 -4
View File
@@ -17,7 +17,6 @@ import { getRoutedUrl } from "@calcom/lib/server/getRoutedUrl";
import { getTeamMemberEmailForResponseOrContactUsingUrlQuery } from "@calcom/lib/server/getTeamMemberEmailFromCrm";
import { getTranslation } from "@calcom/lib/server/i18n";
import type { Prisma } from "@calcom/prisma/client";
import { MembershipRole } from "@calcom/prisma/enums";
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
import { paymentDataSelect } from "@calcom/prisma/selects/payment";
import { createNewUsersConnectToOrgIfExists } from "@calcom/trpc/server/routers/viewer/teams/inviteMember/utils";
@@ -27,7 +26,18 @@ export { getBookingForReschedule };
export type { EventBusyDate } from "@calcom/types/Calendar";
export { SchedulingType, PeriodType } from "@calcom/prisma/enums";
export {
CreationSource,
SchedulingType,
PeriodType,
AttributeType,
MembershipRole,
TimeUnit,
WebhookTriggerEvents,
WorkflowTriggerEvents,
WorkflowActions,
WorkflowTemplates,
} from "@calcom/prisma/enums";
export { getUsernameList } from "@calcom/lib/defaultEvents";
@@ -95,8 +105,6 @@ export type TeamQuery = Prisma.TeamGetPayload<{
}>;
export { credentialForCalendarServiceSelect };
export { MembershipRole };
export { paymentDataSelect };
export { getClientSecretFromPayment };
+5 -5
View File
@@ -2708,7 +2708,7 @@ __metadata:
"@axiomhq/winston": ^1.2.0
"@calcom/platform-constants": "*"
"@calcom/platform-enums": "*"
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.338"
"@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.340"
"@calcom/platform-types": "*"
"@calcom/platform-utils": "*"
"@calcom/prisma": "*"
@@ -3767,13 +3767,13 @@ __metadata:
languageName: unknown
linkType: soft
"@calcom/platform-libraries@npm:@calcom/platform-libraries@0.0.338":
version: 0.0.338
resolution: "@calcom/platform-libraries@npm:0.0.338"
"@calcom/platform-libraries@npm:@calcom/platform-libraries@0.0.340":
version: 0.0.340
resolution: "@calcom/platform-libraries@npm:0.0.340"
dependencies:
"@calcom/features": "*"
"@calcom/lib": "*"
checksum: d44d2bbbd636803dfb7767566535fd995135ae9db5dabfafee76a9431d24f38b8e088446a64f056880295e1f001671a107e7ae4615e056d792e6ac9c6a609dc1
checksum: 19c2f125fc6b3074314365a19894e86a709243ccf29a5315468ff5e8f9767a4b2cc618cd5e4797c37f1e46c8a4f6937b3063b85b5f26157ba65d84ab664d7298
languageName: node
linkType: hard