Scheduling infrastructure for absolutely everyone.
Revert "fix: managed orgs get bookings (#23063)" (#23066)
Lauris Skraucis58ef0abb990d
diff --git a/apps/api/v2/package.json b/apps/api/v2/package.jsonindex 2d837c985ce..c55b6a2443e 100644--- a/apps/api/v2/package.json+++ b/apps/api/v2/package.json@@ -38,7 +38,7 @@"@axiomhq/winston": "^1.2.0","@calcom/platform-constants": "*","@calcom/platform-enums": "*",- "@calcom/platform-libraries": "npm:@calcom/[email protected]",+ "@calcom/platform-libraries": "npm:@calcom/[email protected]","@calcom/platform-types": "*","@calcom/platform-utils": "*","@calcom/prisma": "*",diff --git a/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.ts b/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.tsindex c61d939613f..cd770676665 100644--- a/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.ts+++ b/apps/api/v2/src/ee/event-types-private-links/controllers/event-types-private-links.controller.ts@@ -4,21 +4,37 @@ import { Permissions } from "@/modules/auth/decorators/permissions/permissions.dimport { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";import { EventTypeOwnershipGuard } from "@/modules/event-types/guards/event-type-ownership.guard";-import { Body, Controller, Delete, Get, Param, ParseIntPipe, Patch, Post, UseGuards } from "@nestjs/common";-import { ApiHeader, ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";+import {+ Body,+ Controller,+ Delete,+ Get,+ Param,+ ParseIntPipe,+ Patch,+ Post,+ UseGuards,+} from "@nestjs/common";+import { ApiHeader, ApiOperation, ApiTags as DocsTags, OmitType } from "@nestjs/swagger";-import { EVENT_TYPE_READ, EVENT_TYPE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";+import {+ EVENT_TYPE_READ,+ EVENT_TYPE_WRITE,+ SUCCESS_STATUS,+} from "@calcom/platform-constants";import {CreatePrivateLinkInput,CreatePrivateLinkOutput,DeletePrivateLinkOutput,GetPrivateLinksOutput,- UpdatePrivateLinkBody,+ UpdatePrivateLinkInput,UpdatePrivateLinkOutput,} from "@calcom/platform-types";import { PrivateLinksService } from "../services/private-links.service";+class UpdatePrivateLinkBody extends OmitType(UpdatePrivateLinkInput, ["linkId"] as const) {}+@Controller({path: "/v2/event-types/:eventTypeId/private-links",})@@ -103,3 +119,5 @@ export class EventTypesPrivateLinksController {};}}++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.tsdeleted file mode 100644index ee09018ec9d..00000000000--- a/apps/api/v2/src/modules/organizations/bookings/managed-organizations-bookings.controller.e2e-spec.ts+++ /dev/null@@ -1,542 +0,0 @@-import { bootstrap } from "@/app";-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 { INestApplication } from "@nestjs/common";-import { NestExpressApplication } from "@nestjs/platform-express";-import { Test } from "@nestjs/testing";-import { User } from "@prisma/client";-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 { HostsRepositoryFixture } from "test/fixtures/repository/hosts.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 { 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 } from "@calcom/platform-constants";-import {- BookingOutput_2024_08_13,- RecurringBookingOutput_2024_08_13,- GetBookingsOutput_2024_08_13,- GetSeatedBookingOutput_2024_08_13,-} from "@calcom/platform-types";-import { PlatformOAuthClient, Team } from "@calcom/prisma/client";--describe("Organizations Bookings Endpoints 2024-08-13", () => {- describe("Manager and managed organizations bookings", () => {- let app: INestApplication;- let managerOrganization: Team;- let managedOrganization: Team;-- let userRepositoryFixture: UserRepositoryFixture;- let bookingsRepositoryFixture: BookingsRepositoryFixture;- let schedulesService: SchedulesService_2024_04_15;- let eventTypesRepositoryFixture: EventTypesRepositoryFixture;- let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;- let oAuthClient: PlatformOAuthClient;- let teamRepositoryFixture: TeamRepositoryFixture;- let membershipsRepositoryFixture: MembershipRepositoryFixture;- let hostsRepositoryFixture: HostsRepositoryFixture;- let organizationsRepositoryFixture: OrganizationRepositoryFixture;- let profileRepositoryFixture: ProfileRepositoryFixture;- let managedOrganizationsRepositoryFixture: ManagedOrganizationsRepositoryFixture;-- const managerOrgUserEmail = "[email protected]";- const managerOrgUserEmail2 = "[email protected]";- const managedOrgUserEmail = "[email protected]";- const nonOrgUserEmail1 = "[email protected]";- let managerOrgUser1: User;- let managerOrgUser2: User;- let managedOrgUser: User;- let nonOrgUser1: User;- let managerOrgTeam1: Team;- let managedOrgTeam1: Team;-- let managerOrgEventTypeId: number;- let managedOrgEventTypeId: number;- let nonOrgEventTypeId: number;-- beforeAll(async () => {- const moduleRef = await withApiAuth(- managerOrgUserEmail,- Test.createTestingModule({- imports: [AppModule, OrganizationsTeamsBookingsModule],- })- )- .overrideGuard(PermissionsGuard)- .useValue({- canActivate: () => true,- })- .overrideGuard(PlatformPlanGuard)- .useValue({- canActivate: () => true,- })- .compile();-- userRepositoryFixture = new UserRepositoryFixture(moduleRef);- bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);- eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);- oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);- teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);- organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);- profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);- membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);- hostsRepositoryFixture = new HostsRepositoryFixture(moduleRef);- schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);- managedOrganizationsRepositoryFixture = new ManagedOrganizationsRepositoryFixture(moduleRef);-- await setupManagerOrganization();- await setupManagedOrganization();-- app = moduleRef.createNestApplication();- bootstrap(app as NestExpressApplication);-- await app.init();- });-- async function setupManagerOrganization() {- managerOrganization = await organizationsRepositoryFixture.create({- name: "manager organization bookings",- isPlatform: true,- });- managerOrgTeam1 = await teamRepositoryFixture.create({- name: "team orgs booking 1",- isOrganization: false,- parent: { connect: { id: managerOrganization.id } },- });- oAuthClient = await createOAuthClient(managerOrganization.id);-- nonOrgUser1 = await userRepositoryFixture.create({- email: nonOrgUserEmail1,- locale: "it",- name: "NonOrgUser1Bookings",- platformOAuthClients: {- connect: {- id: oAuthClient.id,- },- },- });-- managerOrgUser1 = await userRepositoryFixture.create({- email: managerOrgUserEmail,- locale: "it",- name: "orgUser1Bookings",- platformOAuthClients: {- connect: {- id: oAuthClient.id,- },- },- });-- managerOrgUser2 = await userRepositoryFixture.create({- email: managerOrgUserEmail2,- locale: "it",- name: "orgUser2Bookings",- platformOAuthClients: {- connect: {- id: oAuthClient.id,- },- },- });-- const userSchedule: CreateScheduleInput_2024_04_15 = {- name: "working time",- timeZone: "Europe/Rome",- isDefault: true,- };- await schedulesService.createUserSchedule(managerOrgUser1.id, userSchedule);- await schedulesService.createUserSchedule(nonOrgUser1.id, userSchedule);- await schedulesService.createUserSchedule(managerOrgUser2.id, userSchedule);-- const orgEventType = await eventTypesRepositoryFixture.createTeamEventType({- schedulingType: "COLLECTIVE",- team: {- connect: { id: managerOrgTeam1.id },- },- title: "Collective Event Type",- slug: "manager-org-bookings-collective-event-type",- length: 60,- assignAllTeamMembers: true,- bookingFields: [],- locations: [],- });-- await profileRepositoryFixture.create({- uid: `usr-${managerOrgUser1.id}`,- username: managerOrgUserEmail,- organization: {- connect: {- id: managerOrganization.id,- },- },- user: {- connect: {- id: managerOrgUser1.id,- },- },- });-- await profileRepositoryFixture.create({- uid: `usr-${managerOrgUser2.id}`,- username: managerOrgUserEmail2,- organization: {- connect: {- id: managerOrganization.id,- },- },- user: {- connect: {- id: managerOrgUser2.id,- },- },- });-- await membershipsRepositoryFixture.create({- role: "OWNER",- user: { connect: { id: managerOrgUser1.id } },- team: { connect: { id: managerOrganization.id } },- accepted: true,- });-- await membershipsRepositoryFixture.create({- role: "MEMBER",- user: { connect: { id: managerOrgUser2.id } },- team: { connect: { id: managerOrganization.id } },- accepted: true,- });-- const nonOrgEventType = await eventTypesRepositoryFixture.create(- {- title: "Non Org Event Type",- slug: "non-org-event-type",- length: 60,- bookingFields: [],- locations: [],- },- nonOrgUser1.id- );-- managerOrgEventTypeId = orgEventType.id;- nonOrgEventTypeId = nonOrgEventType.id;-- await hostsRepositoryFixture.create({- isFixed: true,- user: {- connect: {- id: managerOrgUser2.id,- },- },- eventType: {- connect: {- id: managerOrgEventTypeId,- },- },- });-- await bookingsRepositoryFixture.create({- user: {- connect: {- id: managerOrgUser2.id,- },- },- startTime: new Date(Date.UTC(2030, 0, 9, 13, 0, 0)),- endTime: new Date(Date.UTC(2030, 0, 9, 14, 0, 0)),- title: "Manager Org Collective Booking",- uid: `manager-org-collective-${randomString()}`,- eventType: {- connect: {- id: managerOrgEventTypeId,- },- },- location: "https://meet.google.com/abc-def-ghi",- customInputs: {},- metadata: {},- responses: {- name: "alice",- email: "[email protected]",- },- attendees: {- create: {- email: "[email protected]",- name: "alice",- locale: "es",- timeZone: "Europe/Madrid",- },- },- });-- await bookingsRepositoryFixture.create({- user: {- connect: {- id: nonOrgUser1.id,- },- },- startTime: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)),- endTime: new Date(Date.UTC(2030, 0, 8, 14, 0, 0)),- title: "Non-Org Booking 1",- uid: `non-org-booking-1-${randomString()}`,- eventType: {- connect: {- id: nonOrgEventTypeId,- },- },- location: "https://meet.google.com/jkl-mno-pqr",- customInputs: {},- metadata: {},- responses: {- name: managerOrgUser2.name ?? "",- email: managerOrgUserEmail2,- },- attendees: {- create: {- email: managerOrgUserEmail2,- name: managerOrgUser2.name ?? "",- locale: "en",- timeZone: managerOrgUser2.timeZone ?? "Europe/Madrid",- },- },- });- }-- async function setupManagedOrganization() {- managedOrganization = await organizationsRepositoryFixture.create({- name: "managed organization bookings",- isPlatform: true,- });- await managedOrganizationsRepositoryFixture.createManagedOrganization(- managerOrganization.id,- managedOrganization.id- );-- managedOrgTeam1 = await teamRepositoryFixture.create({- name: "managed org team 1",- isOrganization: false,- parent: { connect: { id: managedOrganization.id } },- });-- managedOrgUser = await userRepositoryFixture.create({- email: managedOrgUserEmail,- locale: "it",- name: "ManagedOrgUser1Bookings",- platformOAuthClients: {- connect: {- id: oAuthClient.id,- },- },- });-- await profileRepositoryFixture.create({- uid: `usr-${managedOrgUser.id}`,- username: managedOrgUserEmail,- organization: {- connect: {- id: managedOrganization.id,- },- },- user: {- connect: {- id: managedOrgUser.id,- },- },- });-- await profileRepositoryFixture.create({- uid: `usr-${managerOrgUser1.id}`,- username: managerOrgUserEmail,- organization: {- connect: {- id: managedOrganization.id,- },- },- user: {- connect: {- id: managerOrgUser1.id,- },- },- });-- await membershipsRepositoryFixture.create({- role: "MEMBER",- user: { connect: { id: managedOrgUser.id } },- team: { connect: { id: managedOrganization.id } },- accepted: true,- });-- await membershipsRepositoryFixture.create({- role: "OWNER",- user: { connect: { id: managerOrgUser1.id } },- team: { connect: { id: managedOrganization.id } },- accepted: true,- });-- const userSchedule: CreateScheduleInput_2024_04_15 = {- name: "working time",- timeZone: "Europe/Rome",- isDefault: true,- };- await schedulesService.createUserSchedule(managedOrgUser.id, userSchedule);-- const managedOrgEventType = await eventTypesRepositoryFixture.createTeamEventType({- schedulingType: "COLLECTIVE",- team: {- connect: { id: managedOrgTeam1.id },- },- title: "Collective Event Type",- slug: "managed-org-bookings-collective-event-type",- length: 60,- assignAllTeamMembers: true,- bookingFields: [],- locations: [],- });-- managedOrgEventTypeId = managedOrgEventType.id;-- await hostsRepositoryFixture.create({- isFixed: true,- user: {- connect: {- id: managedOrgUser.id,- },- },- eventType: {- connect: {- id: managedOrgEventType.id,- },- },- });-- await bookingsRepositoryFixture.create({- user: {- connect: {- id: managedOrgUser.id,- },- },- startTime: new Date(Date.UTC(2030, 0, 11, 13, 0, 0)),- endTime: new Date(Date.UTC(2030, 0, 11, 14, 0, 0)),- title: "Managed Org Booking",- uid: `managed-org-booking-${randomString()}`,- eventType: {- connect: {- id: managedOrgEventTypeId,- },- },- location: "https://meet.google.com/ghi-jkl-mno",- customInputs: {},- metadata: {},- responses: {- name: "charlie",- email: "[email protected]",- },- attendees: {- create: {- email: "[email protected]",- name: "charlie",- locale: "en",- timeZone: "Europe/Madrid",- },- },- });- }-- describe("get manager organization bookings", () => {- it("should get bookings by organizationId for manager organization", async () => {- return request(app.getHttpServer())- .get(`/v2/organizations/${managerOrganization.id}/bookings`)- .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)- .expect(200)- .then(async (response) => {- const responseBody: GetBookingsOutput_2024_08_13 = response.body;- expect(responseBody.status).toEqual(SUCCESS_STATUS);- expect(responseBody.data).toBeDefined();- const data: (- | BookingOutput_2024_08_13- | RecurringBookingOutput_2024_08_13- | GetSeatedBookingOutput_2024_08_13- )[] = responseBody.data;- expect(data.length).toEqual(2);- expect(data.map((booking) => booking.eventTypeId).sort()).toEqual(- [managerOrgEventTypeId, nonOrgEventTypeId].sort()- );- });- });-- it("should get bookings by organizationId and userId", async () => {- return request(app.getHttpServer())- .get(`/v2/organizations/${managerOrganization.id}/bookings?userIds=${managerOrgUser2.id}`)- .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)- .expect(200)- .then(async (response) => {- const responseBody: GetBookingsOutput_2024_08_13 = response.body;- expect(responseBody.status).toEqual(SUCCESS_STATUS);- expect(responseBody.data).toBeDefined();- const data: (- | BookingOutput_2024_08_13- | RecurringBookingOutput_2024_08_13- | GetSeatedBookingOutput_2024_08_13- )[] = responseBody.data;- expect(data.length).toEqual(2);- expect(data.map((booking) => booking.eventTypeId).sort()).toEqual(- [managerOrgEventTypeId, nonOrgEventTypeId].sort()- );- });- });- });-- describe("get managed organization bookings", () => {- it("should get bookings by organizationId for managed organization", async () => {- return request(app.getHttpServer())- .get(`/v2/organizations/${managedOrganization.id}/bookings`)- .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)- .expect(200)- .then(async (response) => {- const responseBody: GetBookingsOutput_2024_08_13 = response.body;- expect(responseBody.status).toEqual(SUCCESS_STATUS);- expect(responseBody.data).toBeDefined();- const data: (- | BookingOutput_2024_08_13- | RecurringBookingOutput_2024_08_13- | GetSeatedBookingOutput_2024_08_13- )[] = responseBody.data;- expect(data.length).toEqual(1);- expect(data[0].eventTypeId).toEqual(managedOrgEventTypeId);- });- });- });-- async function createOAuthClient(organizationId: number) {- const data = {- logo: "logo-url",- name: "name",- redirectUris: ["http://localhost:5555"],- permissions: 32,- areCalendarEventsEnabled: false,- areEmailsEnabled: false,- };- const secret = "secret";-- const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);- return client;- }-- afterAll(async () => {- await oauthClientRepositoryFixture.delete(oAuthClient.id);- await teamRepositoryFixture.delete(managerOrganization.id);- await teamRepositoryFixture.delete(managedOrganization.id);- await userRepositoryFixture.deleteByEmail(managerOrgUser1.email);- await userRepositoryFixture.deleteByEmail(nonOrgUser1.email);- await bookingsRepositoryFixture.deleteAllBookings(managerOrgUser1.id, managerOrgUser1.email);- await bookingsRepositoryFixture.deleteAllBookings(nonOrgUser1.id, nonOrgUser1.email);- await app.close();- });- });-});diff --git a/apps/api/v2/test/fixtures/repository/managed-organizations.repository.fixture.ts b/apps/api/v2/test/fixtures/repository/managed-organizations.repository.fixture.tsindex a29a8a21328..3e5cd868215 100644--- a/apps/api/v2/test/fixtures/repository/managed-organizations.repository.fixture.ts+++ b/apps/api/v2/test/fixtures/repository/managed-organizations.repository.fixture.ts@@ -34,13 +34,4 @@ export class ManagedOrganizationsRepositoryFixture {},});}-- async createManagedOrganization(managerOrganizationId: number, managedOrganizationId: number) {- return this.prismaWriteClient.managedOrganization.create({- data: {- managerOrganizationId,- managedOrganizationId,- },- });- }}diff --git a/packages/platform/types/event-types/inputs/private-link.input.ts b/packages/platform/types/event-types/inputs/private-link.input.tsindex 6b3eec784aa..322fb600b1e 100644--- a/packages/platform/types/event-types/inputs/private-link.input.ts+++ b/packages/platform/types/event-types/inputs/private-link.input.ts@@ -18,8 +18,7 @@ export class CreatePrivateLinkInput {@IsInt()@Min(1)@ApiPropertyOptional({- description:- "Maximum number of times the link can be used. If omitted and expiresAt is not provided, defaults to 1 (one time use).",+ description: "Maximum number of times the link can be used. If omitted and expiresAt is not provided, defaults to 1 (one time use).",type: Number,example: 10,minimum: 1,@@ -59,25 +58,4 @@ export class UpdatePrivateLinkInput {maxUsageCount?: number;}-export class UpdatePrivateLinkBody {- @IsOptional()- @IsDate()- @Type(() => Date)- @ApiPropertyOptional({- description: "New expiration date for time-based links",- type: Date,- example: "2024-12-31T23:59:59.000Z",- })- expiresAt?: Date;- @IsOptional()- @IsInt()- @Min(1)- @ApiPropertyOptional({- description: "New maximum number of times the link can be used",- type: Number,- example: 10,- minimum: 1,- })- maxUsageCount?: number;-}diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.tsindex f5e4b4edb80..56e96e9aa65 100644--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts@@ -99,9 +99,6 @@ export async function getBookings({role: {in: ["ADMIN", "OWNER"],},- ...(user.orgId && {- teamId: user.orgId,- }),},select: {id: true,diff --git a/yarn.lock b/yarn.lockindex e6447a0c176..b6292e45c7f 100644--- a/yarn.lock+++ b/yarn.lock@@ -2500,7 +2500,7 @@ __metadata:"@axiomhq/winston": ^1.2.0"@calcom/platform-constants": "*""@calcom/platform-enums": "*"- "@calcom/platform-libraries": "npm:@calcom/[email protected]"+ "@calcom/platform-libraries": "npm:@calcom/[email protected]""@calcom/platform-types": "*""@calcom/platform-utils": "*""@calcom/prisma": "*"@@ -3559,13 +3559,13 @@ __metadata:languageName: unknownlinkType: soft-"@calcom/platform-libraries@npm:@calcom/[email protected]":- version: 0.0.304- resolution: "@calcom/platform-libraries@npm:0.0.304"+"@calcom/platform-libraries@npm:@calcom/[email protected]":+ version: 0.0.300+ resolution: "@calcom/platform-libraries@npm:0.0.300"dependencies:"@calcom/features": "*""@calcom/lib": "*"- checksum: 6447a8447fe6bc877e01b80a67de93069be06db0b54a35cfc48ba32cba417ae0ea57ea7b6e15dfb5e6b39b0b968f71cd300df94c7da95c491713359c8230d6dc+ checksum: bff9f08a0586169f2d5a85167f0a0e0e57ca93b637ca858a72b5d3d943ceef37d652efa3d2e6f7561548e4dfe3aabb5c0c6e0a8d38f68d3d21d5e6993e56ad7dlanguageName: nodelinkType: hard