Skip to content

🐛 Fix: allday events not displaying if start-end date is start of week #440

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

Closed
wants to merge 7 commits into from
Closed

🐛 Fix: allday events not displaying if start-end date is start of week #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5858c7
feat: validate incoming date filter
that-one-arab May 21, 2025
6960e0e
fix: failing test due to incorrect date
that-one-arab May 22, 2025
42d8b7a
fix(web): encode date parameters in event API request
that-one-arab May 22, 2025
45b42d7
fix(web): ensure all-day event dates are in ISO 8601 format
that-one-arab May 23, 2025
22d2146
fix(backend): add temporary migration script for all-day event date c…
that-one-arab May 23, 2025
2baf296
fix: update all-day event date formats to ISO 8601
that-one-arab May 23, 2025
3ef378d
feat(backend): add edge case tests for event filtering by date range
that-one-arab May 23, 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
1 change: 1 addition & 0 deletions packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@types/supertest": "^6.0.3",
"alias-hq": "^6.1.0",
"jest-environment-node": "^29.7.0",
"luxon": "^3.6.1",
"socket.io-client": "^4.7.5",
"supertest": "^7.1.0",
"tsconfig-paths": "^4.1.2"
Expand Down
54 changes: 53 additions & 1 deletion 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 @@ -90,7 +90,7 @@ describe("Jan 2022: Many Formats", () => {
const filter = getReadAllFilter("user1", {
// make sure these match text data exactly
start: "2022-01-01T00:00:00+03:00",
end: "2022-01-020T11:11:11+03:00",
end: "2022-01-20T11:11:11+03:00",
});

const result = await eventCollection.find(filter).toArray();
Expand Down Expand Up @@ -292,6 +292,58 @@ describe("Jan 2022: Many Formats", () => {
});
});

describe("Edge Cases", () => {
let connection: MongoClient;
let db: Db;
let eventCollection: Collection<Schema_Event>;

beforeAll(async () => {
connection = await MongoClient.connect(process.env["MONGO_URL"] as string);
db = await connection.db();
eventCollection = db.collection("event");
});

afterAll(async () => {
await connection.close();
});

it("should return both timed and all-day events when filtering by date range that includes both", async () => {
await eventCollection.deleteMany({});
await eventCollection.insertMany([
{
_id: "timed-event-id",
user: "test-user",
title: "Timed Event",
isAllDay: false,
isSomeday: false,
startDate: "2025-02-02T00:00:00+03:00",
endDate: "2025-02-02T01:01:00+03:00",
},
{
_id: "allday-event-id",
user: "test-user",
title: "All-day Event",
isAllDay: true,
isSomeday: false,
startDate: "2025-02-02T00:00:00+03:00",
endDate: "2025-02-02T01:00:00+03:00",
},
]);

const filter = getReadAllFilter("test-user", {
start: "2025-02-02T00:00:00+03:00",
end: "2025-02-08T23:59:59+03:00",
});

const result = await eventCollection.find(filter).toArray();
const titles = result.map((e) => e.title);

expect(titles.includes("Timed Event")).toBe(true);
expect(titles.includes("All-day Event")).toBe(true);
expect(result).toHaveLength(2);
});
});

const _jan1ToJan3Assertions = (result: []) => {
const titles = result.map((e) => e.title);

Expand Down
11 changes: 11 additions & 0 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 @@ -15,6 +15,16 @@ import { error } from "@backend/common/errors/handlers/error.handler";
dayjs.extend(tz);
dayjs.extend(utc);

const validateDateFilters = (start: string, end: string) => {
const _isValidDate = (date: string) => {
return dayjs(date).isValid();
};

if (!_isValidDate(start) || !_isValidDate(end)) {
throw error(GenericError.BadRequest, "Invalid date format");
}
};

export const getCreateParams = (userId: string, event: Schema_Event_Core) => {
const _event = {
...event,
Expand Down Expand Up @@ -90,6 +100,7 @@ export const getReadAllFilter = (

// Add date filters if specified
if (start && end) {
validateDateFilters(start, end);
const dateFilters = _getDateFilters(isSomeday, start, end);
Object.assign(filter, dateFilters);
}
Expand Down
80 changes: 40 additions & 40 deletions packages/core/src/__mocks__/v1/events/events.22jan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,80 +13,80 @@ export const mockEventSetJan22 = [
title: "Jan 1 2021",
isAllDay: true,
isSomeday: false,
startDate: "2021-01-01",
endDate: "2021-01-02",
startDate: "2021-01-01T00:00:00+12:00",
endDate: "2021-01-02T00:00:00+12:00",
},
{
_id: "9upm",
user: "user1",
title: "Jan 1 2021 (times)",
isAllDay: false,
isSomeday: false,
startDate: "2021-01-01T12:12:12-12:00",
endDate: "2021-01-02T02:02:02-02:30",
startDate: "2021-01-01T12:12:12+12:00",
endDate: "2021-01-02T02:02:02+12:00",
},
{
_id: "wuop",
user: "user1",
title: "Dec 31",
isAllDay: true,
isSomeday: false,
startDate: "2021-12-31",
endDate: "2022-01-01",
startDate: "2021-12-31T00:00:00+12:00",
endDate: "2022-01-01T00:00:00+12:00",
},
{
_id: "ddim",
user: "user1",
title: "Dec 31 - Feb 2",
isAllDay: true,
isSomeday: false,
startDate: "2021-12-31",
endDate: "2022-02-03",
startDate: "2021-12-31T00:00:00+12:00",
endDate: "2022-02-03T00:00:00+12:00",
},
{
_id: "dkk",
user: "user1",
title: "Dec 31 - Jan 1",
isAllDay: true,
isSomeday: false,
startDate: "2021-12-31",
endDate: "2022-01-02",
startDate: "2021-12-31T00:00:00+12:00",
endDate: "2022-01-02T00:00:00+12:00",
},
{
_id: "foo",
user: "user1",
title: "Jan 1",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-01",
endDate: "2022-01-02",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2022-01-02T00:00:00+12:00",
},
{
_id: "zoo",
user: "user1",
title: "Jan 1 (times)",
isAllDay: false,
isSomeday: false,
startDate: "2022-01-01T00:00:00+03:00",
endDate: "2022-01-020T11:11:11+03:00",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2022-01-02T00:00:00+12:00",
},
{
_id: "noo",
user: "user1",
title: "Jan 1 (UTC times)",
isAllDay: false,
isSomeday: false,
startDate: "2022-01-01T00:11:00Z",
endDate: "2022-01-02T00:12:00Z",
startDate: "2022-01-01T00:11:00+12:00",
endDate: "2022-01-02T00:12:00+12:00",
},
{
_id: "moo",
user: "user1",
title: "Jan 1 - Jan 3",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-01",
endDate: "2022-01-04",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2022-01-04T00:00:00+12:00",
},
{
_id: "hoo",
Expand All @@ -103,97 +103,97 @@ export const mockEventSetJan22 = [
title: "Jan 1 - Jan 21",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-01",
endDate: "2022-01-22",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2022-01-22T00:00:00+12:00",
},
{
_id: "20mi",
user: "user1",
title: "Jan 1 - Jan 21 (times)",
isAllDay: false,
isSomeday: false,
startDate: "2022-01-01T00:00:00+06:00",
endDate: "2022-01-21T12:30:00+06:00",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2022-01-21T12:30:00+12:00",
},
{
_id: "92323asd",
user: "user1",
title: "Jan 1 - Apr 20",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-01",
endDate: "2022-04-21",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2022-04-21T00:00:00+12:00",
},
{
_id: "mnb",
user: "user1",
title: "Jan 1 - Apr 20 (times)",
isAllDay: false,
isSomeday: false,
startDate: "2022-01-01T04:30:00-02:00",
endDate: "2022-04-21T04:40:00-02:00",
startDate: "2022-01-01T04:30:00+12:00",
endDate: "2022-04-21T04:40:00+12:00",
},
{
_id: "kimnh",
user: "user1",
title: "Jan 1 2022 - Jan 1 2023",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-01",
endDate: "2023-01-02",
startDate: "2022-01-01T00:00:00+12:00",
endDate: "2023-01-02T00:00:00+12:00",
},
{
_id: "929hs",
user: "user1",
title: "Jan 1 2022 - Jan 1 2023 (times)",
isAllDay: false,
isSomeday: false,
startDate: "2022-01-01T04:30:00-02:00",
endDate: "2023-01-01T04:40:00-02:00",
startDate: "2022-01-01T04:30:00+12:00",
endDate: "2023-01-01T04:40:00+12:00",
},
{
_id: "bar",
title: "Jan 2",
user: "user1",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-02",
endDate: "2022-01-03",
startDate: "2022-01-02T00:00:00+12:00",
endDate: "2022-01-03T00:00:00+12:00",
},
{
_id: "buzz",
user: "user1",
isAllDay: true,
isSomeday: false,
title: "Jan 3",
startDate: "2022-01-03",
endDate: "2022-01-04",
startDate: "2022-01-03T00:00:00+12:00",
endDate: "2022-01-04T00:00:00+12:00",
},
{
_id: "huzz",
user: "user1",
isAllDay: true,
isSomeday: false,
title: "Jan 3 - Feb 3",
startDate: "2022-01-03",
endDate: "2022-02-04",
startDate: "2022-01-03T00:00:00+12:00",
endDate: "2022-02-04T00:00:00+12:00",
},
{
_id: "kup",
user: "user1",
title: "Jan 4",
isAllDay: true,
isSomeday: false,
startDate: "2022-01-04",
endDate: "2022-01-05",
startDate: "2022-01-04T00:00:00+12:00",
endDate: "2022-01-05T00:00:00+12:00",
},
{
_id: "pmim",
user: "user1",
title: "Jan 1 2023",
isAllDay: true,
isSomeday: false,
startDate: "2023-01-01",
endDate: "2023-01-02",
startDate: "2023-01-01T00:00:00+12:00",
endDate: "2023-01-02T00:00:00+12:00",
},
];
Loading