Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: videoCallUrl is not saved in metadata after rescheduling #7715

Merged
merged 8 commits into from
Mar 17, 2023
Merged

fix: videoCallUrl is not saved in metadata after rescheduling #7715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4097d6e
fix: videoCallUrl is not saved in metadata after rescheduling
G3root Mar 14, 2023
763c1b3
fix: add url to types
G3root Mar 14, 2023
f875da5
fix: remove zod parsing
G3root Mar 14, 2023
6f7f720
Merge branch 'main' into 7604-after-rescheduling-a-booking-with-a-zoo…
G3root Mar 14, 2023
3a4fb82
Merge branch 'main' into 7604-after-rescheduling-a-booking-with-a-zoo…
G3root Mar 15, 2023
9040d78
fix: remove duplicate type
G3root Mar 15, 2023
34b6fa2
fix: type
G3root Mar 15, 2023
7ae7b00
Merge branch 'main' into 7604-after-rescheduling-a-booking-with-a-zoo…
G3root Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/features/bookings/lib/handleNewBooking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ async function handler(
return prisma.booking.create(createBookingObj);
}

let results: EventResult<AdditionalInformation>[] = [];
let results: EventResult<AdditionalInformation & { url?: string }>[] = [];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we shouldn't need to redefine url here but currently reschedule is very weirdly typed and written, doesn't seem like a better way to do it.

let referencesToCreate: PartialReference[] = [];

type Booking = Prisma.PromiseReturnType<typeof createBooking>;
Expand Down Expand Up @@ -1680,7 +1680,7 @@ async function handler(
metadata.conferenceData = updatedEvent.conferenceData;
metadata.entryPoints = updatedEvent.entryPoints;
handleAppsStatus(results, booking);
videoCallUrl = metadata.hangoutLink || videoCallUrl;
videoCallUrl = metadata.hangoutLink || videoCallUrl || updatedEvent?.url;
}
}
if (noEmail !== true) {
Expand Down
6 changes: 0 additions & 6 deletions packages/types/Calendar.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ export interface ConferenceData {
createRequest?: calendar_v3.Schema$CreateConferenceRequest;
}

export interface AdditionalInformation {
conferenceData?: ConferenceData;
entryPoints?: EntryPoint[];
hangoutLink?: string;
}

export interface RecurringEvent {
dtstart?: Date | undefined;
interval: number;
Expand Down