From 6840642cb729d4db82ca4ff0bcc018b36223f43e Mon Sep 17 00:00:00 2001 From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Date: Mon, 12 Jan 2026 16:24:08 +0200 Subject: [PATCH] chore: esModuleInterop: true api v2 tsconfig (#26752) * chore: api v2 esModuleInterop * chore: api v2 esModuleInterop --- apps/api/v2/src/app.e2e-spec.ts | 22 +++-- apps/api/v2/src/bootstrap.ts | 2 +- .../bookings.controller.e2e-spec.ts | 33 ++++--- .../managed-user-bookings.e2e-spec.ts | 37 ++++---- .../controllers/e2e/add-guests.e2e-spec.ts | 45 +++++----- .../e2e/api-key-bookings.e2e-spec.ts | 61 +++++++------ .../e2e/booking-access-auth.e2e-spec.ts | 25 +++--- .../e2e/booking-fields.e2e-spec.ts | 39 +++++---- .../e2e/calendar-links.e2e-spec.ts | 23 +++-- .../e2e/confirm-bookings.e2e-spec.ts | 25 +++--- .../e2e/emails/confirm-emails.e2e-spec.ts | 63 +++++++------- .../e2e/emails/team-emails.e2e-spec.ts | 49 ++++++----- .../e2e/emails/user-emails.e2e-spec.ts | 57 ++++++------- .../e2e/managed-user-bookings.e2e-spec.ts | 79 +++++++++-------- .../e2e/reassign-bookings.e2e-spec.ts | 33 ++++--- .../e2e/recurring-bookings.e2e-spec.ts | 37 ++++---- .../e2e/reschedule-bookings.e2e-spec.ts | 35 ++++---- .../e2e/seated-bookings.e2e-spec.ts | 57 ++++++------- .../controllers/e2e/team-bookings.e2e-spec.ts | 43 +++++----- .../e2e/update-booking-location.e2e-spec.ts | 41 +++++---- .../controllers/e2e/user-bookings.e2e-spec.ts | 85 +++++++++---------- .../e2e/variable-length-bookings.e2e-spec.ts | 37 ++++---- .../calendars.controller.e2e-spec.ts | 50 +++++------ ...types-private-links.controller.e2e-spec.ts | 34 ++++---- .../event-types.controller.e2e-spec.ts | 65 +++++++------- .../event-types.controller.e2e-spec.ts | 71 ++++++++-------- .../src/ee/gcal/gcal.controller.e2e-spec.ts | 21 +++-- .../v2/src/ee/me/me.controller.e2e-spec.ts | 25 +++--- .../schedules.controller.e2e-spec.ts | 27 +++--- .../schedules.controller.e2e-spec.ts | 33 ++++--- apps/api/v2/src/main.ts | 2 +- .../controllers/oauth2.controller.e2e-spec.ts | 27 +++--- .../billing.controller.e2e-spec.ts | 21 +++-- .../conferencing.controller.e2e-spec.ts | 29 +++---- ...stination-calendars.controller.e2e-spec.ts | 28 +++--- ...vent-types-webhooks.controller.e2e-spec.ts | 23 +++-- .../oauth-client-users.controller.e2e-spec.ts | 37 ++++---- ...uth-client-webhooks.controller.e2e-spec.ts | 27 +++--- .../oauth-clients.controller.e2e-spec.ts | 45 +++++----- .../oauth-flow.controller.e2e-spec.ts | 29 +++---- .../organization-attributes.e2e-spec.ts | 21 +++-- ...rganization-attributes-options.e2e-spec.ts | 29 +++---- ...anizations-bookings.controller.e2e-spec.ts | 47 +++++----- ...anizations-bookings.controller.e2e-spec.ts | 47 +++++----- .../assign-all-team-members.e2e-spec.ts | 57 ++++++------- ...in-not-team-member-event-types.e2e-spec.ts | 43 +++++----- ...ions-event-types-private-links.e2e-spec.ts | 27 +++--- ...-member-team-admin-event-types.e2e-spec.ts | 43 +++++----- ...izations-membership.controller.e2e-spec.ts | 27 +++--- ...tions-organizations.controller.e2e-spec.ts | 69 ++++++++------- ...organizations-roles.controller.e2e-spec.ts | 31 ++++--- ...s-roles-permissions.controller.e2e-spec.ts | 27 +++--- ...ing-forms-responses.controller.e2e-spec.ts | 19 ++--- ...tions-routing-forms.controller.e2e-spec.ts | 21 +++-- .../organizations-schedules.e2e-spec.ts | 33 ++++--- ...ions-teams-bookings.controller.e2e-spec.ts | 47 +++++----- ...organizations-teams.controller.e2e-spec.ts | 23 +++-- ...ations-teams-invite.controller.e2e-spec.ts | 17 ++-- ...s-memberships-guard.controller.e2e-spec.ts | 36 ++++---- ...s-teams-memberships.controller.e2e-spec.ts | 25 +++--- ...zations-teams-roles.controller.e2e-spec.ts | 31 ++++--- ...s-roles-permissions.controller.e2e-spec.ts | 25 +++--- ...ing-forms-responses.controller.e2e-spec.ts | 21 +++-- ...teams-routing-forms.controller.e2e-spec.ts | 21 +++-- .../organizations-teams-schedules.e2e-spec.ts | 27 +++--- ...-verified-resources.controller.e2e-spec.ts | 35 ++++---- .../org-team-workflows.controller.e2e-spec.ts | 41 +++++---- .../organizations-users-bookings.e2e-spec.ts | 37 ++++---- .../organizations-users.e2e-spec.ts | 25 +++--- .../organizations-users-ooo.e2e-spec.ts | 19 ++--- .../organizations-webhooks.e2e-spec.ts | 25 +++--- .../controllers/routing-forms.e2e-spec.ts | 27 +++--- .../selected-calendars.controller.e2e-spec.ts | 27 +++--- .../controllers/slots.controller.e2e-spec.ts | 25 +++--- .../services/slots-worker.service.ts | 2 +- ...ic-event-type-slots.controller.e2e-spec.ts | 27 +++--- ...am-event-type-slots.controller.e2e-spec.ts | 31 ++++--- ...eschedule-uid-slots.controller.e2e-spec.ts | 25 +++--- ...am-event-type-slots.controller.e2e-spec.ts | 53 ++++++------ ...er-event-type-slots.controller.e2e-spec.ts | 49 ++++++----- ...vent-types-webhooks.controller.e2e-spec.ts | 27 +++--- .../teams-event-types.controller.e2e-spec.ts | 39 +++++---- .../teams-memberships.controller.e2e-spec.ts | 31 ++++--- .../controllers/teams-schedules.e2e-spec.ts | 19 ++--- .../controllers/teams.controller.e2e-spec.ts | 32 ++++--- .../v2/src/modules/tokens/tokens.service.ts | 7 +- .../users/validators/timeZoneValidator.ts | 7 +- .../webhooks.controller.e2e-spec.ts | 21 +++-- apps/api/v2/tsconfig.json | 1 + biome.json | 2 +- 90 files changed, 1439 insertions(+), 1531 deletions(-) diff --git a/apps/api/v2/src/app.e2e-spec.ts b/apps/api/v2/src/app.e2e-spec.ts index 0e80bd592a..1f9ebc4018 100644 --- a/apps/api/v2/src/app.e2e-spec.ts +++ b/apps/api/v2/src/app.e2e-spec.ts @@ -1,13 +1,8 @@ -import { AppModule } from "@/app.module"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { CustomThrottlerGuard } from "@/lib/throttler-guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; +import type { PlatformOAuthClient, RateLimit, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; -import { TestingModule } from "@nestjs/testing"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import { Test, TestingModule } from "@nestjs/testing"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -16,9 +11,12 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { RateLimitRepositoryFixture } from "test/fixtures/repository/rate-limit.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; -import type { User, PlatformOAuthClient, Team, RateLimit } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { CustomThrottlerGuard } from "@/lib/throttler-guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("AppController", () => { describe("Rate limiting", () => { diff --git a/apps/api/v2/src/bootstrap.ts b/apps/api/v2/src/bootstrap.ts index 22a2139804..34384cc731 100644 --- a/apps/api/v2/src/bootstrap.ts +++ b/apps/api/v2/src/bootstrap.ts @@ -12,7 +12,7 @@ import { import type { ValidationError } from "@nestjs/common"; import { BadRequestException, ValidationPipe, VersioningType } from "@nestjs/common"; import type { NestExpressApplication } from "@nestjs/platform-express"; -import * as cookieParser from "cookie-parser"; +import cookieParser from "cookie-parser"; import { Request } from "express"; import helmet from "helmet"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; diff --git a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts index 5ff0a3d9d2..efe79698ab 100644 --- a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.e2e-spec.ts @@ -1,5 +1,20 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { BookingResponse } from "@calcom/platform-libraries"; +import { type RegularBookingCreateResult } from "@calcom/platform-libraries/bookings"; +import type { ApiErrorResponse, ApiSuccessResponse } from "@calcom/platform-types"; +import type { User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateBookingInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/create-booking.input"; import { CreateRecurringBookingInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/create-recurring-booking.input"; import { GetBookingOutput_2024_04_15 } from "@/ee/bookings/2024-04-15/outputs/get-booking.output"; @@ -10,22 +25,6 @@ import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { BookingResponse } from "@calcom/platform-libraries"; -import { type RegularBookingCreateResult } from "@calcom/platform-libraries/bookings"; -import type { ApiSuccessResponse, ApiErrorResponse } from "@calcom/platform-types"; -import type { User } from "@calcom/prisma/client"; describe("Bookings Endpoints 2024-04-15", () => { describe("User Authenticated", () => { diff --git a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/managed-user-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/managed-user-bookings.e2e-spec.ts index 4f9efed5aa..542bf21c46 100644 --- a/apps/api/v2/src/ee/bookings/2024-04-15/controllers/managed-user-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-04-15/controllers/managed-user-bookings.e2e-spec.ts @@ -1,5 +1,22 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; +import { + ApiSuccessResponse, + CreateEventTypeInput_2024_06_14, + EventTypeOutput_2024_06_14, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateBookingInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/create-booking.input"; import { GetBookingsDataEntry, @@ -15,24 +32,6 @@ import { import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service"; import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; -import { - ApiSuccessResponse, - CreateEventTypeInput_2024_06_14, - EventTypeOutput_2024_06_14, -} from "@calcom/platform-types"; -import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; const CLIENT_REDIRECT_URI = "http://localhost:4321"; diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/add-guests.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/add-guests.e2e-spec.ts index f85368a3df..6450220a98 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/add-guests.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/add-guests.e2e-spec.ts @@ -1,25 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { AddGuestsOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/add-guests.output"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - import { CAL_API_VERSION_HEADER, ERROR_STATUS, @@ -32,7 +10,28 @@ import { OrganizerAddGuestsEmail, } from "@calcom/platform-libraries/emails"; import type { BookingOutput_2024_08_13, CreateBookingInput_2024_08_13 } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { AddGuestsOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/add-guests.output"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; const attendeeAddGuestsEmailSpy = jest .spyOn(AttendeeAddGuestsEmail.prototype, "getHtml") diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts index 00e82d98c8..982e9d5829 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts @@ -1,5 +1,32 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import { + AttendeeCancelledEmail, + AttendeeRescheduledEmail, + AttendeeScheduledEmail, + OrganizerCancelledEmail, + OrganizerRescheduledEmail, + OrganizerScheduledEmail, +} from "@calcom/platform-libraries/emails"; +import { + BookingOutput_2024_08_13, + CancelBookingInput_2024_08_13, + CreateBookingInput_2024_08_13, + RescheduleBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output"; import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; @@ -9,34 +36,6 @@ import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import { - AttendeeScheduledEmail, - OrganizerScheduledEmail, - AttendeeRescheduledEmail, - OrganizerRescheduledEmail, - AttendeeCancelledEmail, - OrganizerCancelledEmail, -} from "@calcom/platform-libraries/emails"; -import { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RescheduleBookingInput_2024_08_13, - CancelBookingInput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; jest.spyOn(AttendeeScheduledEmail.prototype as any, "getHtml").mockImplementation(async function () { return "Mocked Email Content"; @@ -217,7 +216,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const data: BookingOutput_2024_08_13 = responseBody.data; expect(data.reschedulingReason).toEqual(body.reschedulingReason); expect(data.start).toEqual(body.start); @@ -263,7 +262,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const data: BookingOutput_2024_08_13 = responseBody.data; expect(data.id).toBeDefined(); expect(data.uid).toBeDefined(); diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-access-auth.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-access-auth.e2e-spec.ts index 3c5d6a97ed..68f9adea82 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-access-auth.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-access-auth.e2e-spec.ts @@ -1,16 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CalVideoService } from "@/ee/bookings/2024-08-13/services/cal-video.service"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; @@ -19,9 +12,15 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { Booking, User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CalVideoService } from "@/ee/bookings/2024-08-13/services/cal-video.service"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Booking access authorization", () => { diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts index 21e894270d..8e480f4fab 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts @@ -1,16 +1,15 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { Booking, EventType, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -18,15 +17,15 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import { - CreateBookingInput_2024_08_13, - GetBookingOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import { BookingOutput_2024_08_13 } from "@calcom/platform-types"; -import type { Booking, PlatformOAuthClient, Team, User, EventType } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Booking fields", () => { @@ -779,7 +778,7 @@ describe("Bookings Endpoints 2024-08-13", () => { if (responseDataIsBooking(responseBody.data)) { // eslint-disable-next-line - // @ts-ignore + // @ts-expect-error const data: GetSeatedBookingOutput_2024_08_13 = responseBody.data; expect(data.attendees[0].name).toEqual(`${splitName.firstName} ${splitName.lastName}`); expect(data.attendees[0].bookingFieldsResponses.name).toEqual(splitName); diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/calendar-links.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/calendar-links.e2e-spec.ts index ec4c4da3f3..d1f13afb73 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/calendar-links.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/calendar-links.e2e-spec.ts @@ -1,15 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -17,9 +11,14 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { User, Booking, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Calendar Links", () => { diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/confirm-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/confirm-bookings.e2e-spec.ts index 6d01633802..e1057ebb6d 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/confirm-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/confirm-bookings.e2e-spec.ts @@ -1,15 +1,10 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import { BookingOutput_2024_08_13, GetBookingOutput_2024_08_13 } from "@calcom/platform-types"; +import type { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -17,10 +12,14 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import { BookingOutput_2024_08_13, GetBookingOutput_2024_08_13 } from "@calcom/platform-types"; -import type { User, Booking, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Bookings confirmation", () => { diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/confirm-emails.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/confirm-emails.e2e-spec.ts index ec7356da5a..9f51789679 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/confirm-emails.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/confirm-emails.e2e-spec.ts @@ -1,5 +1,35 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import { + AttendeeCancelledEmail, + AttendeeDeclinedEmail, + AttendeeRequestEmail, + AttendeeRescheduledEmail, + AttendeeScheduledEmail, + OrganizerCancelledEmail, + OrganizerRequestEmail, + OrganizerRescheduledEmail, + OrganizerScheduledEmail, +} from "@calcom/platform-libraries/emails"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingOutput_2024_08_13, + RescheduleBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; @@ -8,37 +38,6 @@ import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import { - OrganizerScheduledEmail, - AttendeeScheduledEmail, - OrganizerRescheduledEmail, - AttendeeRescheduledEmail, - OrganizerCancelledEmail, - AttendeeCancelledEmail, - AttendeeRequestEmail, - OrganizerRequestEmail, - AttendeeDeclinedEmail, -} from "@calcom/platform-libraries/emails"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RescheduleBookingInput_2024_08_13, - GetBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; jest .spyOn(AttendeeScheduledEmail.prototype, "getHtml") diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts index 4aaa1322d4..3e0284761a 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts @@ -1,27 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; import { AttendeeCancelledEmail, @@ -39,7 +15,30 @@ import type { CreateBookingInput_2024_08_13, RescheduleBookingInput_2024_08_13, } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; // Mock all email sending prototypes jest diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/user-emails.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/user-emails.e2e-spec.ts index 40964a8e69..9abed33b92 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/user-emails.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/user-emails.e2e-spec.ts @@ -1,5 +1,32 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import { + AttendeeCancelledEmail, + AttendeeRescheduledEmail, + AttendeeScheduledEmail, + OrganizerCancelledEmail, + OrganizerRescheduledEmail, + OrganizerScheduledEmail, +} from "@calcom/platform-libraries/emails"; +import type { + BookingOutput_2024_08_13, + CancelBookingInput_2024_08_13, + CreateBookingInput_2024_08_13, + RecurringBookingOutput_2024_08_13, + RescheduleBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output"; import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; @@ -10,34 +37,6 @@ import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import { - OrganizerScheduledEmail, - AttendeeScheduledEmail, - OrganizerRescheduledEmail, - AttendeeRescheduledEmail, - OrganizerCancelledEmail, - AttendeeCancelledEmail, -} from "@calcom/platform-libraries/emails"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RescheduleBookingInput_2024_08_13, - RecurringBookingOutput_2024_08_13, - CancelBookingInput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; jest .spyOn(AttendeeScheduledEmail.prototype, "getHtml") diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/managed-user-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/managed-user-bookings.e2e-spec.ts index 162051d181..4fff5d3e08 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/managed-user-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/managed-user-bookings.e2e-spec.ts @@ -1,29 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { HttpExceptionFilter } from "@/filters/http-exception.filter"; -import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; -import { Locales } from "@/lib/enums/locales"; -import { MembershipsModule } from "@/modules/memberships/memberships.module"; -import { - CreateManagedUserData, - CreateManagedUserOutput, -} from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output"; -import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service"; -import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, @@ -40,6 +14,31 @@ import { GetBookingsOutput_2024_08_13, } from "@calcom/platform-types"; import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { HttpExceptionFilter } from "@/filters/http-exception.filter"; +import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; +import { Locales } from "@/lib/enums/locales"; +import { MembershipsModule } from "@/modules/memberships/memberships.module"; +import { + CreateManagedUserData, + CreateManagedUserOutput, +} from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output"; +import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service"; +import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input"; +import { UsersModule } from "@/modules/users/users.module"; const CLIENT_REDIRECT_URI = "http://localhost:4321"; @@ -356,7 +355,7 @@ describe("Managed user bookings 2024-08-13", () => { const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getFirstManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data; expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount); @@ -369,7 +368,7 @@ describe("Managed user bookings 2024-08-13", () => { const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getSecondManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const secondManagedUserBookings: BookingOutput_2024_08_13[] = secondManagedUserBookingsResponseBody.data; expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount); @@ -408,7 +407,7 @@ describe("Managed user bookings 2024-08-13", () => { const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getFirstManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data; expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount); @@ -421,7 +420,7 @@ describe("Managed user bookings 2024-08-13", () => { const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getSecondManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const secondManagedUserBookings: BookingOutput_2024_08_13[] = secondManagedUserBookingsResponseBody.data; expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount); @@ -435,7 +434,7 @@ describe("Managed user bookings 2024-08-13", () => { const thirdManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getThirdManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const thirdManagedUserBookings: BookingOutput_2024_08_13[] = thirdManagedUserBookingsResponseBody.data; expect(thirdManagedUserBookings.length).toEqual(thirdManagedUserBookingsCount); }); @@ -473,7 +472,7 @@ describe("Managed user bookings 2024-08-13", () => { const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getFirstManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data; expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount); @@ -486,7 +485,7 @@ describe("Managed user bookings 2024-08-13", () => { const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getSecondManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const secondManagedUserBookings: BookingOutput_2024_08_13[] = secondManagedUserBookingsResponseBody.data; expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount); @@ -525,7 +524,7 @@ describe("Managed user bookings 2024-08-13", () => { const firstManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getFirstManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const firstManagedUserBookings: BookingOutput_2024_08_13[] = firstManagedUserBookingsResponseBody.data; expect(firstManagedUserBookings.length).toEqual(firstManagedUserBookingsCount); @@ -538,7 +537,7 @@ describe("Managed user bookings 2024-08-13", () => { const secondManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getSecondManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const secondManagedUserBookings: BookingOutput_2024_08_13[] = secondManagedUserBookingsResponseBody.data; expect(secondManagedUserBookings.length).toEqual(secondManagedUserBookingsCount); @@ -552,7 +551,7 @@ describe("Managed user bookings 2024-08-13", () => { const thirdManagedUserBookingsResponseBody: GetBookingsOutput_2024_08_13 = getThirdManagedUserBookings.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const thirdManagedUserBookings: BookingOutput_2024_08_13[] = thirdManagedUserBookingsResponseBody.data; expect(thirdManagedUserBookings.length).toEqual(thirdManagedUserBookingsCount); }); @@ -568,7 +567,7 @@ describe("Managed user bookings 2024-08-13", () => { const thirdManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const thirdManagedUserAttendeeBookings: BookingOutput_2024_08_13[] = thirdManagedUserAttendeeBookingsResponseBody.data; expect(thirdManagedUserBookingsCount).toEqual(2); @@ -584,7 +583,7 @@ describe("Managed user bookings 2024-08-13", () => { const thirdManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const thirdManagedUserAttendeeBookings: BookingOutput_2024_08_13[] = thirdManagedUserAttendeeBookingsResponseBody.data; expect(thirdManagedUserBookingsCount).toEqual(2); @@ -600,7 +599,7 @@ describe("Managed user bookings 2024-08-13", () => { const secondManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const secondManagedUserAttendeeBookings: BookingOutput_2024_08_13[] = secondManagedUserAttendeeBookingsResponseBody.data; expect(secondManagedUserBookingsCount).toEqual(4); @@ -616,7 +615,7 @@ describe("Managed user bookings 2024-08-13", () => { const secondManagedUserAttendeeBookingsResponseBody: GetBookingsOutput_2024_08_13 = response.body; // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const secondManagedUserAttendeeBookings: BookingOutput_2024_08_13[] = secondManagedUserAttendeeBookingsResponseBody.data; expect(secondManagedUserBookingsCount).toEqual(4); diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reassign-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reassign-bookings.e2e-spec.ts index 3f0c7eb352..72c37b73cf 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reassign-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reassign-bookings.e2e-spec.ts @@ -1,17 +1,10 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { ReassignBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reassign-booking.output"; -import { BOOKING_REASSIGN_PERMISSION_ERROR } from "@/ee/bookings/2024-08-13/services/bookings.service"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { CreateBookingInput_2024_08_13 } from "@calcom/platform-types"; +import type { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; @@ -23,10 +16,16 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { CreateBookingInput_2024_08_13 } from "@calcom/platform-types"; -import type { Booking, User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { ReassignBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reassign-booking.output"; +import { BOOKING_REASSIGN_PERMISSION_ERROR } from "@/ee/bookings/2024-08-13/services/bookings.service"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Reassign bookings", () => { @@ -666,7 +665,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(booking).toBeDefined(); expect(booking?.userId).toBeDefined(); - const initialHostId = booking!.userId!; + const initialHostId = booking?.userId!; rescheduleReasonBookingInitialHostId = initialHostId; const expectedInitialTitle = `${teamRoundRobinWithRescheduleReasonEventTypeTitle} between ${ @@ -708,7 +707,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(booking).toBeDefined(); expect(booking?.userId).toBeDefined(); - const currentHostId = booking!.userId!; + const currentHostId = booking?.userId!; const initialHostId = rescheduleReasonBookingInitialHostId; const initialHostName = initialHostId === teamUser1.id ? teamUser1.name : teamUser2.name; diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts index a16508cc4f..5c79586bb1 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts @@ -1,16 +1,15 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import { AttendeeCancelledEmail, OrganizerCancelledEmail } from "@calcom/platform-libraries/emails"; +import type { + CancelBookingInput_2024_08_13, + CreateRecurringBookingInput_2024_08_13, + RecurringBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -18,15 +17,15 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import { AttendeeCancelledEmail, OrganizerCancelledEmail } from "@calcom/platform-libraries/emails"; -import type { - CreateRecurringBookingInput_2024_08_13, - RecurringBookingOutput_2024_08_13, - CancelBookingInput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Creating recurring bookings", () => { diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reschedule-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reschedule-bookings.e2e-spec.ts index c291a7a101..29e27e5dc4 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reschedule-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/reschedule-bookings.e2e-spec.ts @@ -1,5 +1,21 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingOutput_2024_08_13, + RescheduleBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import type { EventType, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; @@ -8,23 +24,6 @@ import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RescheduleBookingInput_2024_08_13, - GetBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import type { EventType, User } from "@calcom/prisma/client"; describe("Reschedule bookings 2024-08-13", () => { let app: INestApplication; diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts index e55cedc911..dca23f60eb 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts @@ -1,5 +1,29 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { + CancelBookingInput_2024_08_13, + CancelSeatedBookingInput_2024_08_13, + CreateBookingInput_2024_08_13, + CreateSeatedBookingOutput_2024_08_13, + GetBookingOutput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + RescheduleSeatedBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import { DateTime } from "luxon"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { BookingSeatRepositoryFixture } from "test/fixtures/repository/booking-seat.repository.fixture"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; @@ -8,31 +32,6 @@ import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import { DateTime } from "luxon"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { BookingSeatRepositoryFixture } from "test/fixtures/repository/booking-seat.repository.fixture"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { - CancelBookingInput_2024_08_13, - CancelSeatedBookingInput_2024_08_13, - CreateSeatedBookingOutput_2024_08_13, - GetBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, - RescheduleSeatedBookingInput_2024_08_13, - CreateBookingInput_2024_08_13, -} from "@calcom/platform-types"; -import type { Team, User } from "@calcom/prisma/client"; describe("Bookings Endpoints 2024-08-13", () => { describe("Seated bookings", () => { @@ -332,7 +331,7 @@ describe("Bookings Endpoints 2024-08-13", () => { const expected = structuredClone(createdSeatedBooking); // note(Lauris): seatUid in get response resides only in each attendee object // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error delete expected.seatUid; expect(data).toEqual(expected); } else { @@ -359,7 +358,7 @@ describe("Bookings Endpoints 2024-08-13", () => { const seatedBookingExpected = structuredClone(createdSeatedBooking); // note(Lauris): seatUid in get response resides only in each attendee object // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error delete seatedBookingExpected.seatUid; expect(seatedBooking).toEqual(seatedBookingExpected); }); @@ -925,7 +924,7 @@ describe("Bookings Endpoints 2024-08-13", () => { }); function responseDataIsCreateSeatedBooking(data: any): data is CreateSeatedBookingOutput_2024_08_13 { - return data.hasOwnProperty("seatUid"); + return Object.hasOwn(data, "seatUid"); } function responseDataIsGetSeatedBooking(data: any): data is GetSeatedBookingOutput_2024_08_13 { diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts index 99243c9ea2..289e0acfc6 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts @@ -1,17 +1,17 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + RecurringBookingOutput_2024_08_13, + RescheduleBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; @@ -23,17 +23,16 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RecurringBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, - RescheduleBookingInput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("Team bookings", () => { diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/update-booking-location.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/update-booking-location.e2e-spec.ts index daedd7eb5f..d7526a5dd3 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/update-booking-location.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/update-booking-location.e2e-spec.ts @@ -1,16 +1,17 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { UpdateBookingLocationOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/update-location.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { + CAL_API_VERSION_HEADER, + ERROR_STATUS, + SUCCESS_STATUS, + VERSION_2024_08_13, +} from "@calcom/platform-constants"; +import type { BookingOutput_2024_08_13 } from "@calcom/platform-types"; +import { UpdateBookingLocationInput_2024_08_13 } from "@calcom/platform-types"; +import type { Team } from "@calcom/prisma/client"; +import { Booking } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -18,17 +19,15 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { - CAL_API_VERSION_HEADER, - ERROR_STATUS, - SUCCESS_STATUS, - VERSION_2024_08_13, -} from "@calcom/platform-constants"; -import { UpdateBookingLocationInput_2024_08_13 } from "@calcom/platform-types"; -import type { BookingOutput_2024_08_13 } from "@calcom/platform-types"; -import { Booking } from "@calcom/prisma/client"; -import type { Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { UpdateBookingLocationOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/update-location.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; type TestUser = { id: number; diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts index e7a1763c2e..1c61125d8b 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts @@ -1,5 +1,42 @@ -import { bootstrap } from "@/bootstrap"; +import { + CAL_API_VERSION_HEADER, + SUCCESS_STATUS, + VERSION_2024_06_14, + VERSION_2024_08_13, + X_CAL_CLIENT_ID, +} from "@calcom/platform-constants"; +import { EventManager } from "@calcom/platform-libraries/event-types"; +import type { + BookingOutput_2024_08_13, + CancelBookingInput_2024_08_13, + CreateBookingInput_2024_08_13, + CreateEventTypeInput_2024_06_14, + CreateRecurringBookingInput_2024_08_13, + GetBookingOutput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + MarkAbsentBookingInput_2024_08_13, + RecurringBookingOutput_2024_08_13, + RescheduleBookingInput_2024_08_13, +} from "@calcom/platform-types"; +import { FAILED_EVENT_TYPE_IDENTIFICATION_ERROR_MESSAGE } from "@calcom/platform-types"; +import type { Booking, EventType, PlatformOAuthClient, Team, User, Workflow } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import { advanceTo, clear } from "jest-date-mock"; +import request from "supertest"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { WorkflowRepositoryFixture } from "test/fixtures/repository/workflow.repository.fixture"; +import { WorkflowReminderRepositoryFixture } from "test/fixtures/repository/workflow-reminder.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CancelBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/cancel-booking.output"; import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; import { MarkAbsentBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/mark-absent.output"; @@ -12,44 +49,6 @@ import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import { advanceTo, clear } from "jest-date-mock"; -import * as request from "supertest"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { WorkflowReminderRepositoryFixture } from "test/fixtures/repository/workflow-reminder.repository.fixture"; -import { WorkflowRepositoryFixture } from "test/fixtures/repository/workflow.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { - CAL_API_VERSION_HEADER, - SUCCESS_STATUS, - VERSION_2024_06_14, - VERSION_2024_08_13, - X_CAL_CLIENT_ID, -} from "@calcom/platform-constants"; -import { EventManager } from "@calcom/platform-libraries/event-types"; -import { FAILED_EVENT_TYPE_IDENTIFICATION_ERROR_MESSAGE } from "@calcom/platform-types"; -import type { - CreateEventTypeInput_2024_06_14, - GetBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - CreateRecurringBookingInput_2024_08_13, - RecurringBookingOutput_2024_08_13, - RescheduleBookingInput_2024_08_13, - MarkAbsentBookingInput_2024_08_13, - CancelBookingInput_2024_08_13, -} from "@calcom/platform-types"; -import type { EventType, User, Workflow, Booking, PlatformOAuthClient, Team } from "@calcom/prisma/client"; describe("Bookings Endpoints 2024-08-13", () => { describe("User bookings", () => { @@ -1524,7 +1523,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const data: RecurringBookingOutput_2024_08_13 = responseBody.data; expect(data.id).toBeDefined(); expect(data.uid).toBeDefined(); @@ -1604,7 +1603,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const data: RecurringBookingOutput_2024_08_13 = responseBody.data; const booking = createdRecurringBooking[1]; expect(data.absentHost).toEqual(true); @@ -1639,7 +1638,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const data: RecurringBookingOutput_2024_08_13 = responseBody.data; const booking = createdRecurringBooking[2]; @@ -1719,7 +1718,7 @@ describe("Bookings Endpoints 2024-08-13", () => { expect(responseBody.status).toEqual(SUCCESS_STATUS); expect(responseBody.data).toBeDefined(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error const data: BookingOutput_2024_08_13 = responseBody.data; expect(data.id).toBeDefined(); expect(data.uid).toBeDefined(); diff --git a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/variable-length-bookings.e2e-spec.ts b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/variable-length-bookings.e2e-spec.ts index dfd7804b4c..e895c6a230 100644 --- a/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/variable-length-bookings.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/variable-length-bookings.e2e-spec.ts @@ -1,16 +1,15 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + CreateRecurringBookingInput_2024_08_13, + RecurringBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { EventType, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -18,15 +17,15 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - CreateRecurringBookingInput_2024_08_13, - RecurringBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import type { PlatformOAuthClient, Team, EventType, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Bookings Endpoints 2024-08-13", () => { describe("User bookings", () => { diff --git a/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts b/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts index 4dd8ce1cd1..8d07265770 100644 --- a/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts @@ -1,5 +1,29 @@ -import { bootstrap } from "@/bootstrap"; +import { + GOOGLE_CALENDAR, + GOOGLE_CALENDAR_ID, + GOOGLE_CALENDAR_TYPE, + OFFICE_365_CALENDAR, + OFFICE_365_CALENDAR_ID, + OFFICE_365_CALENDAR_TYPE, + SUCCESS_STATUS, +} from "@calcom/platform-constants"; +import { ICS_CALENDAR, ICS_CALENDAR_TYPE } from "@calcom/platform-constants/apps"; +import { IcsFeedCalendarService } from "@calcom/platform-libraries/app-store"; +import type { Credential, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { CalendarsServiceMock } from "test/mocks/calendars-service-mock"; +import { IcsCalendarServiceMock } from "test/mocks/ics-calendar-service-mock"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateIcsFeedOutput, CreateIcsFeedOutputResponseDto } from "@/ee/calendars/input/create-ics.output"; import { ConnectedCalendarsData } from "@/ee/calendars/outputs/connected-calendars.output"; import { DeletedCalendarCredentialsOutputResponseDto } from "@/ee/calendars/outputs/delete-calendar-credentials.output"; @@ -9,30 +33,6 @@ import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { CalendarsServiceMock } from "test/mocks/calendars-service-mock"; -import { IcsCalendarServiceMock } from "test/mocks/ics-calendar-service-mock"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { - GOOGLE_CALENDAR, - OFFICE_365_CALENDAR, - GOOGLE_CALENDAR_TYPE, - GOOGLE_CALENDAR_ID, -} from "@calcom/platform-constants"; -import { OFFICE_365_CALENDAR_ID, OFFICE_365_CALENDAR_TYPE } from "@calcom/platform-constants"; -import { ICS_CALENDAR, ICS_CALENDAR_TYPE } from "@calcom/platform-constants/apps"; -import { IcsFeedCalendarService } from "@calcom/platform-libraries/app-store"; -import type { PlatformOAuthClient, Team, User, Credential } from "@calcom/prisma/client"; const CLIENT_REDIRECT_URI = "http://localhost:5555"; diff --git a/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.e2e-spec.ts b/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.e2e-spec.ts index fad42d57f2..5c6f4e9f9c 100644 --- a/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.e2e-spec.ts @@ -1,30 +1,28 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { CreatePrivateLinkInput } from "@calcom/platform-types"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { CreatePrivateLinkInput } from "@calcom/platform-types"; - -import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { withApiAuth } from "test/utils/withApiAuth"; -import { randomString } from "test/utils/randomString"; describe("Event Types Private Links Endpoints", () => { let app: INestApplication; - let oAuthClient: any; + let _oAuthClient: any; let organization: any; let userRepositoryFixture: UserRepositoryFixture; let teamRepositoryFixture: TeamRepositoryFixture; @@ -61,7 +59,7 @@ describe("Event Types Private Links Endpoints", () => { name: `private-links-organization-${randomString()}`, slug: `private-links-org-slug-${randomString()}`, }); - oAuthClient = await createOAuthClient(organization.id); + _oAuthClient = await createOAuthClient(organization.id); user = await userRepositoryFixture.create({ email: userEmail, name: `private-links-user-${randomString()}`, diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.e2e-spec.ts b/apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.e2e-spec.ts index 9ed0b0e230..f606f3400e 100644 --- a/apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/event-types/event-types_2024_04_15/controllers/event-types.controller.e2e-spec.ts @@ -1,43 +1,42 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { Editable } from "@/ee/event-types/event-types_2024_04_15//inputs/enums/editable"; -import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module"; -import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input"; -import { BaseField } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/field-type"; -import { UpdateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input"; -import { GetEventTypePublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output"; -import { GetEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type.output"; -import { GetEventTypesPublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-types-public.output"; -import { HttpExceptionFilter } from "@/filters/http-exception.filter"; -import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { + CAL_API_VERSION_HEADER, + SUCCESS_STATUS, + VERSION_2024_04_15, + VERSION_2024_06_11, +} from "@calcom/platform-constants"; +import { + EventTypesByViewer, + EventTypesPublic, + eventTypeBookingFields, + eventTypeLocations, +} from "@calcom/platform-libraries/event-types"; +import type { ApiSuccessResponse } from "@calcom/platform-types"; +import type { EventType, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { - SUCCESS_STATUS, - VERSION_2024_06_11, - VERSION_2024_04_15, - CAL_API_VERSION_HEADER, -} from "@calcom/platform-constants"; -import { - EventTypesByViewer, - eventTypeBookingFields, - eventTypeLocations, - EventTypesPublic, -} from "@calcom/platform-libraries/event-types"; -import type { ApiSuccessResponse } from "@calcom/platform-types"; -import type { EventType, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { Editable } from "@/ee/event-types/event-types_2024_04_15//inputs/enums/editable"; +import { EventTypesModule_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.module"; +import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input"; +import { BaseField } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/field-type"; +import { UpdateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input"; +import { GetEventTypeOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type.output"; +import { GetEventTypePublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output"; +import { GetEventTypesPublicOutput } from "@/ee/event-types/event-types_2024_04_15/outputs/get-event-types-public.output"; +import { HttpExceptionFilter } from "@/filters/http-exception.filter"; +import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Event types Endpoints", () => { describe("Not authenticated", () => { @@ -429,12 +428,12 @@ describe("Event types Endpoints", () => { await teamRepositoryFixture.delete(organization.id); try { await eventTypesRepositoryFixture.delete(eventType.id); - } catch (e) { + } catch (_e) { // Event type might have been deleted by the test } try { await userRepositoryFixture.delete(user.id); - } catch (e) { + } catch (_e) { // User might have been deleted by the test } await app.close(); diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts index a2143a70fb..44a1bde054 100644 --- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts @@ -1,16 +1,32 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input"; -import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module"; -import { HttpExceptionFilter } from "@/filters/http-exception.filter"; -import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; +import { + BookerLayoutsInputEnum_2024_06_14, + BookingWindowPeriodInputTypeEnum_2024_06_14, + ConfirmationPolicyEnum, + FrequencyInput, + NoticeThresholdUnitEnum, +} from "@calcom/platform-enums"; +import { SchedulingType } from "@calcom/platform-libraries"; +import { + type ApiSuccessResponse, + BaseConfirmationPolicy_2024_06_14, + type CreateEventTypeInput_2024_06_14, + type EventTypeOutput_2024_06_14, + type GuestsDefaultFieldOutput_2024_06_14, + type NameDefaultFieldInput_2024_06_14, + type NotesDefaultFieldInput_2024_06_14, + type SplitNameDefaultFieldOutput_2024_06_14, + supportedIntegrations, + TeamEventTypeOutput_2024_06_14, + type UpdateEventTypeInput_2024_06_14, +} from "@calcom/platform-types"; +import { FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE } from "@calcom/platform-types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit"; +import { REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR } from "@calcom/platform-types/utils/RequiresOneOfPropertiesWhenNotDisabled"; +import type { EventType, PlatformOAuthClient, Schedule, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; @@ -21,32 +37,15 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; -import { - BookingWindowPeriodInputTypeEnum_2024_06_14, - BookerLayoutsInputEnum_2024_06_14, - ConfirmationPolicyEnum, - NoticeThresholdUnitEnum, - FrequencyInput, -} from "@calcom/platform-enums"; -import { SchedulingType } from "@calcom/platform-libraries"; -import { - BaseConfirmationPolicy_2024_06_14, - TeamEventTypeOutput_2024_06_14, - supportedIntegrations, - type ApiSuccessResponse, - type CreateEventTypeInput_2024_06_14, - type EventTypeOutput_2024_06_14, - type GuestsDefaultFieldOutput_2024_06_14, - type NameDefaultFieldInput_2024_06_14, - type NotesDefaultFieldInput_2024_06_14, - type SplitNameDefaultFieldOutput_2024_06_14, - type UpdateEventTypeInput_2024_06_14, -} from "@calcom/platform-types"; -import { FAILED_RECURRING_EVENT_TYPE_WITH_BOOKER_LIMITS_ERROR_MESSAGE } from "@calcom/platform-types/event-types/event-types_2024_06_14/inputs/validators/CantHaveRecurrenceAndBookerActiveBookingsLimit"; -import { REQUIRES_AT_LEAST_ONE_PROPERTY_ERROR } from "@calcom/platform-types/utils/RequiresOneOfPropertiesWhenNotDisabled"; -import type { PlatformOAuthClient, Team, User, Schedule, EventType } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateEventTypeInput_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input"; +import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module"; +import { HttpExceptionFilter } from "@/filters/http-exception.filter"; +import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; const orderBySlug = (a: { slug: string }, b: { slug: string }) => { if (a.slug < b.slug) return -1; diff --git a/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts b/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts index cc47a5735b..e0012f3478 100644 --- a/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts @@ -1,23 +1,22 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CalendarsService } from "@/ee/calendars/services/calendars.service"; -import { HttpExceptionFilter } from "@/filters/http-exception.filter"; -import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import type { Credential, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { CalendarsServiceMock } from "test/mocks/calendars-service-mock"; - -import type { PlatformOAuthClient, Team, User, Credential } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CalendarsService } from "@/ee/calendars/services/calendars.service"; +import { HttpExceptionFilter } from "@/filters/http-exception.filter"; +import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; const CLIENT_REDIRECT_URI = "http://localhost:5555"; diff --git a/apps/api/v2/src/ee/me/me.controller.e2e-spec.ts b/apps/api/v2/src/ee/me/me.controller.e2e-spec.ts index 1d3c53813e..e5a7d3b148 100644 --- a/apps/api/v2/src/ee/me/me.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/me/me.controller.e2e-spec.ts @@ -1,25 +1,24 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { ApiSuccessResponse, UserResponse } from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { UserResponse, ApiSuccessResponse } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input"; +import { UsersModule } from "@/modules/users/users.module"; describe("Me Endpoints", () => { describe("User Authentication", () => { diff --git a/apps/api/v2/src/ee/schedules/schedules_2024_04_15/controllers/schedules.controller.e2e-spec.ts b/apps/api/v2/src/ee/schedules/schedules_2024_04_15/controllers/schedules.controller.e2e-spec.ts index e05f8018e2..e18eb90bc3 100644 --- a/apps/api/v2/src/ee/schedules/schedules_2024_04_15/controllers/schedules.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/schedules/schedules_2024_04_15/controllers/schedules.controller.e2e-spec.ts @@ -1,5 +1,16 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_04_15 } from "@calcom/platform-constants"; +import type { UpdateScheduleInput_2024_04_15 } from "@calcom/platform-types"; +import type { User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; import { CreateScheduleOutput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/outputs/create-schedule.output"; import { GetSchedulesOutput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/outputs/get-schedules.output"; @@ -9,18 +20,6 @@ import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions. import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_04_15 } from "@calcom/platform-constants"; -import type { UpdateScheduleInput_2024_04_15 } from "@calcom/platform-types"; -import type { User } from "@calcom/prisma/client"; describe("Schedules Endpoints", () => { describe("User Authentication", () => { @@ -214,7 +213,7 @@ describe("Schedules Endpoints", () => { await userRepositoryFixture.deleteByEmail(user.email); try { await scheduleRepositoryFixture.deleteById(createdSchedule.id); - } catch (e) {} + } catch (_e) {} await app.close(); }); diff --git a/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.e2e-spec.ts b/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.e2e-spec.ts index 5c61517482..f774f4418e 100644 --- a/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/schedules/schedules_2024_06_11/controllers/schedules.controller.e2e-spec.ts @@ -1,18 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_11 } from "@calcom/platform-constants"; import type { CreateScheduleInput_2024_06_11, @@ -20,10 +5,24 @@ import type { GetScheduleOutput_2024_06_11, GetSchedulesOutput_2024_06_11, ScheduleOutput_2024_06_11, - UpdateScheduleOutput_2024_06_11, UpdateScheduleInput_2024_06_11, + UpdateScheduleOutput_2024_06_11, } from "@calcom/platform-types"; import type { User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Schedules Endpoints", () => { describe("User Authentication", () => { @@ -259,7 +258,7 @@ describe("Schedules Endpoints", () => { await userRepositoryFixture.deleteByEmail(user.email); try { await scheduleRepositoryFixture.deleteById(createdSchedule.id); - } catch (e) {} + } catch (_e) {} await app.close(); }); diff --git a/apps/api/v2/src/main.ts b/apps/api/v2/src/main.ts index db8400facf..3540c8ca94 100644 --- a/apps/api/v2/src/main.ts +++ b/apps/api/v2/src/main.ts @@ -6,7 +6,7 @@ import { ConfigService } from "@nestjs/config"; import { NestFactory } from "@nestjs/core"; import type { NestExpressApplication } from "@nestjs/platform-express"; import { WinstonModule } from "nest-winston"; -import * as qs from "qs"; +import qs from "qs"; import type { AppConfig } from "@/config/type"; import { AppModule } from "./app.module"; import { bootstrap } from "./bootstrap"; diff --git a/apps/api/v2/src/modules/auth/oauth2/controllers/oauth2.controller.e2e-spec.ts b/apps/api/v2/src/modules/auth/oauth2/controllers/oauth2.controller.e2e-spec.ts index 69dfa5bee7..83dba9f116 100644 --- a/apps/api/v2/src/modules/auth/oauth2/controllers/oauth2.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/auth/oauth2/controllers/oauth2.controller.e2e-spec.ts @@ -1,27 +1,24 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { HttpExceptionFilter } from "@/filters/http-exception.filter"; -import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; -import { ZodExceptionFilter } from "@/filters/zod-exception.filter"; -import { AuthModule } from "@/modules/auth/auth.module"; -import { PrismaReadService } from "@/modules/prisma/prisma-read.service"; -import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { generateSecret } from "@calcom/platform-libraries"; +import type { Membership, Team, User } from "@calcom/prisma/client"; +import { AccessScope, OAuthClientType } from "@calcom/prisma/enums"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test, TestingModule } from "@nestjs/testing"; import * as nextAuthJwt from "next-auth/jwt"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OAuth2ClientRepositoryFixture } from "test/fixtures/repository/oauth2-client.repository.fixture"; import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { generateSecret } from "@calcom/platform-libraries"; -import type { Membership, Team, User } from "@calcom/prisma/client"; -import { AccessScope, OAuthClientType } from "@calcom/prisma/enums"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { HttpExceptionFilter } from "@/filters/http-exception.filter"; +import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; +import { ZodExceptionFilter } from "@/filters/zod-exception.filter"; +import { AuthModule } from "@/modules/auth/auth.module"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; // Mock next-auth/jwt getToken for ApiAuthStrategy NEXT_AUTH authentication jest.mock("next-auth/jwt", () => ({ diff --git a/apps/api/v2/src/modules/billing/controllers/billing.controller.e2e-spec.ts b/apps/api/v2/src/modules/billing/controllers/billing.controller.e2e-spec.ts index 230effd27d..93c5bf16c9 100644 --- a/apps/api/v2/src/modules/billing/controllers/billing.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/billing/controllers/billing.controller.e2e-spec.ts @@ -1,16 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CheckPlatformBillingResponseDto } from "@/modules/billing/controllers/outputs/CheckPlatformBillingResponse.dto"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { StripeService } from "@/modules/stripe/stripe.service"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { UserWithProfile } from "@/modules/users/users.repository"; +import type { PlatformBilling, Team } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; import Stripe from "stripe"; -import * as request from "supertest"; +import request from "supertest"; import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -18,8 +11,14 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import type { Team, PlatformBilling } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CheckPlatformBillingResponseDto } from "@/modules/billing/controllers/outputs/CheckPlatformBillingResponse.dto"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { StripeService } from "@/modules/stripe/stripe.service"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; +import { UserWithProfile } from "@/modules/users/users.repository"; describe("Platform Billing Controller (e2e)", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.e2e-spec.ts b/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.e2e-spec.ts index 2ba4053167..0248d892f7 100644 --- a/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.e2e-spec.ts @@ -1,18 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { ConferencingAppsOutputDto } from "@/modules/conferencing/outputs/get-conferencing-apps.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { GOOGLE_CALENDAR_ID, GOOGLE_CALENDAR_TYPE, @@ -22,6 +7,20 @@ import { } from "@calcom/platform-constants"; import type { ApiSuccessResponse } from "@calcom/platform-types"; import type { User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { ConferencingAppsOutputDto } from "@/modules/conferencing/outputs/get-conferencing-apps.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Conferencing Endpoints", () => { describe("conferencing controller e2e tests", () => { diff --git a/apps/api/v2/src/modules/destination-calendars/controllers/destination-calendars.controller.e2e-spec.ts b/apps/api/v2/src/modules/destination-calendars/controllers/destination-calendars.controller.e2e-spec.ts index 473d12771a..19259ba5a3 100644 --- a/apps/api/v2/src/modules/destination-calendars/controllers/destination-calendars.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/destination-calendars/controllers/destination-calendars.controller.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import { APPLE_CALENDAR_ID, APPLE_CALENDAR_TYPE, SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Credential, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CalendarsService } from "@/ee/calendars/services/calendars.service"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; @@ -7,20 +19,6 @@ import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions. import { DestinationCalendarsOutputResponseDto } from "@/modules/destination-calendars/outputs/destination-calendars.output"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants"; -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { PlatformOAuthClient, Team, User, Credential } from "@calcom/prisma/client"; const CLIENT_REDIRECT_URI = "http://localhost:5555"; diff --git a/apps/api/v2/src/modules/event-types/controllers/event-types-webhooks.controller.e2e-spec.ts b/apps/api/v2/src/modules/event-types/controllers/event-types-webhooks.controller.e2e-spec.ts index c45a3a2632..dbb2372ca1 100644 --- a/apps/api/v2/src/modules/event-types/controllers/event-types-webhooks.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/event-types/controllers/event-types-webhooks.controller.e2e-spec.ts @@ -1,5 +1,15 @@ -import { bootstrap } from "@/bootstrap"; +import type { EventType, Webhook } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; @@ -10,17 +20,6 @@ import { EventTypeWebhooksOutputResponseDto, } from "@/modules/webhooks/outputs/event-type-webhook.output"; import { DeleteManyWebhooksOutputResponseDto } from "@/modules/webhooks/outputs/webhook.output"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import type { EventType, Webhook } from "@calcom/prisma/client"; describe("EventTypes WebhooksController (e2e)", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts index c7758a2812..42d2fc489c 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts @@ -1,5 +1,22 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { slugify } from "@calcom/platform-libraries"; +import type { ApiSuccessResponse } from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { JwtService } from "@nestjs/jwt"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_04_15/constants/constants"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; @@ -12,24 +29,6 @@ import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth- import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input"; import { UpdateManagedUserInput } from "@/modules/users/inputs/update-managed-user.input"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { JwtService } from "@nestjs/jwt"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { slugify } from "@calcom/platform-libraries"; -import type { ApiSuccessResponse } from "@calcom/platform-types"; -import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; const CLIENT_REDIRECT_URI = "http://localhost:4321"; diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts index 7d79708c26..0834994b5c 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-webhooks/oauth-client-webhooks.controller.e2e-spec.ts @@ -1,18 +1,8 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { UserWithProfile } from "@/modules/users/users.repository"; -import { CreateWebhookInputDto, UpdateWebhookInputDto } from "@/modules/webhooks/inputs/webhook.input"; -import { - OAuthClientWebhooksOutputResponseDto, - OAuthClientWebhookOutputResponseDto, -} from "@/modules/webhooks/outputs/oauth-client-webhook.output"; +import type { PlatformOAuthClient, Team, Webhook } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; @@ -22,8 +12,17 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import type { PlatformOAuthClient, Team, Webhook } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; +import { UserWithProfile } from "@/modules/users/users.repository"; +import { CreateWebhookInputDto, UpdateWebhookInputDto } from "@/modules/webhooks/inputs/webhook.input"; +import { + OAuthClientWebhookOutputResponseDto, + OAuthClientWebhooksOutputResponseDto, +} from "@/modules/webhooks/outputs/oauth-client-webhook.output"; describe("OAuth client WebhooksController (e2e)", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts index 97da8b41cd..7feddb4c31 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-clients/oauth-clients.controller.e2e-spec.ts @@ -1,25 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { HttpExceptionFilter } from "@/filters/http-exception.filter"; -import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; -import { AuthModule } from "@/modules/auth/auth.module"; -import { ApiAuthStrategy } from "@/modules/auth/strategies/api-auth/api-auth.strategy"; -import { OAuthClientModule } from "@/modules/oauth-clients/oauth-client.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { ApiAuthMockStrategy } from "test/mocks/api-auth-mock.strategy"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { APPS_READ, APPS_WRITE, @@ -34,11 +12,32 @@ import { SUCCESS_STATUS, } from "@calcom/platform-constants"; import type { + ApiSuccessResponse, CreateOAuthClientInput, UpdateOAuthClientInput, - ApiSuccessResponse, } from "@calcom/platform-types"; import type { Membership, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { ApiAuthMockStrategy } from "test/mocks/api-auth-mock.strategy"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { HttpExceptionFilter } from "@/filters/http-exception.filter"; +import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; +import { AuthModule } from "@/modules/auth/auth.module"; +import { ApiAuthStrategy } from "@/modules/auth/strategies/api-auth/api-auth.strategy"; +import { OAuthClientModule } from "@/modules/oauth-clients/oauth-client.module"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("OAuth Clients Endpoints", () => { describe("User Not Authenticated", () => { diff --git a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-flow/oauth-flow.controller.e2e-spec.ts b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-flow/oauth-flow.controller.e2e-spec.ts index d93d574d11..24548c1089 100644 --- a/apps/api/v2/src/modules/oauth-clients/controllers/oauth-flow/oauth-flow.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/oauth-clients/controllers/oauth-flow/oauth-flow.controller.e2e-spec.ts @@ -1,5 +1,18 @@ -import { bootstrap } from "@/bootstrap"; +import { X_CAL_SECRET_KEY } from "@calcom/platform-constants"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test, TestingModule } from "@nestjs/testing"; +import request from "supertest"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withNextAuth } from "test/utils/withNextAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; import { ZodExceptionFilter } from "@/filters/zod-exception.filter"; @@ -10,20 +23,6 @@ import { ExchangeAuthorizationCodeInput } from "@/modules/oauth-clients/inputs/e import { OAuthClientModule } from "@/modules/oauth-clients/oauth-client.module"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test, TestingModule } from "@nestjs/testing"; -import * as request from "supertest"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withNextAuth } from "test/utils/withNextAuth"; - -import { X_CAL_SECRET_KEY } from "@calcom/platform-constants"; -import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; describe("OAuthFlow Endpoints", () => { describe("User Not Authenticated", () => { diff --git a/apps/api/v2/src/modules/organizations/attributes/index/controllers/organization-attributes.e2e-spec.ts b/apps/api/v2/src/modules/organizations/attributes/index/controllers/organization-attributes.e2e-spec.ts index be95dfee7d..2be306c69f 100644 --- a/apps/api/v2/src/modules/organizations/attributes/index/controllers/organization-attributes.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/attributes/index/controllers/organization-attributes.e2e-spec.ts @@ -1,22 +1,21 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/create-organization-attribute.input"; -import { UpdateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/update-organization-attribute.input"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Membership, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User, Team, Membership } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/create-organization-attribute.input"; +import { UpdateOrganizationAttributeInput } from "@/modules/organizations/attributes/index/inputs/update-organization-attribute.input"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Attributes Endpoints", () => { describe("User lacks required role", () => { diff --git a/apps/api/v2/src/modules/organizations/attributes/options/organization-attributes-options.e2e-spec.ts b/apps/api/v2/src/modules/organizations/attributes/options/organization-attributes-options.e2e-spec.ts index 543ee1d5e7..afda117315 100644 --- a/apps/api/v2/src/modules/organizations/attributes/options/organization-attributes-options.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/attributes/options/organization-attributes-options.e2e-spec.ts @@ -1,5 +1,18 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Attribute, AttributeOption, Membership, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { AttributeRepositoryFixture } from "test/fixtures/repository/attributes.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/create-organization-attribute-option.input"; import { AssignOrganizationAttributeOptionToUserInput } from "@/modules/organizations/attributes/options/inputs/organizations-attributes-options-assign.input"; import { UpdateOrganizationAttributeOptionInput } from "@/modules/organizations/attributes/options/inputs/update-organizaiton-attribute-option.input.ts"; @@ -8,20 +21,6 @@ import { OptionOutput } from "@/modules/organizations/attributes/options/outputs import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { AttributeRepositoryFixture } from "test/fixtures/repository/attributes.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User, Team, Membership, Attribute, AttributeOption } from "@calcom/prisma/client"; describe("Organizations Attributes Options Endpoints", () => { describe("User lacks required role", () => { diff --git a/apps/api/v2/src/modules/organizations/bookings/managed-organizations-bookings.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/bookings/managed-organizations-bookings.controller.e2e-spec.ts index f063233f85..cab7ec59ff 100644 --- a/apps/api/v2/src/modules/organizations/bookings/managed-organizations-bookings.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/bookings/managed-organizations-bookings.controller.e2e-spec.ts @@ -1,14 +1,22 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; +import { randomString } from "@calcom/lib/random"; +import { + CAL_API_VERSION_HEADER, + SUCCESS_STATUS, + VERSION_2024_08_13, + X_CAL_CLIENT_ID, + X_CAL_SECRET_KEY, +} from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + RecurringBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; @@ -20,22 +28,13 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { randomString } from "@calcom/lib/random"; -import { - CAL_API_VERSION_HEADER, - SUCCESS_STATUS, - VERSION_2024_08_13, - X_CAL_CLIENT_ID, - X_CAL_SECRET_KEY, -} from "@calcom/platform-constants"; -import type { - BookingOutput_2024_08_13, - RecurringBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; describe("Organizations Bookings Endpoints 2024-08-13", () => { describe("Manager and managed organizations bookings", () => { diff --git a/apps/api/v2/src/modules/organizations/bookings/organizations-bookings.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/bookings/organizations-bookings.controller.e2e-spec.ts index 979ae9a9bc..5afb1b519b 100644 --- a/apps/api/v2/src/modules/organizations/bookings/organizations-bookings.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/bookings/organizations-bookings.controller.e2e-spec.ts @@ -1,14 +1,22 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; +import { + CAL_API_VERSION_HEADER, + SUCCESS_STATUS, + VERSION_2024_08_13, + X_CAL_CLIENT_ID, + X_CAL_SECRET_KEY, +} from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + RecurringBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; @@ -19,22 +27,13 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { - CAL_API_VERSION_HEADER, - SUCCESS_STATUS, - VERSION_2024_08_13, - X_CAL_CLIENT_ID, - X_CAL_SECRET_KEY, -} from "@calcom/platform-constants"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RecurringBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; describe("Organizations Bookings Endpoints 2024-08-13", () => { describe("Organization bookings", () => { diff --git a/apps/api/v2/src/modules/organizations/event-types/assign-all-team-members.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/assign-all-team-members.e2e-spec.ts index 5bc769c6a0..acd24672af 100644 --- a/apps/api/v2/src/modules/organizations/event-types/assign-all-team-members.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/event-types/assign-all-team-members.e2e-spec.ts @@ -1,5 +1,27 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; +import type { + ApiSuccessResponse, + CreateTeamEventTypeInput_2024_06_14, + Host, + OrgTeamOutputDto, + TeamEventTypeOutput_2024_06_14, + UpdateTeamEventTypeInput_2024_06_14, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; import { Locales } from "@/lib/enums/locales"; @@ -13,29 +35,6 @@ import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/member import { OrgTeamMembershipOutputResponseDto } from "@/modules/organizations/teams/memberships/outputs/organization-teams-memberships.output"; import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; -import type { - ApiSuccessResponse, - CreateTeamEventTypeInput_2024_06_14, - Host, - OrgTeamOutputDto, - TeamEventTypeOutput_2024_06_14, - UpdateTeamEventTypeInput_2024_06_14, -} from "@calcom/platform-types"; -import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; const CLIENT_REDIRECT_URI = "http://localhost:4321"; @@ -257,7 +256,7 @@ describe("Assign all team members", () => { slug: `organizations-event-types-round-robin-${randomString()}`, lengthInMinutes: 60, // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "collective", }; @@ -285,7 +284,7 @@ describe("Assign all team members", () => { slug: `assign-all-team-members-collective-${randomString()}`, lengthInMinutes: 60, // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "collective", assignAllTeamMembers: true, }; @@ -324,7 +323,7 @@ describe("Assign all team members", () => { slug: `assign-all-team-members-round-robin-${randomString()}`, lengthInMinutes: 60, // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "roundRobin", assignAllTeamMembers: true, }; @@ -371,7 +370,7 @@ describe("Assign all team members", () => { slug: `assign-all-team-members-round-robin-${randomString()}`, lengthInMinutes: 60, // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "roundRobin", assignAllTeamMembers: true, }; @@ -433,7 +432,7 @@ describe("Assign all team members", () => { slug: `assign-all-team-members-managed-${randomString()}`, lengthInMinutes: 60, // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "managed", assignAllTeamMembers: true, }; diff --git a/apps/api/v2/src/modules/organizations/event-types/organizations-admin-not-team-member-event-types.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/organizations-admin-not-team-member-event-types.e2e-spec.ts index 9df613b9f2..2145f037eb 100644 --- a/apps/api/v2/src/modules/organizations/event-types/organizations-admin-not-team-member-event-types.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/event-types/organizations-admin-not-team-member-event-types.e2e-spec.ts @@ -1,25 +1,7 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; import { - BookingWindowPeriodInputTypeEnum_2024_06_14, BookerLayoutsInputEnum_2024_06_14, + BookingWindowPeriodInputTypeEnum_2024_06_14, ConfirmationPolicyEnum, NoticeThresholdUnitEnum, } from "@calcom/platform-enums"; @@ -32,7 +14,24 @@ import type { TeamEventTypeOutput_2024_06_14, UpdateTeamEventTypeInput_2024_06_14, } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Event Types Endpoints", () => { describe("User Authentication - User is Org Admin but not team admin", () => { @@ -297,7 +296,7 @@ describe("Organizations Event Types Endpoints", () => { }, ], // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "collective", hosts: [ { @@ -1070,7 +1069,7 @@ describe("Organizations Event Types Endpoints", () => { }, ], // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "roundRobin", hosts: [ { diff --git a/apps/api/v2/src/modules/organizations/event-types/organizations-event-types-private-links.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/organizations-event-types-private-links.e2e-spec.ts index b953a6d635..a919b9c454 100644 --- a/apps/api/v2/src/modules/organizations/event-types/organizations-event-types-private-links.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/event-types/organizations-event-types-private-links.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { CreatePrivateLinkInput } from "@calcom/platform-types"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard"; @@ -8,19 +20,6 @@ import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-a import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { CreatePrivateLinkInput } from "@calcom/platform-types"; describe("Organizations / Teams / Event Types / Private Links Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts b/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts index 7c4d90d805..3fd172d176 100644 --- a/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/event-types/organizations-member-team-admin-event-types.e2e-spec.ts @@ -1,25 +1,7 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; import { - BookingWindowPeriodInputTypeEnum_2024_06_14, BookerLayoutsInputEnum_2024_06_14, + BookingWindowPeriodInputTypeEnum_2024_06_14, ConfirmationPolicyEnum, NoticeThresholdUnitEnum, } from "@calcom/platform-enums"; @@ -32,7 +14,24 @@ import type { TeamEventTypeOutput_2024_06_14, UpdateTeamEventTypeInput_2024_06_14, } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Event Types Endpoints", () => { describe("User Authentication - User is Org member and team admin", () => { @@ -306,7 +305,7 @@ describe("Organizations Event Types Endpoints", () => { }, ], // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "collective", hosts: [ { @@ -1095,7 +1094,7 @@ describe("Organizations Event Types Endpoints", () => { }, ], // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "roundRobin", hosts: [ { diff --git a/apps/api/v2/src/modules/organizations/memberships/organizations-membership.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/memberships/organizations-membership.controller.e2e-spec.ts index afb96ea36a..5f3e4dfebd 100644 --- a/apps/api/v2/src/modules/organizations/memberships/organizations-membership.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/memberships/organizations-membership.controller.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Attribute, AttributeOption, Membership, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { AttributeRepositoryFixture } from "test/fixtures/repository/attributes.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/create-organization-membership.input"; import { UpdateOrgMembershipDto } from "@/modules/organizations/memberships/inputs/update-organization-membership.input"; import { CreateOrgMembershipOutput } from "@/modules/organizations/memberships/outputs/create-membership.output"; @@ -12,19 +24,6 @@ import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TeamMembershipOutput } from "@/modules/teams/memberships/outputs/team-membership.output"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { AttributeRepositoryFixture } from "test/fixtures/repository/attributes.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { Attribute, AttributeOption, User, Membership, Team } from "@calcom/prisma/client"; describe("Organizations Memberships Endpoints", () => { describe("User Authentication - User is Org Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/organizations/organizations-organizations.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/organizations/organizations-organizations.controller.e2e-spec.ts index d8e094400c..8e96a7efc4 100644 --- a/apps/api/v2/src/modules/organizations/organizations/organizations-organizations.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/organizations/organizations-organizations.controller.e2e-spec.ts @@ -1,36 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { getEnv } from "@/env"; -import { sha256Hash, stripApiKey } from "@/lib/api-key"; -import { RefreshApiKeyOutput } from "@/modules/api-keys/outputs/refresh-api-key.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 { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input"; -import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input"; -import { GetManagedOrganizationsOutput } from "@/modules/organizations/organizations/outputs/get-managed-organizations.output"; -import { - ManagedOrganizationWithApiKeyOutput, - ManagedOrganizationOutput, -} from "@/modules/organizations/organizations/outputs/managed-organization.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import { advanceTo, clear } from "jest-date-mock"; -import { DateTime } from "luxon"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture"; -import { ManagedOrganizationsRepositoryFixture } from "test/fixtures/repository/managed-organizations.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - import { APPS_READ, APPS_WRITE, @@ -42,11 +9,43 @@ import { PROFILE_WRITE, SCHEDULE_READ, SCHEDULE_WRITE, + SUCCESS_STATUS, X_CAL_SECRET_KEY, } from "@calcom/platform-constants"; -import { SUCCESS_STATUS } from "@calcom/platform-constants"; import type { ApiSuccessResponse, CreateOAuthClientInput } from "@calcom/platform-types"; -import type { PlatformBilling, User, Team } from "@calcom/prisma/client"; +import type { PlatformBilling, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import { advanceTo, clear } from "jest-date-mock"; +import { DateTime } from "luxon"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { PlatformBillingRepositoryFixture } from "test/fixtures/repository/billing.repository.fixture"; +import { ManagedOrganizationsRepositoryFixture } from "test/fixtures/repository/managed-organizations.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { getEnv } from "@/env"; +import { sha256Hash, stripApiKey } from "@/lib/api-key"; +import { RefreshApiKeyOutput } from "@/modules/api-keys/outputs/refresh-api-key.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 { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input"; +import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input"; +import { GetManagedOrganizationsOutput } from "@/modules/organizations/organizations/outputs/get-managed-organizations.output"; +import { + ManagedOrganizationOutput, + ManagedOrganizationWithApiKeyOutput, +} from "@/modules/organizations/organizations/outputs/managed-organization.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Organizations Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/roles/organizations-roles.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/roles/organizations-roles.controller.e2e-spec.ts index 3c454b74d4..a050707882 100644 --- a/apps/api/v2/src/modules/organizations/roles/organizations-roles.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/roles/organizations-roles.controller.e2e-spec.ts @@ -1,5 +1,19 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { RoleService } from "@calcom/platform-libraries/pbac"; +import type { Team, User } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { FeaturesRepositoryFixture } from "test/fixtures/repository/features.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PbacGuard } from "@/modules/auth/guards/pbac/pbac.guard"; import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard"; import { CreateOrgRoleInput } from "@/modules/organizations/roles/inputs/create-org-role.input"; @@ -12,21 +26,6 @@ import { UpdateOrgRoleOutput } from "@/modules/organizations/roles/outputs/updat import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { FeaturesRepositoryFixture } from "test/fixtures/repository/features.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { RoleService } from "@calcom/platform-libraries/pbac"; -import type { User, Team } from "@calcom/prisma/client"; -import { MembershipRole } from "@calcom/prisma/enums"; describe("Organizations Roles Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/roles/permissions/organizations-roles-permissions.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/roles/permissions/organizations-roles-permissions.controller.e2e-spec.ts index 3c58d07379..eccfd9b717 100644 --- a/apps/api/v2/src/modules/organizations/roles/permissions/organizations-roles-permissions.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/roles/permissions/organizations-roles-permissions.controller.e2e-spec.ts @@ -1,26 +1,25 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateTeamRoleInput } from "@/modules/organizations/teams/roles/inputs/create-team-role.input"; -import type { CreateTeamRoleOutput } from "@/modules/organizations/teams/roles/outputs/create-team-role.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { PermissionString } from "@calcom/platform-libraries/pbac"; +import { RoleService } from "@calcom/platform-libraries/pbac"; +import type { Team, User } from "@calcom/prisma/client"; +import { MembershipRole } from "@calcom/prisma/enums"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { FeaturesRepositoryFixture } from "test/fixtures/repository/features.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { RoleService } from "@calcom/platform-libraries/pbac"; -import type { PermissionString } from "@calcom/platform-libraries/pbac"; -import type { Team, User } from "@calcom/prisma/client"; -import { MembershipRole } from "@calcom/prisma/enums"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateTeamRoleInput } from "@/modules/organizations/teams/roles/inputs/create-team-role.input"; +import type { CreateTeamRoleOutput } from "@/modules/organizations/teams/roles/outputs/create-team-role.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Roles Permissions Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts index 391c9e5c09..8e8682e752 100644 --- a/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts @@ -1,13 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { App_RoutingForms_Form, App_RoutingForms_FormResponse, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -15,9 +11,12 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { App_RoutingForms_Form, App_RoutingForms_FormResponse, Team, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("OrganizationsRoutingFormsResponsesController", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms.controller.e2e-spec.ts index 1b084104c3..cdb68d497c 100644 --- a/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms.controller.e2e-spec.ts @@ -1,14 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { GetRoutingFormsOutput } from "@/modules/organizations/routing-forms/outputs/get-routing-forms.output"; -import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { App_RoutingForms_Form, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -16,9 +11,13 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { App_RoutingForms_Form, Team, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { GetRoutingFormsOutput } from "@/modules/organizations/routing-forms/outputs/get-routing-forms.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("OrganizationsRoutingFormController", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/schedules/organizations-schedules.e2e-spec.ts b/apps/api/v2/src/modules/organizations/schedules/organizations-schedules.e2e-spec.ts index 0c686c3228..5717967194 100644 --- a/apps/api/v2/src/modules/organizations/schedules/organizations-schedules.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/schedules/organizations-schedules.e2e-spec.ts @@ -1,19 +1,3 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { SUCCESS_STATUS } from "@calcom/platform-constants"; import type { CreateScheduleInput_2024_06_11, @@ -25,7 +9,22 @@ import type { UpdateScheduleInput_2024_06_11, UpdateScheduleOutput_2024_06_11, } from "@calcom/platform-types"; -import type { User, Team, Membership, Profile } from "@calcom/prisma/client"; +import type { Membership, Profile, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Schedules Endpoints", () => { describe("User lacks required role", () => { diff --git a/apps/api/v2/src/modules/organizations/teams/bookings/organizations-teams-bookings.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/bookings/organizations-teams-bookings.controller.e2e-spec.ts index 7518e73a33..3d9b3a8539 100644 --- a/apps/api/v2/src/modules/organizations/teams/bookings/organizations-teams-bookings.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/bookings/organizations-teams-bookings.controller.e2e-spec.ts @@ -1,14 +1,22 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; +import { + CAL_API_VERSION_HEADER, + SUCCESS_STATUS, + VERSION_2024_08_13, + X_CAL_CLIENT_ID, + X_CAL_SECRET_KEY, +} from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + RecurringBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; @@ -19,22 +27,13 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { - CAL_API_VERSION_HEADER, - SUCCESS_STATUS, - VERSION_2024_08_13, - X_CAL_CLIENT_ID, - X_CAL_SECRET_KEY, -} from "@calcom/platform-constants"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RecurringBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, -} from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; describe("Organizations TeamsBookings Endpoints 2024-08-13", () => { describe("Organization Team bookings", () => { diff --git a/apps/api/v2/src/modules/organizations/teams/index/organizations-teams.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/index/organizations-teams.controller.e2e-spec.ts index c01a0c5619..8b9d4e9959 100644 --- a/apps/api/v2/src/modules/organizations/teams/index/organizations-teams.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/index/organizations-teams.controller.e2e-spec.ts @@ -1,14 +1,10 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/create-organization-team.input"; -import { OrgMeTeamOutputDto } from "@/modules/organizations/teams/index/outputs/organization-team.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; +import type { ApiSuccessResponse } from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -16,10 +12,13 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants"; -import type { ApiSuccessResponse } from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/create-organization-team.input"; +import { OrgMeTeamOutputDto } from "@/modules/organizations/teams/index/outputs/organization-team.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Team Endpoints", () => { describe("User Authentication - User is Org Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/teams/invite/organizations-teams-invite.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/invite/organizations-teams-invite.controller.e2e-spec.ts index 05eaff98e4..baeee396f1 100644 --- a/apps/api/v2/src/modules/organizations/teams/invite/organizations-teams-invite.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/invite/organizations-teams-invite.controller.e2e-spec.ts @@ -1,21 +1,20 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { Team, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Teams Invite Endpoints", () => { describe("User Authentication - User is Org Team Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships-guard.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships-guard.controller.e2e-spec.ts index a0b85ac0b9..c1c5c49c15 100644 --- a/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships-guard.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships-guard.controller.e2e-spec.ts @@ -1,5 +1,20 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { ApiSuccessResponse } from "@calcom/platform-types"; +import { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { EmailService } from "@/modules/email/email.service"; import { CreateManagedUserData, @@ -13,32 +28,15 @@ import { CreateOrgTeamDto } from "@/modules/organizations/teams/index/inputs/cre import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { + PLATFORM_USER_AND_PLATFORM_TEAM_CREATED_WITH_DIFFERENT_OAUTH_CLIENTS_ERROR, PLATFORM_USER_BEING_ADDED_TO_REGULAR_TEAM_ERROR, REGULAR_USER_BEING_ADDED_TO_PLATFORM_TEAM_ERROR, - PLATFORM_USER_AND_PLATFORM_TEAM_CREATED_WITH_DIFFERENT_OAUTH_CLIENTS_ERROR, } from "@/modules/teams/memberships/services/teams-memberships.service"; import { TeamsMembershipsModule } from "@/modules/teams/memberships/teams-memberships.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { CreateManagedUserInput } from "@/modules/users/inputs/create-managed-user.input"; import { CreateUserInput } from "@/modules/users/inputs/create-user.input"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { ApiSuccessResponse } from "@calcom/platform-types"; -import { PlatformOAuthClient, User } from "@calcom/prisma/client"; -import { Team } from "@calcom/prisma/client"; describe("Organizations Teams Memberships Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships.controller.e2e-spec.ts index a602f2e59b..6b5daca93d 100644 --- a/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/memberships/e2e/organizations-teams-memberships.controller.e2e-spec.ts @@ -1,15 +1,10 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input"; -import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TeamMembershipOutput } from "@/modules/teams/memberships/outputs/team-membership.output"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { ApiSuccessResponse } from "@calcom/platform-types"; +import type { EventType, Membership, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -18,10 +13,14 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { ApiSuccessResponse } from "@calcom/platform-types"; -import type { EventType, User, Membership, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/create-organization-team-membership.input"; +import { UpdateOrgTeamMembershipDto } from "@/modules/organizations/teams/memberships/inputs/update-organization-team-membership.input"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TeamMembershipOutput } from "@/modules/teams/memberships/outputs/team-membership.output"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Teams Memberships Endpoints", () => { describe("User Authentication - User is Org Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/teams/roles/organizations-teams-roles.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/roles/organizations-teams-roles.controller.e2e-spec.ts index 35d67d9fb8..324e18adf3 100644 --- a/apps/api/v2/src/modules/organizations/teams/roles/organizations-teams-roles.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/roles/organizations-teams-roles.controller.e2e-spec.ts @@ -1,5 +1,19 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { RoleService } from "@calcom/platform-libraries/pbac"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { FeaturesRepositoryFixture } from "test/fixtures/repository/features.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CreateTeamRoleInput } from "@/modules/organizations/teams/roles/inputs/create-team-role.input"; import { UpdateTeamRoleInput } from "@/modules/organizations/teams/roles/inputs/update-team-role.input"; import { CreateTeamRoleOutput } from "@/modules/organizations/teams/roles/outputs/create-team-role.output"; @@ -10,21 +24,6 @@ import { UpdateTeamRoleOutput } from "@/modules/organizations/teams/roles/output import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { FeaturesRepositoryFixture } from "test/fixtures/repository/features.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { RoleService } from "@calcom/platform-libraries/pbac"; -import type { User, Team } from "@calcom/prisma/client"; describe("Organizations Roles Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/teams/roles/permissions/organizations-teams-roles-permissions.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/roles/permissions/organizations-teams-roles-permissions.controller.e2e-spec.ts index aee79a3d14..496a675508 100644 --- a/apps/api/v2/src/modules/organizations/teams/roles/permissions/organizations-teams-roles-permissions.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/roles/permissions/organizations-teams-roles-permissions.controller.e2e-spec.ts @@ -1,14 +1,11 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateTeamRoleInput } from "@/modules/organizations/teams/roles/inputs/create-team-role.input"; -import type { CreateTeamRoleOutput } from "@/modules/organizations/teams/roles/outputs/create-team-role.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { PermissionString } from "@calcom/platform-libraries/pbac"; +import { RoleService } from "@calcom/platform-libraries/pbac"; +import type { Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { FeaturesRepositoryFixture } from "test/fixtures/repository/features.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; @@ -16,11 +13,13 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { RoleService } from "@calcom/platform-libraries/pbac"; -import type { PermissionString } from "@calcom/platform-libraries/pbac"; -import type { Team, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateTeamRoleInput } from "@/modules/organizations/teams/roles/inputs/create-team-role.input"; +import type { CreateTeamRoleOutput } from "@/modules/organizations/teams/roles/outputs/create-team-role.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Teams Roles Permissions Endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms-responses.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms-responses.controller.e2e-spec.ts index b10537ef1f..c350c3bb48 100644 --- a/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms-responses.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms-responses.controller.e2e-spec.ts @@ -1,14 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { GetRoutingFormResponsesOutput } from "@/modules/organizations/teams/routing-forms/outputs/get-routing-form-responses.output"; -import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -17,9 +12,13 @@ import { RoutingFormsRepositoryFixture } from "test/fixtures/repository/routing- import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { GetRoutingFormResponsesOutput } from "@/modules/organizations/teams/routing-forms/outputs/get-routing-form-responses.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Teams Routing Forms Responses", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms.controller.e2e-spec.ts index 902ff1fa65..b8f2570842 100644 --- a/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/routing-forms/controllers/organizations-teams-routing-forms.controller.e2e-spec.ts @@ -1,14 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { GetRoutingFormsOutput } from "@/modules/organizations/routing-forms/outputs/get-routing-forms.output"; -import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { App_RoutingForms_Form, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; @@ -16,9 +11,13 @@ import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repo import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { App_RoutingForms_Form, Team, User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { GetRoutingFormsOutput } from "@/modules/organizations/routing-forms/outputs/get-routing-forms.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { PrismaWriteService } from "@/modules/prisma/prisma-write.service"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("OrganizationsRoutingFormsResponsesController", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts index 7d08065487..75865f2923 100644 --- a/apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/schedules/organizations-teams-schedules.e2e-spec.ts @@ -1,12 +1,14 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { + ApiSuccessResponse, + GetSchedulesOutput_2024_06_11, + ScheduleOutput_2024_06_11, +} from "@calcom/platform-types"; +import type { Schedule, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; @@ -15,14 +17,11 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { - GetSchedulesOutput_2024_06_11, - ApiSuccessResponse, - ScheduleOutput_2024_06_11, -} from "@calcom/platform-types"; -import type { User, Team, Schedule } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Teams Schedules Endpoints", () => { describe("User Authentication - User is Org Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller.e2e-spec.ts index 8d628f22e2..030d976550 100644 --- a/apps/api/v2/src/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller.e2e-spec.ts @@ -1,5 +1,21 @@ -import { bootstrap } from "@/bootstrap"; +import { AttendeeVerifyEmail } from "@calcom/platform-libraries/emails"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import { TOTP as TOTPtoMock } from "@otplib/core"; +import { totp } from "otplib"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { VerifiedResourcesRepositoryFixtures } from "test/fixtures/repository/verified-resources.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; @@ -13,23 +29,6 @@ import { TeamVerifiedPhoneOutput, TeamVerifiedPhonesOutput, } from "@/modules/verified-resources/outputs/verified-phone.output"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import { TOTP as TOTPtoMock } from "@otplib/core"; -import { totp } from "otplib"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { VerifiedResourcesRepositoryFixtures } from "test/fixtures/repository/verified-resources.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { AttendeeVerifyEmail } from "@calcom/platform-libraries/emails"; -import type { User, Team } from "@calcom/prisma/client"; jest.spyOn(totp, "generate").mockImplementation(function () { return "1234"; diff --git a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts index b9acab95a5..2b17a6fefa 100644 --- a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts @@ -1,6 +1,21 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { VerifiedResourcesRepositoryFixtures } from "test/fixtures/repository/verified-resources.repository.fixture"; +import { WorkflowRepositoryFixture } from "test/fixtures/repository/workflow.repository.fixture"; +import { randomString } from "test/utils/randomString"; // Assuming this is your main app bootstrapper import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; @@ -14,13 +29,13 @@ import { } from "@/modules/workflows/inputs/create-form-workflow"; import { ATTENDEE, - REMINDER, - PHONE_NUMBER, EMAIL, - WorkflowEmailAttendeeStepDto, - WorkflowEmailAddressStepDto, + PHONE_NUMBER, + REMINDER, UpdateEmailAddressWorkflowStepDto, UpdatePhoneWhatsAppNumberWorkflowStepDto, + WorkflowEmailAddressStepDto, + WorkflowEmailAttendeeStepDto, } from "@/modules/workflows/inputs/workflow-step.input"; import { AFTER_EVENT, @@ -42,22 +57,6 @@ import { GetRoutingFormWorkflowOutput, GetRoutingFormWorkflowsOutput, } from "@/modules/workflows/outputs/routing-form-workflow.output"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { VerifiedResourcesRepositoryFixtures } from "test/fixtures/repository/verified-resources.repository.fixture"; -import { WorkflowRepositoryFixture } from "test/fixtures/repository/workflow.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User, Team } from "@calcom/prisma/client"; describe("OrganizationsTeamsWorkflowsController (E2E)", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/organizations/users/bookings/controllers/organizations-users-bookings.e2e-spec.ts b/apps/api/v2/src/modules/organizations/users/bookings/controllers/organizations-users-bookings.e2e-spec.ts index 6998ddb8a1..8ceff75f7f 100644 --- a/apps/api/v2/src/modules/organizations/users/bookings/controllers/organizations-users-bookings.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/users/bookings/controllers/organizations-users-bookings.e2e-spec.ts @@ -1,14 +1,17 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; -import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; -import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; +import type { + BookingOutput_2024_08_13, + CreateBookingInput_2024_08_13, + GetBookingsOutput_2024_08_13, + GetSeatedBookingOutput_2024_08_13, + PaginationMetaDto, + RecurringBookingOutput_2024_08_13, +} from "@calcom/platform-types"; +import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { HostsRepositoryFixture } from "test/fixtures/repository/hosts.repository.fixture"; @@ -20,17 +23,13 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants"; -import type { - CreateBookingInput_2024_08_13, - BookingOutput_2024_08_13, - RecurringBookingOutput_2024_08_13, - GetBookingsOutput_2024_08_13, - GetSeatedBookingOutput_2024_08_13, - PaginationMetaDto, -} from "@calcom/platform-types"; -import type { User, PlatformOAuthClient, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output"; +import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input"; +import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { OrganizationsTeamsBookingsModule } from "@/modules/organizations/teams/bookings/organizations-teams-bookings.module"; describe("Organizations UsersBookings Endpoints 2024-08-13", () => { describe("Organization User bookings", () => { diff --git a/apps/api/v2/src/modules/organizations/users/index/controllers/organizations-users.e2e-spec.ts b/apps/api/v2/src/modules/organizations/users/index/controllers/organizations-users.e2e-spec.ts index 0bbeda071d..b0b0a1cd7b 100644 --- a/apps/api/v2/src/modules/organizations/users/index/controllers/organizations-users.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/users/index/controllers/organizations-users.e2e-spec.ts @@ -1,16 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { EmailService } from "@/modules/email/email.service"; -import { GetOrganizationsUsersInput } from "@/modules/organizations/users/index/inputs/get-organization-users.input"; -import { GetOrgUsersWithProfileOutput } from "@/modules/organizations/users/index/outputs/get-organization-users.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { CreateUserInput } from "@/modules/users/inputs/create-user.input"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { AttributeOption, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { AttributeRepositoryFixture } from "test/fixtures/repository/attributes.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; @@ -20,9 +13,15 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User, Team, AttributeOption } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { EmailService } from "@/modules/email/email.service"; +import { GetOrganizationsUsersInput } from "@/modules/organizations/users/index/inputs/get-organization-users.input"; +import { GetOrgUsersWithProfileOutput } from "@/modules/organizations/users/index/outputs/get-organization-users.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { CreateUserInput } from "@/modules/users/inputs/create-user.input"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Users Endpoints", () => { const bio = "I am a bio"; diff --git a/apps/api/v2/src/modules/organizations/users/ooo/controllers/organizations-users-ooo.e2e-spec.ts b/apps/api/v2/src/modules/organizations/users/ooo/controllers/organizations-users-ooo.e2e-spec.ts index afaeba97ce..95f5d9ea06 100644 --- a/apps/api/v2/src/modules/organizations/users/ooo/controllers/organizations-users-ooo.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/users/ooo/controllers/organizations-users-ooo.e2e-spec.ts @@ -1,13 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { UserOooOutputDto } from "@/modules/ooo/outputs/ooo.output"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; @@ -15,9 +11,12 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { UserOooOutputDto } from "@/modules/ooo/outputs/ooo.output"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations User OOO Endpoints", () => { describe("User Authentication - User is Org Admin", () => { diff --git a/apps/api/v2/src/modules/organizations/webhooks/controllers/organizations-webhooks.e2e-spec.ts b/apps/api/v2/src/modules/organizations/webhooks/controllers/organizations-webhooks.e2e-spec.ts index 14ae9cc088..f0ba3dff74 100644 --- a/apps/api/v2/src/modules/organizations/webhooks/controllers/organizations-webhooks.e2e-spec.ts +++ b/apps/api/v2/src/modules/organizations/webhooks/controllers/organizations-webhooks.e2e-spec.ts @@ -1,5 +1,16 @@ -import { bootstrap } from "@/bootstrap"; +import type { Team, Webhook } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; @@ -9,18 +20,6 @@ import { TeamWebhookOutputResponseDto, TeamWebhooksOutputResponseDto, } from "@/modules/webhooks/outputs/team-webhook.output"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import type { Team, Webhook } from "@calcom/prisma/client"; describe("WebhooksController (e2e)", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/routing-forms/controllers/routing-forms.e2e-spec.ts b/apps/api/v2/src/modules/routing-forms/controllers/routing-forms.e2e-spec.ts index fd04188c42..c6b642274b 100644 --- a/apps/api/v2/src/modules/routing-forms/controllers/routing-forms.e2e-spec.ts +++ b/apps/api/v2/src/modules/routing-forms/controllers/routing-forms.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { App_RoutingForms_Form, EventType, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { RoutingFormsRepositoryFixture } from "test/fixtures/repository/routing-forms.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; import { PrismaModule } from "@/modules/prisma/prisma.module"; @@ -10,19 +22,6 @@ import { import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { RoutingFormsRepositoryFixture } from "test/fixtures/repository/routing-forms.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { App_RoutingForms_Form, EventType, User, Team } from "@calcom/prisma/client"; describe("Routing forms endpoints", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/selected-calendars/controllers/selected-calendars.controller.e2e-spec.ts b/apps/api/v2/src/modules/selected-calendars/controllers/selected-calendars.controller.e2e-spec.ts index c89291166e..06e56ae1ad 100644 --- a/apps/api/v2/src/modules/selected-calendars/controllers/selected-calendars.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/selected-calendars/controllers/selected-calendars.controller.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import { APPLE_CALENDAR_ID, APPLE_CALENDAR_TYPE, SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { Credential, PlatformOAuthClient, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; +import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { CalendarsServiceMock } from "test/mocks/calendars-service-mock"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { CalendarsService } from "@/ee/calendars/services/calendars.service"; import { HttpExceptionFilter } from "@/filters/http-exception.filter"; import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter"; @@ -7,19 +19,6 @@ import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions. import { SelectedCalendarOutputResponseDto } from "@/modules/selected-calendars/outputs/selected-calendars.output"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { CredentialsRepositoryFixture } from "test/fixtures/repository/credentials.repository.fixture"; -import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { TokensRepositoryFixture } from "test/fixtures/repository/tokens.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { CalendarsServiceMock } from "test/mocks/calendars-service-mock"; - -import { APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID, SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { PlatformOAuthClient, Team, User, Credential } from "@calcom/prisma/client"; const CLIENT_REDIRECT_URI = "http://localhost:5555"; diff --git a/apps/api/v2/src/modules/slots/slots-2024-04-15/controllers/slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-04-15/controllers/slots.controller.e2e-spec.ts index 764d0a1252..2c43e93107 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-04-15/controllers/slots.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-04-15/controllers/slots.controller.e2e-spec.ts @@ -1,16 +1,9 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; -import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { SlotsModule_2024_04_15 } from "@/modules/slots/slots-2024-04-15/slots.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { AttendeeRepositoryFixture } from "test/fixtures/repository/attendee.repository.fixture"; import { BookingSeatRepositoryFixture } from "test/fixtures/repository/booking-seat.repository.fixture"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; @@ -19,9 +12,15 @@ import { SelectedSlotRepositoryFixture } from "test/fixtures/repository/selected import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { User } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; +import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { SlotsModule_2024_04_15 } from "@/modules/slots/slots-2024-04-15/slots.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; const expectedSlotsUTC = { slots: { diff --git a/apps/api/v2/src/modules/slots/slots-2024-04-15/services/slots-worker.service.ts b/apps/api/v2/src/modules/slots/slots-2024-04-15/services/slots-worker.service.ts index dc9612b3ce..acbb06f703 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-04-15/services/slots-worker.service.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-04-15/services/slots-worker.service.ts @@ -1,4 +1,4 @@ -import * as path from "node:path"; +import path from "node:path"; import { Worker } from "node:worker_threads"; import type { GetScheduleOptions } from "@calcom/trpc/server/routers/viewer/slots/types"; diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/dynamic-event-type-slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/dynamic-event-type-slots.controller.e2e-spec.ts index 78f842d915..b9e5864318 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/dynamic-event-type-slots.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/dynamic-event-type-slots.controller.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; +import type { CreateScheduleInput_2024_06_11 } from "@calcom/platform-types"; +import type { Profile, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; @@ -12,19 +24,6 @@ import { GetSlotsOutput_2024_09_04 } from "@/modules/slots/slots-2024-09-04/outp import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; -import type { CreateScheduleInput_2024_06_11 } from "@calcom/platform-types"; -import type { Profile, User, Team } from "@calcom/prisma/client"; describe("Slots 2024-09-04 Endpoints", () => { describe("Dynamic event type slots", () => { diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/org-team-event-type-slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/org-team-event-type-slots.controller.e2e-spec.ts index 24d760c725..b71145d454 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/org-team-event-type-slots.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/org-team-event-type-slots.controller.e2e-spec.ts @@ -1,18 +1,10 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; -import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; -import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { expectedSlotsUTC } from "@/modules/slots/slots-2024-09-04/controllers/e2e/expected-slots"; -import { GetSlotsOutput_2024_09_04 } from "@/modules/slots/slots-2024-09-04/outputs/get-slots.output"; -import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; +import type { CreateScheduleInput_2024_06_11 } from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; @@ -22,10 +14,17 @@ import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository. import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; -import type { CreateScheduleInput_2024_06_11 } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; +import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; +import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { expectedSlotsUTC } from "@/modules/slots/slots-2024-09-04/controllers/e2e/expected-slots"; +import { GetSlotsOutput_2024_09_04 } from "@/modules/slots/slots-2024-09-04/outputs/get-slots.output"; +import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Slots 2024-09-04 Endpoints", () => { describe("Organization team event type slots", () => { diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/reschedule-uid-slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/reschedule-uid-slots.controller.e2e-spec.ts index f2a18d5e0f..8628a29123 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/reschedule-uid-slots.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/reschedule-uid-slots.controller.e2e-spec.ts @@ -1,5 +1,16 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; +import type { CreateScheduleInput_2024_06_11 } from "@calcom/platform-types"; +import type { Booking, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; @@ -12,18 +23,6 @@ import { GetSlotsOutput_2024_09_04 } from "@/modules/slots/slots-2024-09-04/outp import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; -import type { CreateScheduleInput_2024_06_11 } from "@calcom/platform-types"; -import type { User, Booking } from "@calcom/prisma/client"; describe("Slots 2024-09-04 Endpoints", () => { describe("rescheduleUid functionality", () => { diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts index e1364ba685..f033206095 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/team-event-type-slots.controller.e2e-spec.ts @@ -1,5 +1,30 @@ -import { bootstrap } from "@/bootstrap"; +import { + CAL_API_VERSION_HEADER, + ERROR_STATUS, + SUCCESS_STATUS, + VERSION_2024_09_04, +} from "@calcom/platform-constants"; +import type { + CreateScheduleInput_2024_06_11, + ReserveSlotOutput_2024_09_04 as ReserveSlotOutputData_2024_09_04, +} from "@calcom/platform-types"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import { advanceTo, clear } from "jest-date-mock"; +import { DateTime } from "luxon"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { SelectedSlotRepositoryFixture } from "test/fixtures/repository/selected-slot.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; @@ -10,32 +35,6 @@ import { ReserveSlotOutputResponse_2024_09_04 } from "@/modules/slots/slots-2024 import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import { advanceTo, clear } from "jest-date-mock"; -import { DateTime } from "luxon"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { SelectedSlotRepositoryFixture } from "test/fixtures/repository/selected-slot.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { - CAL_API_VERSION_HEADER, - SUCCESS_STATUS, - VERSION_2024_09_04, - ERROR_STATUS, -} from "@calcom/platform-constants"; -import type { - CreateScheduleInput_2024_06_11, - ReserveSlotOutput_2024_09_04 as ReserveSlotOutputData_2024_09_04, -} from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; describe("Slots 2024-09-04 Endpoints", () => { describe("Team event type slots", () => { diff --git a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/user-event-type-slots.controller.e2e-spec.ts b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/user-event-type-slots.controller.e2e-spec.ts index a5340144fe..dab8302cbc 100644 --- a/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/user-event-type-slots.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/e2e/user-event-type-slots.controller.e2e-spec.ts @@ -1,5 +1,28 @@ -import { bootstrap } from "@/bootstrap"; +import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; +import type { + CreateScheduleInput_2024_06_11, + ReserveSlotOutput_2024_09_04 as ReserveSlotOutputData_2024_09_04, +} from "@calcom/platform-types"; +import type { EventType, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import { advanceTo, clear } from "jest-date-mock"; +import { DateTime } from "luxon"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { AttendeeRepositoryFixture } from "test/fixtures/repository/attendee.repository.fixture"; +import { BookingSeatRepositoryFixture } from "test/fixtures/repository/booking-seat.repository.fixture"; +import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { OOORepositoryFixture } from "test/fixtures/repository/ooo.repository.fixture"; +import { SelectedSlotRepositoryFixture } from "test/fixtures/repository/selected-slot.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module"; import { SchedulesService_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/services/schedules.service"; import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard"; @@ -16,30 +39,6 @@ import { ReserveSlotOutputResponse_2024_09_04 } from "@/modules/slots/slots-2024 import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import { advanceTo, clear } from "jest-date-mock"; -import { DateTime } from "luxon"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { AttendeeRepositoryFixture } from "test/fixtures/repository/attendee.repository.fixture"; -import { BookingSeatRepositoryFixture } from "test/fixtures/repository/booking-seat.repository.fixture"; -import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { OOORepositoryFixture } from "test/fixtures/repository/ooo.repository.fixture"; -import { SelectedSlotRepositoryFixture } from "test/fixtures/repository/selected-slot.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_09_04 } from "@calcom/platform-constants"; -import type { - CreateScheduleInput_2024_06_11, - ReserveSlotOutput_2024_09_04 as ReserveSlotOutputData_2024_09_04, -} from "@calcom/platform-types"; -import type { EventType, User, Team } from "@calcom/prisma/client"; describe("Slots 2024-09-04 Endpoints", () => { describe("User event type slots", () => { diff --git a/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types-webhooks.controller.e2e-spec.ts b/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types-webhooks.controller.e2e-spec.ts index 9f5bc0b23d..88efd49035 100644 --- a/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types-webhooks.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types-webhooks.controller.e2e-spec.ts @@ -1,5 +1,17 @@ -import { bootstrap } from "@/bootstrap"; +import type { EventType, Team, User, Webhook } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; @@ -9,19 +21,6 @@ import { EventTypeWebhooksOutputResponseDto, } from "@/modules/webhooks/outputs/event-type-webhook.output"; import { DeleteManyWebhooksOutputResponseDto } from "@/modules/webhooks/outputs/webhook.output"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import type { EventType, Team, User, Webhook } from "@calcom/prisma/client"; describe("Teams EventTypes WebhooksController (e2e)", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types.controller.e2e-spec.ts b/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types.controller.e2e-spec.ts index 8235ef75d9..14789a5d77 100644 --- a/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/teams/event-types/controllers/teams-event-types.controller.e2e-spec.ts @@ -1,24 +1,7 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { HOSTS_REQUIRED_WHEN_SWITCHING_SCHEDULING_TYPE_ERROR } from "@/modules/organizations/event-types/services/input.service"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_06_14 } from "@calcom/platform-constants"; import { - BookingWindowPeriodInputTypeEnum_2024_06_14, BookerLayoutsInputEnum_2024_06_14, + BookingWindowPeriodInputTypeEnum_2024_06_14, ConfirmationPolicyEnum, NoticeThresholdUnitEnum, } from "@calcom/platform-enums"; @@ -30,7 +13,23 @@ import type { TeamEventTypeOutput_2024_06_14, UpdateTeamEventTypeInput_2024_06_14, } from "@calcom/platform-types"; -import type { User, Team } from "@calcom/prisma/client"; +import type { Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { HOSTS_REQUIRED_WHEN_SWITCHING_SCHEDULING_TYPE_ERROR } from "@/modules/organizations/event-types/services/input.service"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Organizations Event Types Endpoints", () => { describe("User Authentication - User is Org Admin", () => { @@ -305,7 +304,7 @@ describe("Organizations Event Types Endpoints", () => { }, ], // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore + // @ts-expect-error schedulingType: "collective", hosts: [ { diff --git a/apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.e2e-spec.ts b/apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.e2e-spec.ts index 736074252b..204819e7fa 100644 --- a/apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.e2e-spec.ts @@ -1,5 +1,19 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { ApiSuccessResponse } from "@calcom/platform-types"; +import type { EventType, Membership, Team, User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { CreateTeamMembershipInput } from "@/modules/teams/memberships/inputs/create-team-membership.input"; import { UpdateTeamMembershipInput } from "@/modules/teams/memberships/inputs/update-team-membership.input"; @@ -10,21 +24,6 @@ import { TeamMembershipOutput } from "@/modules/teams/memberships/outputs/team-m import { UpdateTeamMembershipOutput } from "@/modules/teams/memberships/outputs/update-team-membership.output"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { ApiSuccessResponse } from "@calcom/platform-types"; -import type { EventType, User, Membership, Team } from "@calcom/prisma/client"; describe("Teams Memberships Endpoints", () => { describe("User Authentication - User is Team Admin", () => { diff --git a/apps/api/v2/src/modules/teams/schedules/controllers/teams-schedules.e2e-spec.ts b/apps/api/v2/src/modules/teams/schedules/controllers/teams-schedules.e2e-spec.ts index acdf6964be..91d6b3a96f 100644 --- a/apps/api/v2/src/modules/teams/schedules/controllers/teams-schedules.e2e-spec.ts +++ b/apps/api/v2/src/modules/teams/schedules/controllers/teams-schedules.e2e-spec.ts @@ -1,22 +1,21 @@ -import { bootstrap } from "@/bootstrap"; -import { AppModule } from "@/app.module"; -import { PrismaModule } from "@/modules/prisma/prisma.module"; -import { TokensModule } from "@/modules/tokens/tokens.module"; -import { UsersModule } from "@/modules/users/users.module"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import type { GetSchedulesOutput_2024_06_11 } from "@calcom/platform-types"; +import type { Schedule, Team, User } from "@calcom/prisma/client"; import { INestApplication } from "@nestjs/common"; import { NestExpressApplication } from "@nestjs/platform-express"; import { Test } from "@nestjs/testing"; -import * as request from "supertest"; +import request from "supertest"; import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture"; import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; import { randomString } from "test/utils/randomString"; import { withApiAuth } from "test/utils/withApiAuth"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import type { GetSchedulesOutput_2024_06_11 } from "@calcom/platform-types"; -import type { User, Team, Schedule } from "@calcom/prisma/client"; +import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; +import { PrismaModule } from "@/modules/prisma/prisma.module"; +import { TokensModule } from "@/modules/tokens/tokens.module"; +import { UsersModule } from "@/modules/users/users.module"; describe("Teams Schedules Endpoints", () => { describe("User Authentication - User is Team Admin", () => { diff --git a/apps/api/v2/src/modules/teams/teams/controllers/teams.controller.e2e-spec.ts b/apps/api/v2/src/modules/teams/teams/controllers/teams.controller.e2e-spec.ts index 45a2ac515d..210ceecf57 100644 --- a/apps/api/v2/src/modules/teams/teams/controllers/teams.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/teams/teams/controllers/teams.controller.e2e-spec.ts @@ -1,5 +1,19 @@ -import { bootstrap } from "@/bootstrap"; +import { SUCCESS_STATUS } from "@calcom/platform-constants"; +import { slugify } from "@calcom/platform-libraries"; +import { TeamOutputDto } from "@calcom/platform-types"; +import { User } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import Stripe from "stripe"; +import request from "supertest"; +import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; +import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; +import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { randomString } from "test/utils/randomString"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { StripeService } from "@/modules/stripe/stripe.service"; import { CreateTeamInput } from "@/modules/teams/teams/inputs/create-team.input"; import { UpdateTeamDto } from "@/modules/teams/teams/inputs/update-team.input"; @@ -7,22 +21,6 @@ import { CreateTeamOutput } from "@/modules/teams/teams/outputs/teams/create-tea import { GetTeamOutput } from "@/modules/teams/teams/outputs/teams/get-team.output"; import { GetTeamsOutput } from "@/modules/teams/teams/outputs/teams/get-teams.output"; import { TeamsModule } from "@/modules/teams/teams/teams.module"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import Stripe from "stripe"; - -import { User } from "@calcom/prisma/client"; -import * as request from "supertest"; -import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture"; -import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture"; -import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { randomString } from "test/utils/randomString"; - -import { SUCCESS_STATUS } from "@calcom/platform-constants"; -import { slugify } from "@calcom/platform-libraries"; -import { TeamOutputDto } from "@calcom/platform-types"; describe("Teams endpoint", () => { let app: INestApplication; diff --git a/apps/api/v2/src/modules/tokens/tokens.service.ts b/apps/api/v2/src/modules/tokens/tokens.service.ts index 8091d80875..c384721250 100644 --- a/apps/api/v2/src/modules/tokens/tokens.service.ts +++ b/apps/api/v2/src/modules/tokens/tokens.service.ts @@ -1,7 +1,6 @@ import { Injectable, InternalServerErrorException } from "@nestjs/common"; -import { Logger } from "@nestjs/common"; import { ConfigService } from "@nestjs/config"; -import * as jwt from "jsonwebtoken"; +import jwt from "jsonwebtoken"; type OAuthTokenPayload = { userId?: number; @@ -12,8 +11,6 @@ type OAuthTokenPayload = { @Injectable() export class TokensService { - private readonly logger = new Logger("TokensService"); - constructor(private readonly config: ConfigService) {} getDecodedThirdPartyAccessToken(token: string): OAuthTokenPayload | null { @@ -25,7 +22,7 @@ export class TokensService { let decodedToken: OAuthTokenPayload; try { decodedToken = jwt.verify(token, encryptionKey) as OAuthTokenPayload; - } catch (e) { + } catch (_e) { return null; } diff --git a/apps/api/v2/src/modules/users/validators/timeZoneValidator.ts b/apps/api/v2/src/modules/users/validators/timeZoneValidator.ts index dcd2c14745..ec60bcc2e6 100644 --- a/apps/api/v2/src/modules/users/validators/timeZoneValidator.ts +++ b/apps/api/v2/src/modules/users/validators/timeZoneValidator.ts @@ -1,10 +1,9 @@ import type { ValidatorConstraintInterface } from "class-validator"; import { ValidatorConstraint } from "class-validator"; -import * as tzdata from "tzdata"; - +import tzdata from "tzdata"; @ValidatorConstraint({ name: "timezoneValidator", async: false }) export class TimeZoneValidator implements ValidatorConstraintInterface { - validate(timeZone: string) { + validate(timeZone: string): boolean { const timeZoneList = Object.keys(tzdata.zones); if (timeZoneList.includes(timeZone)) return true; @@ -12,7 +11,7 @@ export class TimeZoneValidator implements ValidatorConstraintInterface { return false; } - defaultMessage() { + defaultMessage(): string { return "Please include a valid time zone"; } } diff --git a/apps/api/v2/src/modules/webhooks/controllers/webhooks.controller.e2e-spec.ts b/apps/api/v2/src/modules/webhooks/controllers/webhooks.controller.e2e-spec.ts index 5a840b5cc5..67d092e934 100644 --- a/apps/api/v2/src/modules/webhooks/controllers/webhooks.controller.e2e-spec.ts +++ b/apps/api/v2/src/modules/webhooks/controllers/webhooks.controller.e2e-spec.ts @@ -1,5 +1,14 @@ -import { bootstrap } from "@/bootstrap"; +import type { Webhook } from "@calcom/prisma/client"; +import { INestApplication } from "@nestjs/common"; +import { NestExpressApplication } from "@nestjs/platform-express"; +import { Test } from "@nestjs/testing"; +import request from "supertest"; +import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; +import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; +import { randomString } from "test/utils/randomString"; +import { withApiAuth } from "test/utils/withApiAuth"; import { AppModule } from "@/app.module"; +import { bootstrap } from "@/bootstrap"; import { PrismaModule } from "@/modules/prisma/prisma.module"; import { TokensModule } from "@/modules/tokens/tokens.module"; import { UsersModule } from "@/modules/users/users.module"; @@ -9,16 +18,6 @@ import { UserWebhookOutputResponseDto, UserWebhooksOutputResponseDto, } from "@/modules/webhooks/outputs/user-webhook.output"; -import { INestApplication } from "@nestjs/common"; -import { NestExpressApplication } from "@nestjs/platform-express"; -import { Test } from "@nestjs/testing"; -import * as request from "supertest"; -import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture"; -import { WebhookRepositoryFixture } from "test/fixtures/repository/webhooks.repository.fixture"; -import { randomString } from "test/utils/randomString"; -import { withApiAuth } from "test/utils/withApiAuth"; - -import type { Webhook } from "@calcom/prisma/client"; describe("WebhooksController (e2e)", () => { let app: INestApplication; diff --git a/apps/api/v2/tsconfig.json b/apps/api/v2/tsconfig.json index 97665ab1db..599bae60ec 100644 --- a/apps/api/v2/tsconfig.json +++ b/apps/api/v2/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "module": "commonjs", + "esModuleInterop": true, "declaration": true, "resolveJsonModule": true, "removeComments": true, diff --git a/biome.json b/biome.json index 27fa9945bd..bf4a0ffa64 100644 --- a/biome.json +++ b/biome.json @@ -164,7 +164,7 @@ { "includes": [ "apps/api/v2/src/config/app.ts", - "apps/api/v2/src/config/bootstrap.ts", + "apps/api/v2/src/bootstrap.ts", "apps/api/v2/src/config/env.ts", "apps/api/v2/src/env.ts", "apps/api/v2/test/setEnvVars.ts"