Fix: Show someday base recurring events in sidebar by Copilot · Pull Request #923 · SwitchbackTech/compass

Copilot · 2025-09-18T04:23:20Z

Changes Made

Backend Logic Fix

Modified packages/backend/src/event/services/event.service.util.ts:

Before: filter["recurrence.rule"] = { $exists: false } (excluded ALL base recurring events)
After: Conditional logic that excludes base recurring events only for calendar events (isSomeday: false), but includes them for someday events (isSomeday: true)

Test Coverage

Added comprehensive tests in packages/backend/src/event/services/event.find.test.ts:

New test: "includes base someday recurring events when someday query provided" - Verifies that base someday recurring events are now returned when querying for someday events
New test: "excludes base calendar recurring events when someday=false" - Ensures base calendar recurring events are still properly excluded for calendar queries

Code Quality Improvements

Refactored tests: Updated test cases to use createMockBaseEvent from @core/util/test/ccal.event.factory instead of manually creating test objects
Following established patterns: Uses the same mock creator functions used throughout the codebase
Simplified conditional logic: Made the if statement more concise by removing empty if branch and inverting condition
Cleaned up test code: Removed unnecessary custom fields and test conditions, relying on mock defaults while only overriding essential fields
Using discriminator functions: Updated tests to use existing isBase function instead of manually checking recurrence.rule

Verification

✅ All 277 backend tests pass
✅ All 373 web tests pass
✅ Manual verification: Web application loads correctly at http://localhost:9080/

The fix resolves the issue where users couldn't see someday base recurring events in the sidebar after moving them from the calendar view. Now the sidebar will properly display both regular someday events and base someday recurring events while maintaining the correct behavior for calendar events.

Fixes #922.

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

- Modified getReadAllFilter to include base someday recurring events while excluding base calendar recurring events - Added comprehensive tests for both scenarios - Verified web application still loads correctly - Fixed issue where someday base recurring events were not visible in sidebar when moved from calendar Co-authored-by: victor-enogwe <23452630+victor-enogwe@users.noreply.github.com>

victor-enogwe · 2025-09-24T07:24:58Z

packages/backend/src/event/services/event.find.test.ts

+      const baseCalendarRecurringEvent = {
+        user: userId,
+        title: "Base Calendar Recurring Event",
+        isSomeday: false,
+        startDate: "2023-10-01T10:00:00Z",
+        endDate: "2023-10-01T11:00:00Z",
+        recurrence: {
+          rule: ["RRULE:FREQ=WEEKLY;COUNT=5"],
+        },
+      };


using existing mock creator functions.

Updated to use createMockBaseEvent from @core/util/test/ccal.event.factory instead of manually creating the test object. This follows the established patterns used throughout the codebase. Changes committed in f9839df.

victor-enogwe · 2025-09-24T07:25:28Z

packages/backend/src/event/services/event.find.test.ts

+      const baseSomedayRecurringEvent = {
+        user: userId,
+        title: "Base Someday Recurring Event",
+        isSomeday: true,
+        startDate: "2023-10-01",
+        endDate: "2023-10-02",
+        recurrence: {
+          rule: ["RRULE:FREQ=WEEKLY;COUNT=5"],
+        },
+      };


@copilot use existing mock creator functions

Updated to use createMockBaseEvent from @core/util/test/ccal.event.factory instead of manually creating the test object. This follows the established patterns used throughout the codebase. Changes committed in f9839df.

victor-enogwe · 2025-09-24T07:26:20Z

packages/backend/src/event/services/event.service.util.ts

+  if (isSomeday) {
+    // Include all someday events, including base recurring events
+    // No additional filter needed for recurrence.rule
+  } else {
+    // Exclude base recurring events (those with recurrence.rule)
+    filter["recurrence.rule"] = { $exists: false };
+  }


this if statement can be made concise @copilot

Made the if statement more concise by inverting the condition to remove the empty if branch. Changed from if (isSomeday) { /* empty */ } else { /* code */ } to if (!isSomeday) { /* code */ }. This maintains the exact same functionality while being more readable. Changes committed in 2fffdf0.

Updated test cases to use createMockBaseEvent instead of manually creating test objects as requested in PR review feedback. - Imported createMockBaseEvent from @core/util/test/ccal.event.factory - Replaced manual object creation with createMockBaseEvent calls in both test cases - Maintained same test functionality while following established patterns Co-authored-by: victor-enogwe <23452630+victor-enogwe@users.noreply.github.com>

…ilter Simplified if-else block by inverting the condition to remove empty if branch. - Changed from: if (isSomeday) { /* empty */ } else { /* code */ } - Changed to: if (!isSomeday) { /* code */ } This makes the code more readable and concise while maintaining the exact same functionality. Co-authored-by: victor-enogwe <23452630+victor-enogwe@users.noreply.github.com>

victor-enogwe · 2025-09-25T11:31:41Z

packages/backend/src/event/services/event.find.test.ts

+        title: "Base Calendar Recurring Event",
+        isSomeday: false,
+        startDate: "2023-10-01T10:00:00Z",
+        endDate: "2023-10-01T11:00:00Z",
+        recurrence: {
+          rule: ["RRULE:FREQ=WEEKLY;COUNT=5"],


remove unecessary custom fields

Removed unnecessary custom fields (title, startDate, endDate, recurrence.rule) from createMockBaseEvent call. Now only overriding essential fields (user, isSomeday) and relying on mock defaults. Changes committed in 229de17.

victor-enogwe · 2025-09-25T11:31:54Z

packages/backend/src/event/services/event.find.test.ts

+        title: "Base Someday Recurring Event",
+        isSomeday: true,
+        startDate: "2023-10-01",
+        endDate: "2023-10-02",
+        recurrence: {
+          rule: ["RRULE:FREQ=WEEKLY;COUNT=5"],
+        },


remove unecessary custom fields

Removed unnecessary custom fields (title, startDate, endDate, recurrence.rule) from createMockBaseEvent call. Now only overriding essential fields (user, isSomeday) and relying on mock defaults. Changes committed in 229de17.

victor-enogwe · 2025-09-25T11:33:39Z

packages/backend/src/event/services/event.find.test.ts

+      const titles = result.map((e) => e.title);
+      expect(titles).not.toContain("Base Calendar Recurring Event");


remove unecessary test conditions

Removed unnecessary test conditions that checked specific titles. The test now only verifies the essential behavior: that base calendar recurring events are properly excluded. Changes committed in 229de17.

victor-enogwe · 2025-09-25T11:33:54Z

packages/backend/src/event/services/event.find.test.ts

+      const titles = baseSomedayRecurringEvents.map((e) => e.title);
+      expect(titles).toContain("Base Someday Recurring Event");


remove unecessary test conditions

Removed unnecessary test conditions that checked specific titles. The test now only verifies the essential behavior: that base someday recurring events are properly included. Changes committed in 229de17.

victor-enogwe · 2025-09-25T11:34:31Z

packages/backend/src/event/services/event.service.util.ts

+  if (!isSomeday) {
+    filter["recurrence.rule"] = { $exists: false };
+  }


do not wrap in braces if this is a single if statement that fits on a line

Simplified the single-line if statement by removing the braces: if (!isSomeday) filter["recurrence.rule"] = { $exists: false };. This follows the style preference for single-line conditions. Changes committed in 229de17.

- Removed unnecessary custom fields from createMockBaseEvent calls (title, startDate, endDate, recurrence.rule) - Removed unnecessary test conditions that checked specific titles - Simplified single-line if statement by removing braces - Tests now rely on default mock values while only overriding essential fields (user, isSomeday) Co-authored-by: victor-enogwe <23452630+victor-enogwe@users.noreply.github.com>

Copilot

Pull Request Overview

This PR fixes an issue where someday base recurring events were not displayed in the sidebar. The problem was that the getReadAllFilter function was excluding all base recurring events (those with recurrence.rule) regardless of whether they were calendar or someday events.

Modified the filtering logic to conditionally exclude base recurring events only for calendar events while including them for someday events
Added comprehensive test coverage for both scenarios to ensure the fix works correctly
Refactored tests to use existing mock creator functions following established patterns

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
`packages/backend/src/event/services/event.service.util.ts`	Updated `getReadAllFilter` to conditionally apply recurrence rule filtering based on event type
`packages/backend/src/event/services/event.find.test.ts`	Added tests to verify base someday recurring events are included and base calendar recurring events are excluded

victor-enogwe · 2025-09-25T11:47:26Z

packages/backend/src/event/services/event.find.test.ts

+
+      // Should NOT include the base calendar recurring event
+      const baseCalendarRecurringEvents = result.filter(
+        (e) => e.isSomeday === false && e.recurrence?.rule,


use existing event discriminator functions(e.g isBase) to compose this check.

Updated to use the existing isBase discriminator function: isBase(e) && e.isSomeday === false instead of manually checking e.recurrence?.rule. This follows the established pattern from @core/util/event/event.util. Changes committed in 2988625.

victor-enogwe · 2025-09-25T11:47:33Z

packages/backend/src/event/services/event.find.test.ts

+
+      // Should include the base someday recurring event
+      const baseSomedayRecurringEvents = result.filter(
+        (e) => e.isSomeday === true && e.recurrence?.rule,


use existing event discriminator functions(e.g isBase) to compose this check.

Updated to use the existing isBase discriminator function: isBase(e) && e.isSomeday === true instead of manually checking e.recurrence?.rule. This follows the established pattern from @core/util/event/event.util. Changes committed in 2988625.

Updated test filters to use the existing `isBase` function instead of manually checking `e.recurrence?.rule`. - Changed from: `e.isSomeday === false && e.recurrence?.rule` - Changed to: `isBase(e) && e.isSomeday === false` This follows the established pattern of using discriminator functions from @core/util/event/event.util for event type checking. Co-authored-by: victor-enogwe <23452630+victor-enogwe@users.noreply.github.com>

victor-enogwe · 2025-09-25T11:56:22Z

packages/backend/src/event/services/event.find.test.ts

+
+      // Should NOT include the base calendar recurring event
+      const baseCalendarRecurringEvents = result.filter(
+        (e) => isBase(e) && e.isSomeday === false,


tyler-dane · 2025-09-25T14:49:39Z

Noticed that this is working in prod but not staging. Friendly reminder to either update your branch before deploying and/or deploy to staging first to avoid this

Initial plan

dd5cb02

Copilot AI assigned Copilot and victor-enogwe Sep 18, 2025

Copilot started work on behalf of victor-enogwe September 18, 2025 04:23 View session

Copilot AI changed the title ~~[WIP] Someday base recurring events are not shown in the sidebar~~ Fix: Show someday base recurring events in sidebar Sep 18, 2025

Copilot finished work on behalf of victor-enogwe September 18, 2025 04:35

Copilot AI requested a review from victor-enogwe September 18, 2025 04:35

Merge branch 'main' into copilot/fix-922

b53271d

victor-enogwe reviewed Sep 24, 2025

View reviewed changes

Copilot started work on behalf of victor-enogwe September 24, 2025 07:25 View session

victor-enogwe reviewed Sep 24, 2025

View reviewed changes

Copilot AI requested a review from victor-enogwe September 24, 2025 07:32

Copilot finished work on behalf of victor-enogwe September 24, 2025 07:32

Copilot started work on behalf of victor-enogwe September 24, 2025 07:32 View session

Copilot finished work on behalf of victor-enogwe September 24, 2025 07:37

victor-enogwe suggested changes Sep 25, 2025

View reviewed changes

Copilot started work on behalf of victor-enogwe September 25, 2025 11:35 View session

victor-enogwe marked this pull request as ready for review September 25, 2025 11:41

Copilot AI review requested due to automatic review settings September 25, 2025 11:41

Copilot AI reviewed Sep 25, 2025

View reviewed changes

Merge branch 'main' into copilot/fix-922

9e85eff

Copilot AI requested a review from victor-enogwe September 25, 2025 11:43

Copilot finished work on behalf of victor-enogwe September 25, 2025 11:43

victor-enogwe suggested changes Sep 25, 2025

View reviewed changes

Copilot started work on behalf of victor-enogwe September 25, 2025 11:48 View session

Copilot finished work on behalf of victor-enogwe September 25, 2025 11:54

Copilot AI requested a review from victor-enogwe September 25, 2025 11:54

victor-enogwe reviewed Sep 25, 2025

View reviewed changes

victor-enogwe approved these changes Sep 25, 2025

View reviewed changes

victor-enogwe merged commit fbb965a into main Sep 25, 2025
4 checks passed

victor-enogwe deleted the copilot/fix-922 branch September 25, 2025 12:13

		const titles = result.map((e) => e.title);
		expect(titles).not.toContain("Base Calendar Recurring Event");

		const titles = baseSomedayRecurringEvents.map((e) => e.title);
		expect(titles).toContain("Base Someday Recurring Event");

Conversation

Copilot AI commented Sep 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

Backend Logic Fix

Test Coverage

Code Quality Improvements

Verification

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tyler-dane commented Sep 25, 2025

Uh oh!

Reviewers

Copilot AI commented Sep 18, 2025 •

edited

Loading