Skip to content

fix: Calendar status event status switch#39491

Merged
dionisio-bot[bot] merged 7 commits intodevelopfrom
fix/calendar-status
Mar 10, 2026
Merged

fix: Calendar status event status switch#39491
dionisio-bot[bot] merged 7 commits intodevelopfrom
fix/calendar-status

Conversation

@KevLehman
Copy link
Copy Markdown
Member

@KevLehman KevLehman commented Mar 9, 2026

Proposed changes (including videos or screenshots)

Issue(s)

https://rocketchat.atlassian.net/browse/CORE-1890

Steps to test or reproduce

Further comments

Summary by CodeRabbit

  • Bug Fixes

    • Fixed calendar events incorrectly updating user status when syncing busy state; status updates now occur only when an actual change is needed.
  • Tests

    • Added end-to-end tests verifying calendar-driven status transitions and restoration (Enterprise Edition).

@dionisio-bot
Copy link
Copy Markdown
Contributor

dionisio-bot bot commented Mar 9, 2026

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Mar 9, 2026

🦋 Changeset detected

Latest commit: 0040db3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 41 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/http-router Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/abac Patch
@rocket.chat/federation-matrix Patch
@rocket.chat/license Patch
@rocket.chat/media-calls Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/omni-core-ee Patch
@rocket.chat/mock-providers Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/instance-status Patch
@rocket.chat/omni-core Patch
@rocket.chat/server-fetch Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Mar 9, 2026

Walkthrough

Patch fix for calendar status synchronization: replaces incorrect uses of status with statusDefault in calendar service and status-application logic, adds guarded status-change broadcasts, and introduces EE-gated end-to-end tests validating busy-state transitions.

Changes

Cohort / File(s) Summary
Changeset
.changeset/red-windows-breathe.md
Adds a patch changeset entry for @rocket.chat/meteor documenting the calendar status property fix.
Calendar Service
apps/meteor/server/services/calendar/service.ts
Replaces status references with statusDefault across projections, guards, previous-status computation, and event start/end restoration logic; logging adjusted to report statusDefault.
Status Change Application
apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
Adds existence/offline guard; computes newStatus/previousStatus from statusDefault; updates status/statusDefault only when appropriate (with statusChanged flag); broadcasts presence only on actual changes and includes previous/new status in payload; enhanced logging.
End-to-End Tests
apps/meteor/tests/end-to-end/api/calendar.ts
Adds EE-gated test suite (duplicated blocks) that sets a user status, creates a busy calendar event, asserts transition to BUSY during the event, verifies restoration after event end, and cleans up the event.

Sequence Diagram(s)

sequenceDiagram
  participant CalendarSync as Calendar Sync
  participant CalendarSvc as Calendar Service
  participant ApplyChange as applyStatusChange
  participant UserDB as User Record (DB)
  participant Presence as Presence/Broadcast

  CalendarSync->>CalendarSvc: Event start/end received
  CalendarSvc->>ApplyChange: processEventStart/processEventEnd with event payload
  ApplyChange->>UserDB: fetch user (statusDefault)
  alt user missing or offline
    ApplyChange-->>CalendarSvc: exit (no-op)
  else user exists
    ApplyChange->>UserDB: determine previousStatus (statusDefault)
    ApplyChange->>UserDB: update status & statusDefault if needed
    ApplyChange->>Presence: broadcast change (includes previousStatus, newStatus) 
    ApplyChange-->>CalendarSvc: confirm applied
  end
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~22 minutes

Suggested labels

type: bug

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main fix: updating calendar status event handling to use statusDefault instead of status, which aligns with the changeset and code modifications.
Linked Issues check ✅ Passed All coding requirements from CORE-1890 are met: the PR replaces status references with statusDefault across calendar event processing, applies this change in service and status event handling, and adds E2E tests.
Out of Scope Changes check ✅ Passed All changes directly address the statusDefault migration required by CORE-1890; no unrelated modifications or scope creep detected in the calendar service, status event handling, or test files.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 9, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.91%. Comparing base (f5f2374) to head (0040db3).
⚠️ Report is 9 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff            @@
##           develop   #39491   +/-   ##
========================================
  Coverage    70.91%   70.91%           
========================================
  Files         3196     3197    +1     
  Lines       113299   113337   +38     
  Branches     20568    20524   -44     
========================================
+ Hits         80341    80369   +28     
- Misses       30906    30918   +12     
+ Partials      2052     2050    -2     
Flag Coverage Δ
e2e 60.44% <ø> (+0.03%) ⬆️
e2e-api 48.06% <60.00%> (+0.34%) ⬆️
unit 71.60% <0.00%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Fixes calendar events modifying the wrong status property when attempting to sync `busy` status.
@KevLehman KevLehman added this to the 8.3.0 milestone Mar 10, 2026
@KevLehman KevLehman marked this pull request as ready for review March 10, 2026 19:10
@KevLehman KevLehman requested a review from a team as a code owner March 10, 2026 19:10
Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

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

1 issue found across 4 files

Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="apps/meteor/tests/end-to-end/api/calendar.ts">

<violation number="1" location="apps/meteor/tests/end-to-end/api/calendar.ts:692">
P2: Replace fixed `sleep(...)` waits with polling/retry-based assertions for status transitions to avoid timing-related test flakiness.

(Based on your team's feedback about concurrency and race-condition risks in async test sequencing.) [FEEDBACK_USED]</violation>
</file>

Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🧹 Nitpick comments (4)
apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts (1)

50-56: Consider simplifying duplicated branches.

Both the if and else if branches execute identical code. This can be combined into a single condition for clarity.

♻️ Suggested simplification
-	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;
-	}
+	const shouldUpdateStatus = newStatus === UserStatus.BUSY || user.statusDefault === UserStatus.BUSY;
+
+	if (shouldUpdateStatus) {
+		await Users.updateStatusAndStatusDefault(uid, newStatus, newStatus);
+	}
 
-	if (statusChanged) {
+	if (shouldUpdateStatus) {
 		await api.broadcast('presence.status', {
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts`
around lines 50 - 56, The two identical branches inside the applyStatusChange
function (the if and else if blocks) should be merged into a single conditional
to remove duplication: replace the separate if and else if checks with one
combined condition using a logical OR (e.g., conditionA || conditionB), keep the
existing shared body (side-effects, logging, and return behavior) exactly as-is,
and leave any remaining distinct else/else-if branches untouched so behavior is
unchanged.
apps/meteor/tests/end-to-end/api/calendar.ts (3)

689-702: Use consistent API helper pattern.

The test uses raw API paths like '/api/v1/calendar-events.create' while the rest of this file uses the api() helper (e.g., api('calendar-events.create')). Consider using the helper for consistency.

♻️ Suggested fix for consistency
-		const createResponse = await request.post('/api/v1/calendar-events.create').set(userCredentials).send(eventPayload).expect(200);
+		const createResponse = await request.post(api('calendar-events.create')).set(userCredentials).send(eventPayload).expect(200);
 		const eventId = createResponse.body.id;
 
 		await sleep(3000);
 
-		const statusResponseDuring = await request.get('/api/v1/users.getStatus').set(userCredentials).expect(200);
+		const statusResponseDuring = await request.get(api('users.getStatus')).set(userCredentials).expect(200);
 		expect(statusResponseDuring.body.status).to.equal('busy');
 
 		await sleep(5000);
 
-		const statusResponseAfter = await request.get('/api/v1/users.getStatus').set(userCredentials).expect(200);
+		const statusResponseAfter = await request.get(api('users.getStatus')).set(userCredentials).expect(200);
 		expect(statusResponseAfter.body.status).to.equal('away');
 
-		await request.post('/api/v1/calendar-events.delete').set(userCredentials).send({ eventId }).expect(200);
+		await request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId }).expect(200);
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@apps/meteor/tests/end-to-end/api/calendar.ts` around lines 689 - 702, Replace
the raw API path usage with the project's api() test helper for consistency:
change calls like request.post('/api/v1/calendar-events.create') and
request.get('/api/v1/users.getStatus') to use
request.post(api('calendar-events.create')) and
request.get(api('users.getStatus')) (and similarly for calendar-events.delete),
keeping the existing .set(userCredentials).send(...)/.expect(...) chain intact
so only the path construction changes.

669-703: Improve test cleanup robustness and consider enabling the required setting.

Two concerns with this test:

  1. Cleanup reliability: The event deletion at line 702 is inside the test body. If any assertion fails before this line, the event won't be cleaned up. Consider moving cleanup to an after hook or tracking the event for cleanup similar to other test suites in this file.

  2. Missing setting enablement: The test assumes Calendar_BusyStatus_Enabled is already enabled. The service code at line 216 checks this setting and returns early if disabled. Consider explicitly enabling it in the before hook for test reliability.

♻️ Suggested refactor for robust cleanup and explicit setup
 (IS_EE ? describe : describe.skip)('[Calendar Events Status Sync]', () => {
+	let eventIdToCleanup: string | undefined;
+
 	before(async () => {
+		await request.post(api('settings/Calendar_BusyStatus_Enabled')).set(credentials).send({ value: true }).expect(200);
 		await request.post('/api/v1/users.setStatus').set(userCredentials).send({ status: 'away' }).expect(200);
 	});
 
+	after(async () => {
+		if (eventIdToCleanup) {
+			await request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId: eventIdToCleanup });
+		}
+	});
+
 	it('should set user status to busy during event and restore manual status after event ends', async () => {
 		// ... test body ...
 		const createResponse = await request.post(api('calendar-events.create')).set(userCredentials).send(eventPayload).expect(200);
 		const eventId = createResponse.body.id;
+		eventIdToCleanup = eventId;
 
 		// ... assertions ...
 
-		await request.post('/api/v1/calendar-events.delete').set(userCredentials).send({ eventId }).expect(200);
+		await request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId }).expect(200);
+		eventIdToCleanup = undefined;
 	});
 });
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@apps/meteor/tests/end-to-end/api/calendar.ts` around lines 669 - 703, The
test in the '[Calendar Events Status Sync]' block creates an event with
calendar-events.create and deletes it inside the test body (eventId) and assumes
Calendar_BusyStatus_Enabled is enabled; to fix, move the event cleanup into an
after hook that checks for and deletes the created event (use the same eventId
variable or a tracked list) so deletion always runs even if assertions fail, and
in the before hook explicitly enable the Calendar_BusyStatus_Enabled setting via
the appropriate API or test helper before creating the event and setting user
status (users.setStatus), ensuring the service code that checks the setting will
run as expected.

670-672: Also use consistent API helper for status setup.

 	before(async () => {
-		await request.post('/api/v1/users.setStatus').set(userCredentials).send({ status: 'away' }).expect(200);
+		await request.post(api('users.setStatus')).set(userCredentials).send({ status: 'away' }).expect(200);
 	});
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@apps/meteor/tests/end-to-end/api/calendar.ts` around lines 670 - 672, The
test currently calls the REST endpoint directly via
request.post('/api/v1/users.setStatus') with userCredentials; replace that
direct call with the project's shared test helper (e.g., setUserStatus) to keep
API usage consistent—call setUserStatus(userCredentials, 'away') (or the
equivalent helper used elsewhere in the file) and assert the expected response
instead of the inline request.post invocation.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts`:
- Line 23: The log prints user?.status but the user query only projects { roles,
username, name, statusDefault }, so user.status will always be undefined; in
applyStatusChange, either add status: 1 to the Mongo projection when fetching
the user (so the debug log can show the current status), or remove user?.status
from the logged object (and keep logging only roles/username/name/statusDefault)
to avoid misleading undefined values—update the code around the user fetch and
the log call that references user?.status accordingly.
- Around line 59-68: The presence.status broadcast is missing the required
statusText field: update the user projection in applyStatusChange (the
projection defined around the user projection at ~line 23) to include statusText
and add statusText to the broadcast payload emitted in applyStatusChange (the
payload built in the broadcast block around lines 59-68) so the user object
matches the presence.status shape in Events.ts; mirror how
setStatusText.ts/users.ts/federation-matrix/edu.ts include statusText when
constructing the user object for presence.status.

---

Nitpick comments:
In `@apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts`:
- Around line 50-56: The two identical branches inside the applyStatusChange
function (the if and else if blocks) should be merged into a single conditional
to remove duplication: replace the separate if and else if checks with one
combined condition using a logical OR (e.g., conditionA || conditionB), keep the
existing shared body (side-effects, logging, and return behavior) exactly as-is,
and leave any remaining distinct else/else-if branches untouched so behavior is
unchanged.

In `@apps/meteor/tests/end-to-end/api/calendar.ts`:
- Around line 689-702: Replace the raw API path usage with the project's api()
test helper for consistency: change calls like
request.post('/api/v1/calendar-events.create') and
request.get('/api/v1/users.getStatus') to use
request.post(api('calendar-events.create')) and
request.get(api('users.getStatus')) (and similarly for calendar-events.delete),
keeping the existing .set(userCredentials).send(...)/.expect(...) chain intact
so only the path construction changes.
- Around line 669-703: The test in the '[Calendar Events Status Sync]' block
creates an event with calendar-events.create and deletes it inside the test body
(eventId) and assumes Calendar_BusyStatus_Enabled is enabled; to fix, move the
event cleanup into an after hook that checks for and deletes the created event
(use the same eventId variable or a tracked list) so deletion always runs even
if assertions fail, and in the before hook explicitly enable the
Calendar_BusyStatus_Enabled setting via the appropriate API or test helper
before creating the event and setting user status (users.setStatus), ensuring
the service code that checks the setting will run as expected.
- Around line 670-672: The test currently calls the REST endpoint directly via
request.post('/api/v1/users.setStatus') with userCredentials; replace that
direct call with the project's shared test helper (e.g., setUserStatus) to keep
API usage consistent—call setUserStatus(userCredentials, 'away') (or the
equivalent helper used elsewhere in the file) and assert the expected response
instead of the inline request.post invocation.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: d3b74597-5b89-4143-a581-bad445a7b6dd

📥 Commits

Reviewing files that changed from the base of the PR and between c987432 and 1962b21.

📒 Files selected for processing (4)
  • .changeset/red-windows-breathe.md
  • apps/meteor/server/services/calendar/service.ts
  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
  • apps/meteor/tests/end-to-end/api/calendar.ts
📜 Review details
🧰 Additional context used
📓 Path-based instructions (1)
**/*.{ts,tsx,js}

📄 CodeRabbit inference engine (.cursor/rules/playwright.mdc)

**/*.{ts,tsx,js}: Write concise, technical TypeScript/JavaScript with accurate typing in Playwright tests
Avoid code comments in the implementation

Files:

  • apps/meteor/server/services/calendar/service.ts
  • apps/meteor/tests/end-to-end/api/calendar.ts
  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
🧠 Learnings (18)
📚 Learning: 2026-01-17T01:51:47.764Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 38219
File: packages/core-typings/src/cloud/Announcement.ts:5-6
Timestamp: 2026-01-17T01:51:47.764Z
Learning: In packages/core-typings/src/cloud/Announcement.ts, the AnnouncementSchema.createdBy field intentionally overrides IBannerSchema.createdBy (object with _id and optional username) with a string enum ['cloud', 'system'] to match existing runtime behavior. This is documented as technical debt with a FIXME comment at apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts:53 and should not be flagged as an error until the runtime behavior is corrected.

Applied to files:

  • apps/meteor/server/services/calendar/service.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In the Rocket.Chat repository, do not reference Biome lint rules in code review feedback. Biome is not used even if biome.json exists; only reference Biome rules if there is explicit, project-wide usage documented. For TypeScript files, review lint implications without Biome guidance unless the project enables Biome rules.

Applied to files:

  • apps/meteor/server/services/calendar/service.ts
  • apps/meteor/tests/end-to-end/api/calendar.ts
  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In this repository (RocketChat/Rocket.Chat), Biome lint rules are not used even if a biome.json exists. When reviewing TypeScript files (e.g., packages/ui-voip/src/providers/useMediaSession.ts), ensure lint suggestions do not reference Biome-specific rules. Rely on general ESLint/TypeScript lint rules and project conventions instead.

Applied to files:

  • apps/meteor/server/services/calendar/service.ts
  • apps/meteor/tests/end-to-end/api/calendar.ts
  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-24T19:05:56.710Z
Learnt from: ahmed-n-abdeltwab
Repo: RocketChat/Rocket.Chat PR: 0
File: :0-0
Timestamp: 2026-02-24T19:05:56.710Z
Learning: Rocket.Chat repo context: When a workspace manifest on develop already pins a dependency version (e.g., packages/web-ui-registration → "rocket.chat/ui-contexts": "27.0.1"), a lockfile change in a feature PR that upgrades only that dependency’s resolution is considered a manifest-driven sync and can be kept, preferably as a small "chore: sync yarn.lock with manifests" commit.

Applied to files:

  • .changeset/red-windows-breathe.md
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Ensure tests run reliably in parallel without shared state conflicts

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Group related tests in the same file

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2026-02-04T12:09:05.769Z
Learnt from: d-gubert
Repo: RocketChat/Rocket.Chat PR: 38374
File: apps/meteor/tests/end-to-end/apps/app-logs-nested-requests.ts:26-37
Timestamp: 2026-02-04T12:09:05.769Z
Learning: In E2E tests at apps/meteor/tests/end-to-end/apps/, prefer sleeping for a fixed duration (e.g., 1 second) over implementing polling/retry logic when waiting for asynchronous operations to complete. Tests should fail deterministically if the expected result isn't available after the sleep.

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : All test files must be created in `apps/meteor/tests/e2e/` directory

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2026-03-02T16:31:41.304Z
Learnt from: KevLehman
Repo: RocketChat/Rocket.Chat PR: 39250
File: apps/meteor/tests/end-to-end/api/livechat/07-queue.ts:1084-1094
Timestamp: 2026-03-02T16:31:41.304Z
Learning: In E2E API tests at apps/meteor/tests/end-to-end/api/livechat/, using sleep(1000) after updateSetting() or updateEESetting() calls in test setup hooks is acceptable and intentional to allow omnichannel settings to propagate their side effects.

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Utilize Playwright fixtures (`test`, `page`, `expect`) for consistency in test files

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Implement proper wait strategies for dynamic content in Playwright tests

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2026-03-06T18:09:17.867Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 39397
File: packages/gazzodown/src/elements/Timestamp/DateTimeFormats.spec.tsx:20-23
Timestamp: 2026-03-06T18:09:17.867Z
Learning: In the RocketChat/Rocket.Chat gazzodown package (`packages/gazzodown`), tests are intended to run under the UTC timezone, but as of PR `#39397` this is NOT yet explicitly enforced in `jest.config.ts` or the `package.json` test scripts (which just run `jest` without `TZ=UTC`). To make timezone-sensitive snapshot tests reliable across all environments, `TZ=UTC` should be added to the test scripts in `package.json` or to `jest.config.ts` via `testEnvironmentOptions.timezone`. Without explicit UTC enforcement, snapshot tests involving date-fns formatted output or `toLocaleString()` will fail for contributors in non-UTC timezones.

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Use `test.step()` for complex test scenarios to improve organization in Playwright tests

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/page-objects/**/*.ts : Utilize existing page objects pattern from `apps/meteor/tests/e2e/page-objects/`

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Use `test.beforeAll()` and `test.afterAll()` for setup/teardown in Playwright tests

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Maintain test isolation between test cases in Playwright tests

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.spec.ts : Ensure clean state for each test execution in Playwright tests

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
📚 Learning: 2025-11-24T17:08:17.065Z
Learnt from: CR
Repo: RocketChat/Rocket.Chat PR: 0
File: .cursor/rules/playwright.mdc:0-0
Timestamp: 2025-11-24T17:08:17.065Z
Learning: Applies to apps/meteor/tests/e2e/**/*.{ts,spec.ts} : Store commonly used locators in variables/constants for reuse

Applied to files:

  • apps/meteor/tests/end-to-end/api/calendar.ts
🔇 Additional comments (3)
.changeset/red-windows-breathe.md (1)

1-5: Changeset looks accurate.

The patch bump and release note match the fix described in the PR and clearly communicate the user-facing impact.

apps/meteor/server/services/calendar/service.ts (2)

316-340: LGTM on the status restoration logic.

The processEventEnd logic correctly:

  1. Only restores status when statusDefault is BUSY (meaning the system set it)
  2. Requires previousStatus to exist
  3. Ensures previousStatus differs from current statusDefault

This prevents accidental status changes when users manually changed their status during an event.


288-291: The implementation correctly handles undefined statusDefault—the guard should not be changed.

The design is intentional: statusDefault being undefined means the user has never manually set a default status, so the system is permitted to change their status for calendar events. Only when statusDefault is explicitly set to OFFLINE (user's manual choice) should calendar status changes be skipped. The comment in AbstractBusinessHour.ts confirms this: "statusDefault is the property set when a user manually changes their status. So if it's set to offline, we can be sure the user will be offline after login."

The current guard is correct as-is.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts`:
- Around line 50-55: The code incorrectly treats setting BUSY as a change even
when the user's previousStatus (or statusDefault) is already UserStatus.BUSY;
update applyStatusChange to skip the Users.updateStatusAndStatusDefault call and
not set statusChanged when there is no actual state change: inside the BUSY
branch (where newStatus === UserStatus.BUSY) and the else-if branch checking
user.statusDefault === UserStatus.BUSY, add a guard comparing previousStatus
(and/or user.statusDefault) to newStatus and only call
Users.updateStatusAndStatusDefault(uid, newStatus, newStatus) and set
statusChanged = true when the stored status differs from newStatus so no-op
updates/broadcasts are avoided.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e5ee6d91-b05c-4b94-af41-e5b6b92400a3

📥 Commits

Reviewing files that changed from the base of the PR and between 1962b21 and 0040db3.

📒 Files selected for processing (1)
  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
  • GitHub Check: cubic · AI code reviewer
  • GitHub Check: CodeQL-Build
  • GitHub Check: CodeQL-Build
🧰 Additional context used
📓 Path-based instructions (1)
**/*.{ts,tsx,js}

📄 CodeRabbit inference engine (.cursor/rules/playwright.mdc)

**/*.{ts,tsx,js}: Write concise, technical TypeScript/JavaScript with accurate typing in Playwright tests
Avoid code comments in the implementation

Files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
🧠 Learnings (14)
📚 Learning: 2026-01-17T01:51:47.764Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 38219
File: packages/core-typings/src/cloud/Announcement.ts:5-6
Timestamp: 2026-01-17T01:51:47.764Z
Learning: In packages/core-typings/src/cloud/Announcement.ts, the AnnouncementSchema.createdBy field intentionally overrides IBannerSchema.createdBy (object with _id and optional username) with a string enum ['cloud', 'system'] to match existing runtime behavior. This is documented as technical debt with a FIXME comment at apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts:53 and should not be flagged as an error until the runtime behavior is corrected.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2025-11-19T18:20:37.116Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 37419
File: apps/meteor/server/services/media-call/service.ts:141-141
Timestamp: 2025-11-19T18:20:37.116Z
Learning: In apps/meteor/server/services/media-call/service.ts, the sendHistoryMessage method should use call.caller.id or call.createdBy?.id as the message author, not call.transferredBy?.id. Even for transferred calls, the message should appear in the DM between the two users who are calling each other, not sent by the person who transferred the call.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-03-06T18:09:17.867Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 39397
File: packages/gazzodown/src/elements/Timestamp/DateTimeFormats.spec.tsx:20-23
Timestamp: 2026-03-06T18:09:17.867Z
Learning: In the RocketChat/Rocket.Chat gazzodown package (`packages/gazzodown`), tests are intended to run under the UTC timezone, but as of PR `#39397` this is NOT yet explicitly enforced in `jest.config.ts` or the `package.json` test scripts (which just run `jest` without `TZ=UTC`). To make timezone-sensitive snapshot tests reliable across all environments, `TZ=UTC` should be added to the test scripts in `package.json` or to `jest.config.ts` via `testEnvironmentOptions.timezone`. Without explicit UTC enforcement, snapshot tests involving date-fns formatted output or `toLocaleString()` will fail for contributors in non-UTC timezones.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-24T19:36:55.089Z
Learnt from: juliajforesti
Repo: RocketChat/Rocket.Chat PR: 38493
File: apps/meteor/tests/e2e/page-objects/fragments/home-content.ts:60-82
Timestamp: 2026-02-24T19:36:55.089Z
Learning: In RocketChat/Rocket.Chat e2e tests (apps/meteor/tests/e2e/page-objects/fragments/home-content.ts), thread message preview listitems do not have aria-roledescription="message", so lastThreadMessagePreview locator cannot be scoped to messageListItems (which filters for aria-roledescription="message"). It should remain scoped to page.getByRole('listitem') or mainMessageList.getByRole('listitem').

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-23T17:53:18.785Z
Learnt from: ggazzo
Repo: RocketChat/Rocket.Chat PR: 35995
File: apps/meteor/app/api/server/v1/rooms.ts:1107-1112
Timestamp: 2026-02-23T17:53:18.785Z
Learning: In Rocket.Chat PR reviews, maintain strict scope boundaries—when a PR is focused on a specific endpoint (e.g., rooms.favorite), avoid reviewing or suggesting changes to other endpoints that were incidentally refactored (e.g., rooms.invite) unless explicitly requested by maintainers.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-24T19:09:09.561Z
Learnt from: ahmed-n-abdeltwab
Repo: RocketChat/Rocket.Chat PR: 38974
File: apps/meteor/app/api/server/v1/im.ts:220-221
Timestamp: 2026-02-24T19:09:09.561Z
Learning: In RocketChat/Rocket.Chat OpenAPI migration PRs for apps/meteor/app/api/server/v1 endpoints, maintainers prefer to avoid any logic changes; style-only cleanups (like removing inline comments) may be deferred to follow-ups to keep scope tight.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-03-10T08:13:44.506Z
Learnt from: ahmed-n-abdeltwab
Repo: RocketChat/Rocket.Chat PR: 39414
File: apps/meteor/app/api/server/v1/rooms.ts:1241-1297
Timestamp: 2026-03-10T08:13:44.506Z
Learning: In the RocketChat/Rocket.Chat OpenAPI migration PRs for endpoints under apps/meteor/app/api/server/v1/rooms.ts, the pattern `ajv.compile<void>({...})` is intentionally used for the 200 response schema even when the endpoint returns `{ success: true }`. This is an established convention across all migrated endpoints (rooms.leave, rooms.favorite, rooms.delete, rooms.muteUser, rooms.unmuteUser). Do not flag this as a type mismatch during reviews of these migration PRs.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2025-11-10T19:06:20.146Z
Learnt from: MartinSchoeler
Repo: RocketChat/Rocket.Chat PR: 37408
File: apps/meteor/client/views/admin/ABAC/useRoomAttributeOptions.tsx:53-69
Timestamp: 2025-11-10T19:06:20.146Z
Learning: In the Rocket.Chat repository, do not provide suggestions or recommendations about code sections marked with TODO comments. The maintainers have already identified these as future work and external reviewers lack the full context about implementation plans and timing.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2025-11-19T12:32:29.696Z
Learnt from: d-gubert
Repo: RocketChat/Rocket.Chat PR: 37547
File: packages/i18n/src/locales/en.i18n.json:634-634
Timestamp: 2025-11-19T12:32:29.696Z
Learning: Repo: RocketChat/Rocket.Chat
Context: i18n workflow
Learning: In this repository, new translation keys should be added to packages/i18n/src/locales/en.i18n.json only; other locale files are populated via the external translation pipeline and/or fall back to English. Do not request adding the same key to all locale files in future reviews.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-03-06T18:10:23.330Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 39397
File: packages/gazzodown/src/code/CodeBlock.spec.tsx:47-68
Timestamp: 2026-03-06T18:10:23.330Z
Learning: In the RocketChat/Rocket.Chat `packages/gazzodown` package and more broadly, the HTML `<code>` element has an implicit ARIA role of `code` per WAI-ARIA 1.3, and `testing-library/dom` / jsdom supports it. Therefore, `screen.getByRole('code')` / `screen.findByRole('code')` correctly locates `<code>` elements without needing an explicit `role="code"` attribute. Do NOT flag `findByRole('code')` as invalid in future reviews.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-24T19:05:56.710Z
Learnt from: ahmed-n-abdeltwab
Repo: RocketChat/Rocket.Chat PR: 0
File: :0-0
Timestamp: 2026-02-24T19:05:56.710Z
Learning: In Rocket.Chat PRs, keep feature PRs free of unrelated lockfile-only dependency bumps; prefer reverting lockfile drift or isolating such bumps into a separate "chore" commit/PR, and always use yarn install --immutable with the Yarn version pinned in package.json via Corepack.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2025-11-19T18:20:07.720Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 37419
File: packages/i18n/src/locales/en.i18n.json:918-921
Timestamp: 2025-11-19T18:20:07.720Z
Learning: Repo: RocketChat/Rocket.Chat — i18n/formatting
Learning: This repository uses a custom message formatting parser in UI blocks/messages; do not assume standard Markdown rules. For keys like Call_ended_bold, Call_not_answered_bold, Call_failed_bold, and Call_transferred_bold in packages/i18n/src/locales/en.i18n.json, retain the existing single-asterisk emphasis unless maintainers request otherwise.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In the Rocket.Chat repository, do not reference Biome lint rules in code review feedback. Biome is not used even if biome.json exists; only reference Biome rules if there is explicit, project-wide usage documented. For TypeScript files, review lint implications without Biome guidance unless the project enables Biome rules.

Applied to files:

  • apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In this repository (RocketChat/Rocket.Chat), Biome lint rules are not used even if a biome.json exists. When reviewing TypeScript files (e.g., packages/ui-voip/src/providers/useMediaSession.ts), ensure lint suggestions do not reference Biome-specific rules. Rely on general ESLint/TypeScript lint rules and project conventions instead.

Applied to files:

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

@KevLehman KevLehman added stat: QA assured Means it has been tested and approved by a company insider labels Mar 10, 2026
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Mar 10, 2026
@dionisio-bot dionisio-bot bot added this pull request to the merge queue Mar 10, 2026
Merged via the queue into develop with commit b29fb86 Mar 10, 2026
72 of 74 checks passed
@dionisio-bot dionisio-bot bot deleted the fix/calendar-status branch March 10, 2026 22:16
KevLehman added a commit that referenced this pull request Mar 27, 2026
KevLehman added a commit that referenced this pull request Mar 31, 2026
KevLehman added a commit that referenced this pull request Apr 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge type: bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants