start working on calendar things

Author: ricardogarim

apps/meteor/server/services/calendar/service.ts

@@ -1,11 +1,10 @@
 import type { ICalendarService } from '@rocket.chat/core-services';
-import { ServiceClassInternal, api } from '@rocket.chat/core-services';
+import { Presence, ServiceClassInternal, api } from '@rocket.chat/core-services';
 import type { IUser, ICalendarEvent } from '@rocket.chat/core-typings';
-import { UserStatus } from '@rocket.chat/core-typings';
 import { cronJobs } from '@rocket.chat/cron';
 import { Logger } from '@rocket.chat/logger';
 import type { InsertionModel } from '@rocket.chat/model-typings';
-import { CalendarEvent, Users } from '@rocket.chat/models';
+import { CalendarEvent } from '@rocket.chat/models';
 import type { UpdateResult, DeleteResult } from 'mongodb';
 
 import { applyStatusChange } from './statusEvents/applyStatusChange';
@@ -285,26 +284,10 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			return;
 		}
 
-		const user = await Users.findOneById(event.uid, { projection: { statusDefault: 1 } });
-		if (!user || user.statusDefault === UserStatus.OFFLINE) {
-			return;
-		}
-
-		const overlappingEvents = await CalendarEvent.findOverlappingEvents(event._id, event.uid, event.startTime, event.endTime)
-			.sort({ startTime: -1 })
-			.toArray();
-		const previousStatus = overlappingEvents.at(0)?.previousStatus ?? user.statusDefault;
-
-		if (previousStatus) {
-			await CalendarEvent.updateEvent(event._id, { previousStatus });
-		}
-
 		await applyStatusChange({
 			eventId: event._id,
 			uid: event.uid,
-			startTime: event.startTime,
 			endTime: event.endTime,
-			status: UserStatus.BUSY,
 		});
 	}
 
@@ -313,31 +296,7 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			return;
 		}
 
-		const user = await Users.findOneById(event.uid, { projection: { statusDefault: 1 } });
-		if (!user) {
-			return;
-		}
-
-		// Only restore status if:
-		// 1. The current statusDefault 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 (user.statusDefault === UserStatus.BUSY && event.previousStatus && event.previousStatus !== user.statusDefault) {
-			await applyStatusChange({
-				eventId: event._id,
-				uid: event.uid,
-				startTime: event.startTime,
-				endTime: event.endTime,
-				status: event.previousStatus,
-			});
-		} else {
-			logger.debug({
-				msg: 'Not restoring status for user',
-				userId: event.uid,
-				currentStatusDefault: user.statusDefault,
-				previousStatus: event.previousStatus,
-			});
-		}
+		await Presence.endActiveState(event.uid);
 	}
 
 	private async sendCurrentNotifications(date: Date): Promise<void> {

apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts

@@ -1,70 +1,31 @@
-import { api } from '@rocket.chat/core-services';
+import { Presence } from '@rocket.chat/core-services';
 import { UserStatus } from '@rocket.chat/core-typings';
 import type { ICalendarEvent, IUser } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
-import { Users } from '@rocket.chat/models';
 
 const logger = new Logger('Calendar');
 
 export async function applyStatusChange({
 	eventId,
 	uid,
-	startTime,
 	endTime,
-	status,
 }: {
 	eventId: ICalendarEvent['_id'];
 	uid: IUser['_id'];
-	startTime: Date;
 	endTime?: Date;
-	status?: UserStatus;
-	shouldScheduleRemoval?: boolean;
 }): Promise<void> {
-	const user = await Users.findOneById(uid, { projection: { roles: 1, username: 1, name: 1, statusDefault: 1 } });
-
-	if (!user || user.statusDefault === UserStatus.OFFLINE) {
-		logger.debug({
-			msg: 'Cannot apply status change for event, user is offline or does not exist',
-			eventId,
-			uid,
-		});
-
-		return;
-	}
-
-	const newStatus = status ?? UserStatus.BUSY;
-	const previousStatus = user.statusDefault;
-
 	logger.debug({
-		msg: 'Applying status change for event',
+		msg: 'Applying status change for event via presence engine',
 		eventId,
-		user: { _id: uid, statusDefault: user?.statusDefault },
-		startTime,
+		uid,
 		endTime,
-		newStatus,
-		previousStatus,
 	});
 
-	let statusChanged = false;
-
-	if (newStatus === UserStatus.BUSY) {
-		await Users.updateStatusAndStatusDefault(uid, newStatus, newStatus);
-		statusChanged = true;
-	} else if (user.statusDefault === UserStatus.BUSY) {
-		await Users.updateStatusAndStatusDefault(uid, newStatus, newStatus);
-		statusChanged = true;
-	}
-
-	if (statusChanged) {
-		await api.broadcast('presence.status', {
-			user: {
-				status: newStatus,
-				_id: uid,
-				roles: user.roles,
-				username: user.username,
-				name: user.name,
-			},
-			previousStatus,
-		});
-	}
+	await Presence.setActiveState(uid, {
+		statusDefault: UserStatus.BUSY,
+		statusText: '',
+		statusSource: 'external',
+		statusEmoji: '📅',
+		...(endTime && { statusExpiresAt: endTime }),
+	});
 }