Skip to content

Fix: Show someday base recurring events in sidebar #923

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
victor-enogwe merged 8 commits into from
Sep 25, 2025
Merged

Fix: Show someday base recurring events in sidebar #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd5cb02
Initial plan
Copilot Sep 18, 2025
789b1a5
feat(backend): show someday base recurring events in sidebar
Copilot Sep 18, 2025
b53271d
Merge branch 'main' into copilot/fix-922
victor-enogwe Sep 24, 2025
f9839df
refactor(backend): use existing mock creator functions in event tests
Copilot Sep 24, 2025
2fffdf0
refactor(backend): make conditional logic more concise in getReadAllF…
Copilot Sep 24, 2025
229de17
refactor(backend): clean up test code and simplify if statement
Copilot Sep 25, 2025
9e85eff
Merge branch 'main' into copilot/fix-922
victor-enogwe Sep 25, 2025
2988625
refactor(backend): use existing discriminator functions in tests
Copilot Sep 25, 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
48 changes: 48 additions & 0 deletions packages/backend/src/event/services/event.find.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { mockEventSetSomeday1 } from "@core/__mocks__/v1/events/events.someday.1
import { MapEvent, gEventToCompassEvent } from "@core/mappers/map.event";
import { Schema_Event } from "@core/types/event.types";
import { isBase, isExistingInstance } from "@core/util/event/event.util";
import { createMockBaseEvent } from "@core/util/test/ccal.event.factory";
import {
cleanupTestDb,
setupTestDb,
Expand Down Expand Up @@ -88,6 +89,31 @@ describe("Jan 2022: Many Formats", () => {
const instances = result.filter(isExistingInstance);
expect(instances).toHaveLength(gInstances.length);
});

it("excludes base calendar recurring events when someday=false", async () => {
// Create a base calendar recurring event (isSomeday: false)
const baseCalendarRecurringEvent = createMockBaseEvent({
user: userId,
isSomeday: false,
});

// Insert the test event
await mongoService.event.insertOne(baseCalendarRecurringEvent);

// Query for calendar events (not someday)
const filter = getReadAllFilter(userId, {
start: "2023-10-01",
end: "2023-10-31",
});
const result = await mongoService.event.find(filter).toArray();

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

@victor-enogwe victor-enogwe Sep 25, 2025

Choose a reason for hiding this comment

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

👀

);

expect(baseCalendarRecurringEvents).toHaveLength(0);
});
});

describe("finds events with exact same timestamps", () => {
Expand Down Expand Up @@ -298,6 +324,28 @@ describe("Jan 2022: Many Formats", () => {
expect(result[0]?.title).toBe("Multi-Month 2");
});
});

it("includes base someday recurring events when someday query provided", async () => {
// Create a base someday recurring event
const baseSomedayRecurringEvent = createMockBaseEvent({
user: userId,
isSomeday: true,
});

// Insert the test event
await mongoService.event.insertOne(baseSomedayRecurringEvent);

// Query for someday events
const filter = getReadAllFilter(userId, { someday: "true" });
const result = await mongoService.event.find(filter).toArray();

// Should include the base someday recurring event
const baseSomedayRecurringEvents = result.filter(
(e) => isBase(e) && e.isSomeday === true,
);

expect(baseSomedayRecurringEvents.length).toBeGreaterThan(0);
});
});
});

Expand Down
5 changes: 3 additions & 2 deletions packages/backend/src/event/services/event.service.util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ export const getReadAllFilter = (
Object.assign(filter, dateFilters);
}

// Exclude base recurring events (those with recurrence.rule)
filter["recurrence.rule"] = { $exists: false };
// For someday events: include base recurring events (those with recurrence.rule)
// For calendar events: exclude base recurring events (those with recurrence.rule)
if (!isSomeday) filter["recurrence.rule"] = { $exists: false };

return filter;
};
Expand Down