Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 29 additions & 16 deletions packages/api/src/routers/calendars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@ export const calendarsRouter = createTRPCRouter({
});
}

const calendar = await provider.client.createCalendar({
name: input.name,
description: input.description,
timeZone: input.timeZone,
const calendar = await provider.client.calendars.create({
calendar: {
name: input.name,
description: input.description,
timeZone: input.timeZone,
},
});

return { calendar };
}),
sync: calendarProcedure.query(async ({ ctx }) => {
const promises = ctx.providers.map(async ({ client }) => {
return client.calendars();
return client.calendars.list();
});

const results = await Promise.all(promises);
Expand All @@ -45,7 +47,7 @@ export const calendarsRouter = createTRPCRouter({
}),
list: calendarProcedure.query(async ({ ctx }) => {
const promises = ctx.providers.map(async ({ client, account }) => {
const calendars = await client.calendars();
const calendars = await client.calendars.list();

return {
id: account.id,
Expand Down Expand Up @@ -83,8 +85,12 @@ export const calendarsRouter = createTRPCRouter({
calendars: account.calendars
.sort((a, b) => {
// Primary calendars come first
if (a.primary && !b.primary) return -1;
if (!a.primary && b.primary) return 1;
if (a.primary && !b.primary) {
return -1;
}
if (!a.primary && b.primary) {
return 1;
}

// Otherwise maintain alphabetical order by name
return a.name.localeCompare(b.name);
Expand Down Expand Up @@ -130,7 +136,9 @@ export const calendarsRouter = createTRPCRouter({
});
}

const calendar = await provider.client.calendar(input.calendarId);
const calendar = await provider.client.calendars.get({
calendarId: input.calendarId,
});

return { calendar };
}),
Expand Down Expand Up @@ -158,7 +166,7 @@ export const calendarsRouter = createTRPCRouter({
});
}

const calendars = await provider.client.calendars();
const calendars = await provider.client.calendars.list();
const calendar = calendars.find((c) => c.id === input.id);

if (!calendar) {
Expand All @@ -175,9 +183,12 @@ export const calendarsRouter = createTRPCRouter({
});
}

const updated = await provider.client.updateCalendar(input.id, {
name: input.name,
timeZone: input.timeZone,
const updated = await provider.client.calendars.update({
calendarId: input.id,
calendar: {
name: input.name,
timeZone: input.timeZone,
},
});

return { calendar: updated };
Expand All @@ -204,7 +215,7 @@ export const calendarsRouter = createTRPCRouter({
});
}

const calendars = await provider.client.calendars();
const calendars = await provider.client.calendars.list();
const calendar = calendars.find((c) => c.id === input.calendarId);

if (!calendar) {
Expand All @@ -221,7 +232,9 @@ export const calendarsRouter = createTRPCRouter({
});
}

await provider.client.deleteCalendar(input.calendarId);
await provider.client.calendars.delete({
calendarId: input.calendarId,
});

return { success: true };
}),
Expand Down Expand Up @@ -249,7 +262,7 @@ export const calendarsRouter = createTRPCRouter({
});
}

const calendars = await account.client.calendars();
const calendars = await account.client.calendars.list();
const calendar = calendars.find(
(calendar) => calendar.id === input.calendarId,
);
Expand Down
42 changes: 23 additions & 19 deletions packages/api/src/routers/conferencing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const conferencingRouter = createTRPCRouter({

const { client } = provider;

const calendar = (await client.calendars()).find(
const calendar = (await client.calendars.list()).find(
(c) => c.id === input.calendarId,
);

Expand Down Expand Up @@ -67,14 +67,14 @@ export const conferencingRouter = createTRPCRouter({
input.providerId as "google" | "zoom",
);

conference = await conferencingProvider.createConference(
input.agenda,
input.startTime,
input.endTime,
input.timeZone,
input.calendarId,
input.eventId,
);
conference = await conferencingProvider.createConference({
agenda: input.agenda,
startTime: input.startTime,
endTime: input.endTime,
timeZone: input.timeZone,
calendarId: input.calendarId,
eventId: input.eventId,
});
} catch (error) {
throw new TRPCError({
code: "PRECONDITION_FAILED",
Expand All @@ -90,17 +90,21 @@ export const conferencingRouter = createTRPCRouter({
const start = startInstant.toZonedDateTimeISO(tz);
const end = endInstant.toZonedDateTimeISO(tz);

const event = await client.updateEvent(calendar, input.eventId, {
id: input.eventId,
title: input.agenda,
calendar: {
id: calendar.id,
provider: calendar.provider,
const event = await client.events.update({
calendar,
eventId: input.eventId,
event: {
id: input.eventId,
title: input.agenda,
calendar: {
id: calendar.id,
provider: calendar.provider,
},
readOnly: calendar.readOnly,
start,
end,
conference,
},
readOnly: calendar.readOnly,
start,
end,
conference,
});

return { conference: event.conference };
Expand Down
Loading
Loading