From ae64d7ba8223c2d2992a4db9f003a1c94efa869f Mon Sep 17 00:00:00 2001 From: Keith Williams Date: Tue, 16 Apr 2024 18:58:36 -0300 Subject: [PATCH] fix: API v2 recurring spelling (#14620) --- apps/api/v2/src/app.rewrites.middleware.ts | 3 +++ .../bookings/controllers/bookings.controller.e2e-spec.ts | 2 +- .../v2/src/ee/bookings/controllers/bookings.controller.ts | 8 ++++---- ...booking.input.ts => create-recurring-booking.input.ts} | 2 +- apps/api/v2/swagger/documentation.json | 6 +++--- packages/platform/sdk/src/swagger-types.d.ts | 6 +++--- 6 files changed, 15 insertions(+), 12 deletions(-) rename apps/api/v2/src/ee/bookings/inputs/{create-reccuring-booking.input.ts => create-recurring-booking.input.ts} (88%) diff --git a/apps/api/v2/src/app.rewrites.middleware.ts b/apps/api/v2/src/app.rewrites.middleware.ts index 67c314ec74..728b068ac7 100644 --- a/apps/api/v2/src/app.rewrites.middleware.ts +++ b/apps/api/v2/src/app.rewrites.middleware.ts @@ -10,6 +10,9 @@ export class RewriterMiddleware implements NestMiddleware { if (req.url.startsWith("/v2/ee")) { req.url = req.url.replace("/v2/ee", "/v2"); } + if (req.url.contains("reccuring")) { + req.url = req.url.replace("reccuring", "recurring"); + } next(); } } diff --git a/apps/api/v2/src/ee/bookings/controllers/bookings.controller.e2e-spec.ts b/apps/api/v2/src/ee/bookings/controllers/bookings.controller.e2e-spec.ts index 6bf1c431e1..891a8e7b62 100644 --- a/apps/api/v2/src/ee/bookings/controllers/bookings.controller.e2e-spec.ts +++ b/apps/api/v2/src/ee/bookings/controllers/bookings.controller.e2e-spec.ts @@ -199,7 +199,7 @@ describe("Bookings Endpoints", () => { // }; // return request(app.getHttpServer()) - // .post("/v2/bookings/reccuring") + // .post("/v2/bookings/recurring") // .send(body) // .expect(201) // .then((response) => { diff --git a/apps/api/v2/src/ee/bookings/controllers/bookings.controller.ts b/apps/api/v2/src/ee/bookings/controllers/bookings.controller.ts index 039f33a767..2d29aef416 100644 --- a/apps/api/v2/src/ee/bookings/controllers/bookings.controller.ts +++ b/apps/api/v2/src/ee/bookings/controllers/bookings.controller.ts @@ -1,5 +1,5 @@ import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input"; -import { CreateReccuringBookingInput } from "@/ee/bookings/inputs/create-reccuring-booking.input"; +import { CreateRecurringBookingInput } from "@/ee/bookings/inputs/create-recurring-booking.input"; import { GetBookingOutput } from "@/ee/bookings/outputs/get-booking.output"; import { GetBookingsOutput } from "@/ee/bookings/outputs/get-bookings.output"; import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator"; @@ -180,10 +180,10 @@ export class BookingsController { throw new InternalServerErrorException("Could not cancel booking."); } - @Post("/reccuring") - async createReccuringBooking( + @Post("/recurring") + async createRecurringBooking( @Req() req: BookingRequest, - @Body() _: CreateReccuringBookingInput[], + @Body() _: CreateRecurringBookingInput[], @Headers(X_CAL_CLIENT_ID) clientId?: string ): Promise> { const oAuthClientId = clientId?.toString(); diff --git a/apps/api/v2/src/ee/bookings/inputs/create-reccuring-booking.input.ts b/apps/api/v2/src/ee/bookings/inputs/create-recurring-booking.input.ts similarity index 88% rename from apps/api/v2/src/ee/bookings/inputs/create-reccuring-booking.input.ts rename to apps/api/v2/src/ee/bookings/inputs/create-recurring-booking.input.ts index 3c7478b39b..471e8ab8df 100644 --- a/apps/api/v2/src/ee/bookings/inputs/create-reccuring-booking.input.ts +++ b/apps/api/v2/src/ee/bookings/inputs/create-recurring-booking.input.ts @@ -3,7 +3,7 @@ import { IsBoolean, IsNumber, IsOptional } from "class-validator"; import type { AppsStatus } from "@calcom/platform-libraries"; -export class CreateReccuringBookingInput extends CreateBookingInput { +export class CreateRecurringBookingInput extends CreateBookingInput { @IsBoolean() @IsOptional() noEmail?: boolean; diff --git a/apps/api/v2/swagger/documentation.json b/apps/api/v2/swagger/documentation.json index b7bed443e3..ede8013ed2 100644 --- a/apps/api/v2/swagger/documentation.json +++ b/apps/api/v2/swagger/documentation.json @@ -1380,9 +1380,9 @@ ] } }, - "/v2/bookings/reccuring": { + "/v2/bookings/recurring": { "post": { - "operationId": "BookingsController_createReccuringBooking", + "operationId": "BookingsController_createRecurringBooking", "parameters": [ { "name": "x-cal-client-id", @@ -4270,4 +4270,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/platform/sdk/src/swagger-types.d.ts b/packages/platform/sdk/src/swagger-types.d.ts index f64b6d71dc..cc8f48f7b9 100644 --- a/packages/platform/sdk/src/swagger-types.d.ts +++ b/packages/platform/sdk/src/swagger-types.d.ts @@ -117,8 +117,8 @@ export interface paths { "/v2/bookings": { post: operations["BookingsController_createBooking"]; }; - "/v2/bookings/reccuring": { - post: operations["BookingsController_createReccuringBooking"]; + "/v2/bookings/recurring": { + post: operations["BookingsController_createRecurringBooking"]; }; "/v2/bookings/instant": { post: operations["BookingsController_createInstantBooking"]; @@ -814,7 +814,7 @@ export interface operations { }; }; }; - BookingsController_createReccuringBooking: { + BookingsController_createRecurringBooking: { requestBody: { content: { "application/json": string[];