Booking confirm endpoint refactoring (#2949)
* Adds new default handler and responder * Moved confirm endpoint * Fixes availability for unconfirmed bookings * Cleanup * Update _patch.ts * Prevent too much diffs * Adds missing BookingStatus * Migrates confirmed & rejected to status * Adds requiresConfirmation icon to listing * Adds booking status migration * Adds migrations to remove confirmed/rejected * Undo refactor * Sets the organizer as "accepted" in gCal * Update getBusyTimes.ts Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
parent
3b321e5d3c
commit
12d66cb9df
@@ -7,7 +7,7 @@ import { z } from "zod";
|
||||
import getApps, { getLocationOptions } from "@calcom/app-store/utils";
|
||||
import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
|
||||
import { checkPremiumUsername } from "@calcom/ee/lib/core/checkPremiumUsername";
|
||||
import { bookingMinimalSelect } from "@calcom/prisma";
|
||||
import { baseEventTypeSelect, bookingMinimalSelect } from "@calcom/prisma";
|
||||
import { RecurringEvent } from "@calcom/types/Calendar";
|
||||
|
||||
import { checkRegularUsername } from "@lib/core/checkRegularUsername";
|
||||
@@ -131,16 +131,6 @@ const loggedInViewerRouter = createProtectedRouter()
|
||||
async resolve({ ctx }) {
|
||||
const { prisma } = ctx;
|
||||
const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
|
||||
id: true,
|
||||
title: true,
|
||||
description: true,
|
||||
length: true,
|
||||
schedulingType: true,
|
||||
recurringEvent: true,
|
||||
slug: true,
|
||||
hidden: true,
|
||||
price: true,
|
||||
currency: true,
|
||||
position: true,
|
||||
successRedirectUrl: true,
|
||||
hashedLink: true,
|
||||
@@ -151,6 +141,7 @@ const loggedInViewerRouter = createProtectedRouter()
|
||||
name: true,
|
||||
},
|
||||
},
|
||||
...baseEventTypeSelect,
|
||||
});
|
||||
|
||||
const user = await prisma.user.findUnique({
|
||||
@@ -328,7 +319,7 @@ const loggedInViewerRouter = createProtectedRouter()
|
||||
// handled separately for each occurrence
|
||||
OR: [
|
||||
{
|
||||
AND: [{ NOT: { recurringEventId: { equals: null } } }, { confirmed: false }],
|
||||
AND: [{ NOT: { recurringEventId: { equals: null } } }, { status: BookingStatus.PENDING }],
|
||||
},
|
||||
{
|
||||
AND: [
|
||||
@@ -398,8 +389,6 @@ const loggedInViewerRouter = createProtectedRouter()
|
||||
select: {
|
||||
...bookingMinimalSelect,
|
||||
uid: true,
|
||||
confirmed: true,
|
||||
rejected: true,
|
||||
recurringEventId: true,
|
||||
location: true,
|
||||
eventType: {
|
||||
|
||||
Reference in New Issue
Block a user