commonscomputer/cal.diy
4
0
Fork 0
Code Issues Pull Requests Actions 2.1k Packages Projects Releases Wiki Activity

fix: post / patch attendees docs w examples

Browse Source
This commit is contained in:
Agusti Fernandez Pardo
2022-04-27 19:25:36 +02:00
parent 14e2964a6d
commit e52af0bbef
55 changed files with 247 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/validations/attendee.ts
+19 -12
View File
@@ -1,8 +1,9 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _AttendeeModel as Attendee } from "@calcom/prisma/zod";
import { timeZone } from "@lib/validations/shared/timeZone";
export const schemaAttendeeBaseBodyParams = Attendee.pick({
bookingId: true,
email: true,
@@ -10,22 +11,28 @@ export const schemaAttendeeBaseBodyParams = Attendee.pick({
timeZone: true,
}).partial();
const schemaAttendeeCreateParams = z.object({
bookingId: z.any(),
email: z.string().email(),
name: z.string(),
timeZone: z.string(),
});
const schemaAttendeeCreateParams = z
.object({
bookingId: z.number().int(),
email: z.string().email(),
name: z.string(),
timeZone: timeZone,
})
.strict();
const schemaAttendeeEditParams = z.object({
// @note: disallowing email/bookingId changes in attendee via API for now as it would introduce side effects
name: z.string(),
timeZone: z.string(),
});
const schemaAttendeeEditParams = z
.object({
// @note: disallowing bookingId changes in attendee via API for now as it would introduce side effects
name: z.string().optional(),
email: z.string().email().optional(),
timeZone: timeZone.optional(),
})
.strict();
export const schemaAttendeeEditBodyParams = schemaAttendeeBaseBodyParams.merge(schemaAttendeeEditParams);
export const schemaAttendeeCreateBodyParams = schemaAttendeeBaseBodyParams.merge(schemaAttendeeCreateParams);
export const schemaAttendeeReadPublic = Attendee.pick({
id: true,
bookingId: true,
name: true,
email: true,
lib/validations/availability.ts
+1 -1
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _AvailabilityModel as Availability } from "@calcom/prisma/zod";
@@ -12,6 +11,7 @@ export const schemaAvailabilityBaseBodyParams = Availability.pick({
}).partial();
export const schemaAvailabilityReadPublic = Availability.pick({
id: true,
startTime: true,
endTime: true,
date: true,
lib/validations/booking-reference.ts
+1 -1
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _BookingReferenceModel as BookingReference } from "@calcom/prisma/zod";
@@ -14,6 +13,7 @@ export const schemaBookingReferenceBaseBodyParams = BookingReference.pick({
}).partial();
export const schemaBookingReferenceReadPublic = BookingReference.pick({
id: true,
type: true,
bookingId: true,
uid: true,
lib/validations/booking.ts
+30 -10
View File
@@ -1,23 +1,43 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _BookingModel as Booking } from "@calcom/prisma/zod";
const schemaBookingBaseBodyParams = Booking.omit({ id: true }).partial();
const schemaBookingBaseBodyParams = Booking.pick({
uid: true,
userId: true,
eventTypeId: true,
title: true,
startTime: true,
endTime: true,
}).partial();
const schemaBookingRequiredParams = z.object({
const schemaBookingCreateParams = z.object({
uid: z.string(),
userId: z.number(),
eventTypeId: z.number(),
title: z.string(),
startTime: z.date(),
endTime: z.date(),
});
export const schemaBookingCreateBodyParams = schemaBookingBaseBodyParams.merge(schemaBookingCreateParams);
// @note: disallowing userId/eventTypeId changes in booking endpoint via PATCH for now as it would introduce side effects
const schemaBookingEditParams = z.object({
uid: z.string(),
title: z.string(),
startTime: z.date(),
endTime: z.date(),
});
export const schemaBookingBodyParams = schemaBookingBaseBodyParams.merge(schemaBookingRequiredParams);
export const schemaBookingEditBodyParams = schemaBookingBaseBodyParams.merge(schemaBookingEditParams);
export const schemaBookingPublic = Booking.omit({});
export const withValidBooking = withValidation({
schema: schemaBookingBodyParams,
type: "Zod",
mode: "body",
export const schemaBookingReadPublic = Booking.pick({
id: true,
userId: true,
eventTypeId: true,
uid: true,
title: true,
startTime: true,
endTime: true,
});
lib/validations/credential.ts
-25
View File
@@ -1,25 +0,0 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _CredentialModel as Credential } from "@calcom/prisma/zod";
import { jsonSchema } from "./shared/jsonSchema";
const schemaCredentialBaseBodyParams = Credential.omit({ id: true, userId: true }).partial();
const schemaCredentialRequiredParams = z.object({
type: z.string(),
key: jsonSchema,
});
export const schemaCredentialBodyParams = schemaCredentialBaseBodyParams.merge(
schemaCredentialRequiredParams
);
export const schemaCredentialPublic = Credential.omit({});
export const withValidCredential = withValidation({
schema: schemaCredentialBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/daily-event-reference.ts
+25 -12
View File
@@ -1,22 +1,35 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _DailyEventReferenceModel as DailyEventReference } from "@calcom/prisma/zod";
export const schemaDailyEventReferenceBaseBodyParams = DailyEventReference.omit({ id: true });
export const schemaDailyEventReferenceBaseBodyParams = DailyEventReference.pick({
dailytoken: true,
dailyurl: true,
bookingId: true,
}).partial();
const schemaDailyEventReferenceRequiredParams = z.object({
email: z.string().email(),
const schemaDailyEventReferenceCreateParams = z.object({
dailytoken: z.string(),
dailyurl: z.string(),
bookingId: z.number(),
});
export const schemaDailyEventReferenceBodyParams = schemaDailyEventReferenceBaseBodyParams.merge(
schemaDailyEventReferenceRequiredParams
export const schemaDailyEventReferenceCreateBodyParams = schemaDailyEventReferenceBaseBodyParams.merge(
schemaDailyEventReferenceCreateParams
);
export const schemaDailyEventReferencePublic = DailyEventReference.omit({});
export const withValidDailyEventReference = withValidation({
schema: schemaDailyEventReferenceBodyParams,
type: "Zod",
mode: "body",
const schemaDailyEventReferenceEditParams = z.object({
dailytoken: z.string(),
dailyurl: z.string(),
// @note: disallowing bookingId changes in daily-event-reference via API endpoint for now as it would introduce side effects
});
export const schemaDailyEventReferenceEditBodyParams = schemaDailyEventReferenceBaseBodyParams.merge(
schemaDailyEventReferenceEditParams
);
export const schemaDailyEventReferenceReadPublic = DailyEventReference.pick({
id: true,
dailytoken: true,
dailyurl: true,
bookingId: true,
});
lib/validations/destination-calendar.ts
+31 -11
View File
@@ -1,23 +1,43 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _DestinationCalendarModel as DestinationCalendar } from "@calcom/prisma/zod";
export const schemaDestinationCalendarBaseBodyParams = DestinationCalendar.omit({ id: true }).partial();
export const schemaDestinationCalendarBaseBodyParams = DestinationCalendar.pick({
integration: true,
externalId: true,
eventTypeId: true,
bookingId: true,
userId: true,
}).partial();
const schemaDestinationCalendarRequiredParams = z.object({
const schemaDestinationCalendarEditParams = z.object({
integration: z.string(),
externalId: z.string(),
eventTypeId: z.number(),
bookingId: z.number(),
userId: z.number(),
});
export const schemaDestinationCalendarBodyParams = schemaDestinationCalendarBaseBodyParams.merge(
schemaDestinationCalendarRequiredParams
export const schemaDestinationCalendarEditBodyParams = schemaDestinationCalendarBaseBodyParams.merge(
schemaDestinationCalendarEditParams
);
const schemaDestinationCalendarCreateParams = z.object({
integration: z.string(),
externalId: z.string(),
eventTypeId: z.number(),
bookingId: z.number(),
userId: z.number(),
});
export const schemaDestinationCalendarCreateBodyParams = schemaDestinationCalendarBaseBodyParams.merge(
schemaDestinationCalendarCreateParams
);
export const schemaDestinationCalendarPublic = DestinationCalendar.omit({});
export const withValidDestinationCalendar = withValidation({
schema: schemaDestinationCalendarBodyParams,
type: "Zod",
mode: "body",
export const schemaDestinationCalendarReadPublic = DestinationCalendar.pick({
id: true,
integration: true,
externalId: true,
eventTypeId: true,
bookingId: true,
userId: true,
});
lib/validations/event-type-custom-input.ts
-9
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _EventTypeCustomInputModel as EventTypeCustomInput } from "@calcom/prisma/zod";
@@ -17,8 +16,6 @@ const schemaEventTypeCustomInputRequiredParams = z.object({
eventType: z.object({
connect: z.object({
id: z.number().optional(),
// username: z.string().optional(),
// email: z.string().optional(),
}),
// FIXME: Provide valid EventTypeModel schema here, but not sure how yet.
create: z.any(),
@@ -28,9 +25,3 @@ const schemaEventTypeCustomInputRequiredParams = z.object({
export const schemaEventTypeCustomInputBodyParams = schemaEventTypeCustomInputBaseBodyParams.merge(
schemaEventTypeCustomInputRequiredParams
);
export const withValidEventTypeCustomInput = withValidation({
schema: schemaEventTypeCustomInputBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/event-type.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _EventTypeModel as EventType } from "@calcom/prisma/zod";
@@ -14,9 +13,3 @@ const schemaEventTypeRequiredParams = z.object({
export const schemaEventTypeBodyParams = schemaEventTypeBaseBodyParams.merge(schemaEventTypeRequiredParams);
// @NOTE: Removing locations and metadata properties before validation, add them later if required
export const schemaEventTypePublic = EventType.omit({ locations: true, metadata: true });
export const withValidEventType = withValidation({
schema: schemaEventTypeBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/membership.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _MembershipModel as Membership } from "@calcom/prisma/zod";
@@ -13,9 +12,3 @@ export const schemaMembershipBodyParams = schemaMembershipBaseBodyParams.merge(
);
export const schemaMembershipPublic = Membership.omit({});
export const withValidMembership = withValidation({
schema: schemaMembershipBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/payment.ts
-8
View File
@@ -1,13 +1,5 @@
import { withValidation } from "next-validations";
import { _PaymentModel as Payment } from "@calcom/prisma/zod";
// FIXME: Payment seems a delicate endpoint, do we need to remove anything here?
export const schemaPaymentBodyParams = Payment.omit({ id: true });
export const schemaPaymentPublic = Payment.omit({ externalId: true });
export const withValidPayment = withValidation({
schema: schemaPaymentBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/reminder-mail.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _ReminderMailModel as ReminderMail } from "@calcom/prisma/zod";
@@ -16,9 +15,3 @@ const schemaReminderMailRequiredParams = z.object({
export const schemaReminderMailBodyParams = schemaReminderMailBaseBodyParams.merge(
schemaReminderMailRequiredParams
);
export const withValidReminderMail = withValidation({
schema: schemaReminderMailBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/schedule.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _ScheduleModel as Schedule } from "@calcom/prisma/zod";
@@ -13,9 +12,3 @@ const schemaScheduleRequiredParams = z.object({
export const schemaScheduleBodyParams = schemaScheduleBaseBodyParams.merge(schemaScheduleRequiredParams);
export const schemaSchedulePublic = Schedule.omit({});
export const withValidSchedule = withValidation({
schema: schemaScheduleBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/selected-calendar.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _SelectedCalendarModel as SelectedCalendar } from "@calcom/prisma/zod";
@@ -24,9 +23,3 @@ const schemaSelectedCalendarRequiredParams = z.object({
export const schemaSelectedCalendarBodyParams = schemaSelectedCalendarBaseBodyParams.merge(
schemaSelectedCalendarRequiredParams
);
export const withValidSelectedCalendar = withValidation({
schema: schemaSelectedCalendarBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/shared/timeZone.ts
+5
View File
@@ -0,0 +1,5 @@
import * as tzdb from "tzdata";
import * as z from "zod";
// @note: This is a custom validation that checks if the timezone is valid and exists in the tzdb library
export const timeZone = z.string().refine((tz: string) => Object.keys(tzdb.zones).includes(tz));
lib/validations/team.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _TeamModel as Team } from "@calcom/prisma/zod";
@@ -10,9 +9,3 @@ const schemaTeamRequiredParams = z.object({});
export const schemaTeamBodyParams = schemaTeamBaseBodyParams.merge(schemaTeamRequiredParams);
export const schemaTeamPublic = Team.omit({});
export const withValidTeam = withValidation({
schema: schemaTeamBodyParams,
type: "Zod",
mode: "body",
});
lib/validations/user.ts
+3 -7
View File
@@ -1,9 +1,9 @@
import { withValidation } from "next-validations";
import * as tzdb from "tzdata";
import { z } from "zod";
import { _UserModel as User } from "@calcom/prisma/zod";
import { timeZone } from "@lib/validations/shared/timeZone";
// @note: These are the ONLY values allowed as weekStart. So user don't introduce bad data.
enum weekdays {
MONDAY = "Monday",
@@ -77,11 +77,7 @@ export const schemaUserBaseBodyParams = User.pick({
const schemaUserEditParams = z.object({
weekStart: z.nativeEnum(weekdays).optional(),
brandColor: z.string().min(4).max(9).regex(/^#/).optional(),
timeZone: z
.string()
// @note: This is a custom validation that checks if the timezone is valid and exists in the tzdb library
.refine((tz: string) => Object.keys(tzdb.zones).includes(tz))
.optional(),
timeZone: timeZone.optional(),
bufferTime: z.number().min(0).max(86400).optional(),
startTime: z.number().min(0).max(86400).optional(),
endTime: z.number().min(0).max(86400).optional(),
lib/validations/webhook.ts
-8
View File
@@ -1,13 +1,5 @@
import { withValidation } from "next-validations";
import { _WebhookModel as Webhook } from "@calcom/prisma/zod";
export const schemaWebhookBodyParams = Webhook.omit({ id: true }).partial();
export const schemaWebhookPublic = Webhook.omit({});
export const withValidWebhook = withValidation({
schema: schemaWebhookBodyParams,
type: "Zod",
mode: "body",
});
pages/api/attendees/[id].ts
+25 -8
View File
@@ -14,7 +14,7 @@ import {
* @swagger
* /attendees/{id}:
* get:
* summary: Get an attendee by ID
* summary: Find an attendee by ID
* parameters:
* - in: path
* name: id
@@ -22,6 +22,7 @@ import {
* type: integer
* required: true
* description: Numeric ID of the attendee to get
* example: 3
* security:
* - ApiKeyAuth: []
* tags:
@@ -37,18 +38,34 @@ import {
* summary: Edit an existing attendee
* consumes:
* - application/json
* requestBody:
* description: Edit an existing attendee related to one of your bookings
* required: true
* content:
* application/json:
* schema:
* type: object
* required:
* - bookingId
* - name
* - email
* - timeZone
* properties:
* email:
* type: string
* example: email@example.com
* name:
* type: string
* example: John Doe
* timeZone:
* type: string
* example: Europe/London
* parameters:
* - in: body
* name: attendee
* description: The attendee to edit
* schema:
* type: object
* $ref: '#/components/schemas/Attendee'
* required: true
* - in: path
* name: id
* schema:
* type: integer
* example: 3
* required: true
* description: Numeric ID of the attendee to edit
* security:
pages/api/attendees/index.ts
+38 -11
View File
@@ -10,7 +10,7 @@ import { schemaAttendeeCreateBodyParams, schemaAttendeeReadPublic } from "@lib/v
* @swagger
* /attendees:
* get:
* summary: Get all attendees
* summary: Find all attendees
* security:
* - ApiKeyAuth: []
* tags:
@@ -26,6 +26,33 @@ import { schemaAttendeeCreateBodyParams, schemaAttendeeReadPublic } from "@lib/v
* summary: Creates a new attendee
* security:
* - ApiKeyAuth: []
* consumes:
* - application/json
* requestBody:
* description: Create a new attendee related to one of your bookings
* required: true
* content:
* application/json:
* schema:
* type: object
* required:
* - bookingId
* - name
* - email
* - timeZone
* properties:
* bookingId:
* type: number
* example: 1
* email:
* type: string
* example: email@example.com
* name:
* type: string
* example: John Doe
* timeZone:
* type: string
* example: Europe/London
* tags:
* - attendees
* responses:
@@ -61,11 +88,12 @@ async function createOrlistAllAttendees(
error,
});
} else if (method === "POST") {
const safe = schemaAttendeeCreateBodyParams.safeParse(req.body);
if (!safe.success) {
throw new Error("Invalid request body", safe.error);
const safePost = schemaAttendeeCreateBodyParams.safeParse(req.body);
if (!safePost.success) {
console.log(safePost.error);
res.status(400).json({ error: safePost.error });
throw new Error("Invalid request body", safePost.error);
}
const bookingId = safe.data.bookingId;
const userId = req.userId;
const userWithBookings = await prisma.user.findUnique({
where: { id: userId },
@@ -76,15 +104,14 @@ async function createOrlistAllAttendees(
}
const userBookingIds = userWithBookings.bookings.map((booking: any) => booking.id).flat();
// Here we make sure to only return attendee's of the user's own bookings.
if (!userBookingIds.includes(parseInt(safe.data.bookingId)))
res.status(401).json({ message: "Unauthorized" });
if (!userBookingIds.includes(safePost.data.bookingId)) res.status(401).json({ message: "Unauthorized" });
else {
delete safe.data.bookingId;
const noBookingId = safe.data;
const data = await prisma.attendee.create({
data: {
...noBookingId,
booking: { connect: { id: parseInt(bookingId) } },
email: safePost.data.email,
name: safePost.data.name,
timeZone: safePost.data.timeZone,
booking: { connect: { id: safePost.data.bookingId } },
},
});
const attendee = schemaAttendeeReadPublic.parse(data);
pages/api/availabilities/[id].ts
+1 -1
View File
@@ -17,7 +17,7 @@ import {
* @swagger
* /availabilities/{id}:
* get:
* summary: Get an availability by ID
* summary: Find an availability by ID
* parameters:
* - in: path
* name: id
pages/api/availabilities/index.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import {
* @swagger
* /availabilities:
* get:
* summary: Get all availabilities
* summary: Find all availabilities
* security:
* - ApiKeyAuth: []
* tags:
pages/api/booking-references/[id].ts
+1 -1
View File
@@ -18,7 +18,7 @@ import {
* @swagger
* /booking-references/{id}:
* get:
* summary: Get a booking reference by ID
* summary: Find a booking reference by ID
* parameters:
* - in: path
* name: id
pages/api/booking-references/index.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import {
* @swagger
* /booking-references:
* get:
* summary: Get all booking references
* summary: Find all booking references
* security:
* - ApiKeyAuth: []
* tags:
pages/api/bookings/[id].ts
+6 -5
View File
@@ -4,7 +4,7 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import type { BookingResponse } from "@lib/types";
import { schemaBookingBodyParams, schemaBookingPublic } from "@lib/validations/booking";
import { schemaBookingEditBodyParams, schemaBookingReadPublic } from "@lib/validations/booking";
import {
schemaQueryIdParseInt,
withValidQueryIdTransformParseInt,
@@ -14,7 +14,7 @@ import {
* @swagger
* /bookings/{id}:
* get:
* summary: Get a booking by ID
* summary: Find a booking by ID
* parameters:
* - in: path
* name: id
@@ -88,7 +88,6 @@ import {
export async function bookingById(req: NextApiRequest, res: NextApiResponse<BookingResponse>) {
const { method, query, body } = req;
const safeQuery = schemaQueryIdParseInt.safeParse(query);
const safeBody = schemaBookingBodyParams.safeParse(body);
if (!safeQuery.success) throw new Error("Invalid request query", safeQuery.error);
const userId = req.userId;
const userWithBookings = await prisma.user.findUnique({
@@ -103,7 +102,7 @@ export async function bookingById(req: NextApiRequest, res: NextApiResponse<Book
case "GET":
await prisma.booking
.findUnique({ where: { id: safeQuery.data.id } })
.then((data) => schemaBookingPublic.parse(data))
.then((data) => schemaBookingReadPublic.parse(data))
.then((booking) => res.status(200).json({ booking }))
.catch((error: Error) =>
res.status(404).json({
@@ -114,6 +113,8 @@ export async function bookingById(req: NextApiRequest, res: NextApiResponse<Book
break;
case "PATCH":
const safeBody = schemaBookingEditBodyParams.safeParse(body);
if (!safeBody.success) {
throw new Error("Invalid request body");
}
@@ -122,7 +123,7 @@ export async function bookingById(req: NextApiRequest, res: NextApiResponse<Book
where: { id: safeQuery.data.id },
data: safeBody.data,
})
.then((data) => schemaBookingPublic.parse(data))
.then((data) => schemaBookingReadPublic.parse(data))
.then((booking) => res.status(200).json({ booking }))
.catch((error: Error) =>
res.status(404).json({
pages/api/bookings/index.ts
+5 -5
View File
@@ -4,13 +4,13 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import { BookingResponse, BookingsResponse } from "@lib/types";
import { schemaBookingBodyParams, schemaBookingPublic, withValidBooking } from "@lib/validations/booking";
import { schemaBookingCreateBodyParams, schemaBookingReadPublic } from "@lib/validations/booking";
/**
* @swagger
* /bookings:
* get:
* summary: Get all bookings
* summary: Find all bookings
* security:
* - ApiKeyAuth: []
* tags:
@@ -46,7 +46,7 @@ async function createOrlistAllBookings(
if (method === "GET") {
const data = await prisma.booking.findMany({ where: { userId } });
const bookings = data.map((booking) => schemaBookingPublic.parse(booking));
const bookings = data.map((booking) => schemaBookingReadPublic.parse(booking));
if (bookings) res.status(200).json({ bookings });
else
(error: Error) =>
@@ -55,11 +55,11 @@ async function createOrlistAllBookings(
error,
});
} else if (method === "POST") {
const safe = schemaBookingBodyParams.safeParse(req.body);
const safe = schemaBookingCreateBodyParams.safeParse(req.body);
if (!safe.success) throw new Error("Invalid request body");
const data = await prisma.booking.create({ data: { ...safe.data, userId } });
const booking = schemaBookingPublic.parse(data);
const booking = schemaBookingReadPublic.parse(data);
if (booking) res.status(201).json({ booking, message: "Booking created successfully" });
else
pages/api/daily-event-references/[id].ts
+6 -6
View File
@@ -5,8 +5,8 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import type { DailyEventReferenceResponse } from "@lib/types";
import {
schemaDailyEventReferenceBodyParams,
schemaDailyEventReferencePublic,
schemaDailyEventReferenceEditBodyParams,
schemaDailyEventReferenceReadPublic,
} from "@lib/validations/daily-event-reference";
import {
schemaQueryIdParseInt,
@@ -17,7 +17,7 @@ import {
* @swagger
* /daily-event-references/{id}:
* get:
* summary: Get a daily event reference by ID
* summary: Find a daily event reference by ID
* parameters:
* - in: path
* name: id
@@ -94,7 +94,7 @@ export async function dailyEventReferenceById(
) {
const { method, query, body } = req;
const safeQuery = schemaQueryIdParseInt.safeParse(query);
const safeBody = schemaDailyEventReferenceBodyParams.safeParse(body);
const safeBody = schemaDailyEventReferenceEditBodyParams.safeParse(body);
if (!safeQuery.success) throw new Error("Invalid request query", safeQuery.error);
const userId = req.userId;
const userBookings = await prisma.booking.findMany({ where: { userId } });
@@ -112,7 +112,7 @@ export async function dailyEventReferenceById(
case "GET":
await prisma.dailyEventReference
.findUnique({ where: { id: safeQuery.data.id } })
.then((data) => schemaDailyEventReferencePublic.parse(data))
.then((data) => schemaDailyEventReferenceReadPublic.parse(data))
.then((daily_event_reference) => res.status(200).json({ daily_event_reference }))
.catch((error: Error) =>
res.status(404).json({
@@ -128,7 +128,7 @@ export async function dailyEventReferenceById(
}
await prisma.dailyEventReference
.update({ where: { id: safeQuery.data.id }, data: safeBody.data })
.then((data) => schemaDailyEventReferencePublic.parse(data))
.then((data) => schemaDailyEventReferenceReadPublic.parse(data))
.then((daily_event_reference) => res.status(200).json({ daily_event_reference }))
.catch((error: Error) =>
res.status(404).json({
pages/api/daily-event-references/index.ts
+6 -6
View File
@@ -5,15 +5,15 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import { DailyEventReferenceResponse, DailyEventReferencesResponse } from "@lib/types";
import {
schemaDailyEventReferenceBodyParams,
schemaDailyEventReferencePublic,
schemaDailyEventReferenceCreateBodyParams,
schemaDailyEventReferenceReadPublic,
} from "@lib/validations/daily-event-reference";
/**
* @swagger
* /daily-event-references:
* get:
* summary: Get all daily event reference
* summary: Find all daily event reference
* security:
* - ApiKeyAuth: []
* tags:
@@ -54,7 +54,7 @@ async function createOrlistAllDailyEventReferences(
where: { bookingId: { in: userBookingIds } },
});
const daily_event_references = data.map((dailyEventReference) =>
schemaDailyEventReferencePublic.parse(dailyEventReference)
schemaDailyEventReferenceReadPublic.parse(dailyEventReference)
);
if (daily_event_references) res.status(200).json({ daily_event_references });
else
@@ -64,11 +64,11 @@ async function createOrlistAllDailyEventReferences(
error,
});
} else if (method === "POST") {
const safe = schemaDailyEventReferenceBodyParams.safeParse(req.body);
const safe = schemaDailyEventReferenceCreateBodyParams.safeParse(req.body);
if (!safe.success) throw new Error("Invalid request body");
const data = await prisma.dailyEventReference.create({ data: safe.data });
const daily_event_reference = schemaDailyEventReferencePublic.parse(data);
const daily_event_reference = schemaDailyEventReferenceReadPublic.parse(data);
if (daily_event_reference)
res.status(201).json({ daily_event_reference, message: "DailyEventReference created successfully" });
pages/api/destination-calendars/[id].ts
+6 -6
View File
@@ -5,8 +5,8 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import type { DestinationCalendarResponse } from "@lib/types";
import {
schemaDestinationCalendarBodyParams,
schemaDestinationCalendarPublic,
schemaDestinationCalendarEditBodyParams,
schemaDestinationCalendarReadPublic,
} from "@lib/validations/destination-calendar";
import {
schemaQueryIdParseInt,
@@ -17,7 +17,7 @@ import {
* @swagger
* /destination-calendars/{id}:
* get:
* summary: Get a destination calendar by ID
* summary: Find a destination calendar by ID
* parameters:
* - in: path
* name: id
@@ -94,7 +94,7 @@ export async function destionationCalendarById(
) {
const { method, query, body } = req;
const safeQuery = schemaQueryIdParseInt.safeParse(query);
const safeBody = schemaDestinationCalendarBodyParams.safeParse(body);
const safeBody = schemaDestinationCalendarEditBodyParams.safeParse(body);
if (!safeQuery.success) throw new Error("Invalid request query", safeQuery.error);
const userId = req.userId;
const data = await prisma.destinationCalendar.findMany({ where: { userId } });
@@ -107,7 +107,7 @@ export async function destionationCalendarById(
case "GET":
await prisma.destinationCalendar
.findUnique({ where: { id: safeQuery.data.id } })
.then((data) => schemaDestinationCalendarPublic.parse(data))
.then((data) => schemaDestinationCalendarReadPublic.parse(data))
.then((destination_calendar) => res.status(200).json({ destination_calendar }))
.catch((error: Error) =>
res.status(404).json({
@@ -123,7 +123,7 @@ export async function destionationCalendarById(
}
await prisma.destinationCalendar
.update({ where: { id: safeQuery.data.id }, data: safeBody.data })
.then((data) => schemaDestinationCalendarPublic.parse(data))
.then((data) => schemaDestinationCalendarReadPublic.parse(data))
.then((destination_calendar) => res.status(200).json({ destination_calendar }))
.catch((error: Error) =>
res.status(404).json({
pages/api/destination-calendars/index.ts
+6 -6
View File
@@ -5,15 +5,15 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import { DestinationCalendarResponse, DestinationCalendarsResponse } from "@lib/types";
import {
schemaDestinationCalendarBodyParams,
schemaDestinationCalendarPublic,
schemaDestinationCalendarCreateBodyParams,
schemaDestinationCalendarReadPublic,
} from "@lib/validations/destination-calendar";
/**
* @swagger
* /destination-calendars:
* get:
* summary: Get all destination calendars
* summary: Find all destination calendars
* security:
* - ApiKeyAuth: []
* tags:
@@ -50,7 +50,7 @@ async function createOrlistAllDestinationCalendars(
if (method === "GET") {
const data = await prisma.destinationCalendar.findMany({ where: { userId } });
const destination_calendars = data.map((destinationCalendar) =>
schemaDestinationCalendarPublic.parse(destinationCalendar)
schemaDestinationCalendarReadPublic.parse(destinationCalendar)
);
if (data) res.status(200).json({ destination_calendars });
else
@@ -60,11 +60,11 @@ async function createOrlistAllDestinationCalendars(
error,
});
} else if (method === "POST") {
const safe = schemaDestinationCalendarBodyParams.safeParse(req.body);
const safe = schemaDestinationCalendarCreateBodyParams.safeParse(req.body);
if (!safe.success) throw new Error("Invalid request body");
const data = await prisma.destinationCalendar.create({ data: { ...safe.data, userId } });
const destination_calendar = schemaDestinationCalendarPublic.parse(data);
const destination_calendar = schemaDestinationCalendarReadPublic.parse(data);
if (destination_calendar)
res.status(201).json({ destination_calendar, message: "DestinationCalendar created successfully" });
pages/api/docs.ts
+1
View File
@@ -20,6 +20,7 @@ const swaggerHandler = withSwagger({
},
components: {
securitySchemes: { ApiKeyAuth: { type: "apiKey", in: "query", name: "apiKey" } },
security: { ApiKeyAuth: [] },
schemas: { ...jsonSchema.definitions },
},
},
pages/api/event-type-custom-inputs/[id].ts
+1 -1
View File
@@ -17,7 +17,7 @@ import {
* @swagger
* /event-type-custom-inputs/{id}:
* get:
* summary: Get a eventTypeCustomInput by ID
* summary: Find a eventTypeCustomInput by ID
* parameters:
* - in: path
* name: id
pages/api/event-type-custom-inputs/index.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import {
* @swagger
* /event-type-custom-inputs:
* get:
* summary: Get all eventTypeCustomInputs
* summary: Find all eventTypeCustomInputs
* security:
* - ApiKeyAuth: []
* tags:
pages/api/event-types/[id].ts
+1 -1
View File
@@ -14,7 +14,7 @@ import {
* @swagger
* /event-types/{id}:
* get:
* summary: Get a eventType by ID
* summary: Find a eventType by ID
* parameters:
* - in: path
* name: id
pages/api/event-types/index.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { schemaEventTypeBodyParams, schemaEventTypePublic } from "@lib/validatio
* @swagger
* /event-types:
* get:
* summary: Get all event types
* summary: Find all event types
* security:
* - ApiKeyAuth: []
* tags:
pages/api/index.ts
+5
View File
@@ -1,5 +1,10 @@
import type { NextApiRequest, NextApiResponse } from "next";
/**
* @swagger
* security:
* - ApiKeyAuth: []
*/
export default async function CalcomApi(_: NextApiRequest, res: NextApiResponse) {
res.status(201).json({ message: "Welcome to Cal.com API - docs are at https://docs.cal.com/api" });
}
pages/api/memberships/[id].ts
+1 -1
View File
@@ -11,7 +11,7 @@ import { schemaQueryIdAsString, withValidQueryIdString } from "@lib/validations/
* @swagger
* /memberships/{userId}_{teamId}:
* get:
* summary: Get a membership by userID and teamID
* summary: Find a membership by userID and teamID
* parameters:
* - in: path
* name: userId
pages/api/memberships/index.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { schemaMembershipBodyParams, schemaMembershipPublic } from "@lib/validat
* @swagger
* /memberships:
* get:
* summary: Get all memberships
* summary: Find all memberships
* security:
* - ApiKeyAuth: []
* tags:
pages/api/payments/[id].ts
+1 -1
View File
@@ -14,7 +14,7 @@ import {
* @swagger
* /payments/{id}:
* get:
* summary: Get one of your own payments by ID
* summary: Find one of your own payments by ID
* parameters:
* - in: path
* name: id
pages/api/payments/index.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { schemaPaymentPublic } from "@lib/validations/payment";
* @swagger
* /payments:
* get:
* summary: Get all payments
* summary: Find all payments
* security:
* - ApiKeyAuth: []
* tags:
pages/api/schedules/[id].ts
+1 -1
View File
@@ -14,7 +14,7 @@ import {
* @swagger
* /schedules/{id}:
* get:
* summary: Get a schedule by ID
* summary: Find a schedule by ID
* parameters:
* - in: path
* name: id
pages/api/schedules/index.ts
+2 -2
View File
@@ -4,13 +4,13 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import { ScheduleResponse, SchedulesResponse } from "@lib/types";
import { schemaScheduleBodyParams, schemaSchedulePublic, withValidSchedule } from "@lib/validations/schedule";
import { schemaScheduleBodyParams, schemaSchedulePublic } from "@lib/validations/schedule";
/**
* @swagger
* /schedules:
* get:
* summary: Get all schedules
* summary: Find all schedules
* security:
* - ApiKeyAuth: []
* tags:
pages/api/selected-calendars/[id].ts
+1 -1
View File
@@ -14,7 +14,7 @@ import { schemaQueryIdAsString, withValidQueryIdString } from "@lib/validations/
* @swagger
* /selected-calendars/{userId}_{integration}_{externalId}:
* get:
* summary: Get a selected-calendar by userID and teamID
* summary: Find a selected-calendar by userID and teamID
* parameters:
* - in: path
* name: userId
pages/api/selected-calendars/index.ts
+1 -1
View File
@@ -13,7 +13,7 @@ import {
* @swagger
* /selected-calendars:
* get:
* summary: Get all selected calendars
* summary: Find all selected calendars
* security:
* - ApiKeyAuth: []
* tags:
pages/api/teams/[id].ts
+1 -1
View File
@@ -14,7 +14,7 @@ import { schemaTeamBodyParams, schemaTeamPublic } from "@lib/validations/team";
* @swagger
* /teams/{id}:
* get:
* summary: Get a team by ID
* summary: Find a team by ID
* parameters:
* - in: path
* name: id
pages/api/teams/index.ts
+2 -2
View File
@@ -5,13 +5,13 @@ import prisma from "@calcom/prisma";
import { withMiddleware } from "@lib/helpers/withMiddleware";
import { TeamResponse, TeamsResponse } from "@lib/types";
import { schemaMembershipPublic } from "@lib/validations/membership";
import { schemaTeamBodyParams, schemaTeamPublic, withValidTeam } from "@lib/validations/team";
import { schemaTeamBodyParams, schemaTeamPublic } from "@lib/validations/team";
/**
* @swagger
* /teams:
* get:
* summary: Get all teams
* summary: Find all teams
* security:
* - ApiKeyAuth: []
* tags:
pages/api/users/[id].ts
+1 -1
View File
@@ -14,7 +14,7 @@ import { schemaUserEditBodyParams, schemaUserReadPublic } from "@lib/validations
* @swagger
* /users/{id}:
* get:
* summary: Get a user by ID, returns your user if regular user.
* summary: Find a user by ID, returns your user if regular user.
* parameters:
* - in: path
* name: id
pages/api/users/index.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { schemaUserReadPublic } from "@lib/validations/user";
* @swagger
* /users:
* get:
* summary: Get all users (admin only), returns your user if regular user.
* summary: Find all users (admin only), returns your user if regular user.
* security:
* - ApiKeyAuth: []
* tags:
templates/endpoints/[id]/delete.ts
+1 -1
View File
@@ -22,7 +22,7 @@ import {
* required: true
* description: Numeric ID of the resource to delete
* security:
* - ApiKeyAuth: []
* - ApiKeyAuth: []
* tags:
* - resources
* responses:
templates/endpoints/[id]/edit.ts
+1 -1
View File
@@ -23,7 +23,7 @@ import {
* required: true
* description: Numeric ID of the resource to edit
* security:
* - ApiKeyAuth: []
* - ApiKeyAuth: []
* tags:
* - resources
* responses:
templates/endpoints/[id]/index.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import {
* @swagger
* /v1/resources/{id}:
* get:
* summary: Get a resource by ID
* summary: Find a resource by ID
* parameters:
* - in: path
* name: id
templates/endpoints/get_all.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { schemaResourcePublic } from "@lib/validations/resource";
* @swagger
* /v1/resources:
* get:
* summary: Get all resources
* summary: Find all resources
* security:
* - ApiKeyAuth: []
* tags:
templates/endpoints/get_all_and_post.ts
+1 -1
View File
@@ -10,7 +10,7 @@ import { schemaPaymentBodyParams, schemaPaymentPublic } from "@lib/validations/p
* @swagger
* /v1/payments:
* get:
* summary: Get all payments
* summary: Find all payments
* security:
* - ApiKeyAuth: []
* tags:
templates/endpoints/post.ts
+1 -1
View File
@@ -19,7 +19,7 @@ import { schemaResourceBodyParams, schemaResourcePublic, withValidResource } fro
* schema:
* $ref: '#/components/schemas/Resource'
* security:
* - ApiKeyAuth: []
* - ApiKeyAuth: []
* tags:
* - resources
* responses:
templates/zod-validation.ts
-7
View File
@@ -1,4 +1,3 @@
import { withValidation } from "next-validations";
import { z } from "zod";
import { _ModelModel as Model } from "@calcom/prisma/zod";
@@ -15,9 +14,3 @@ export const schemaModelPublic = Model.omit({
id: true,
userId: true,
});
export const withValidModel = withValidation({
schema: schemaModelBodyParams,
type: "Zod",
mode: "body",
});