Skip to content

regression: outlook imported events not syncing presence status #35675

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

Merged
kodiakhq merged 3 commits into from
Apr 1, 2025
Merged

regression: outlook imported events not syncing presence status #35675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cdc301
fix: ignored endpoint params
pierre-lehnen-rc Apr 1, 2025
76167c7
fix: status not switching back to available when event ends
pierre-lehnen-rc Apr 1, 2025
0c8c488
only revert status if the current status is BUSY
pierre-lehnen-rc Apr 1, 2025
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
13 changes: 9 additions & 4 deletions apps/meteor/app/api/server/v1/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,18 @@ API.v1.addRoute(
{
async post() {
const { userId: uid } = this;
const { startTime, endTime, externalId, subject, description, meetingUrl, reminderMinutesBeforeStart } = this.bodyParams;
const { startTime, endTime, externalId, subject, description, meetingUrl, reminderMinutesBeforeStart, busy } = this.bodyParams;

const id = await Calendar.create({
uid,
startTime: new Date(startTime),
...(endTime ? { endTime: new Date(endTime) } : {}),
...(endTime && { endTime: new Date(endTime) }),
externalId,
subject,
description,
meetingUrl,
reminderMinutesBeforeStart,
...(typeof busy === 'boolean' && { busy }),
});

return API.v1.success({ id });
Expand All @@ -74,16 +75,18 @@ API.v1.addRoute(
{
async post() {
const { userId: uid } = this;
const { startTime, externalId, subject, description, meetingUrl, reminderMinutesBeforeStart } = this.bodyParams;
const { startTime, endTime, externalId, subject, description, meetingUrl, reminderMinutesBeforeStart, busy } = this.bodyParams;

const id = await Calendar.import({
uid,
startTime: new Date(startTime),
...(endTime && { endTime: new Date(endTime) }),
externalId,
subject,
description,
meetingUrl,
reminderMinutesBeforeStart,
...(typeof busy === 'boolean' && { busy }),
});

return API.v1.success({ id });
Expand All @@ -97,7 +100,7 @@ API.v1.addRoute(
{
async post() {
const { userId } = this;
const { eventId, startTime, subject, description, meetingUrl, reminderMinutesBeforeStart } = this.bodyParams;
const { eventId, startTime, endTime, subject, description, meetingUrl, reminderMinutesBeforeStart, busy } = this.bodyParams;

const event = await Calendar.get(eventId);

Expand All @@ -107,10 +110,12 @@ API.v1.addRoute(

await Calendar.update(eventId, {
startTime: new Date(startTime),
...(endTime && { endTime: new Date(endTime) }),
subject,
description,
meetingUrl,
reminderMinutesBeforeStart,
...(typeof busy === 'boolean' && { busy }),
});

return API.v1.success();
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/server/services/calendar/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
// 1. The current status is BUSY (meaning it was set by our system, not manually changed by user)
// 2. We have a previousStatus stored from before the event started

if (event.previousStatus && event.previousStatus === user.status) {
if (user.status === UserStatus.BUSY && event.previousStatus && event.previousStatus !== user.status) {
await applyStatusChange({
eventId: event._id,
uid: event.uid,
Expand Down
Loading