01a84c3598
* fix: correct bi-weekly recurring task scheduling for multi-day patterns Fixes #1004 Previously, when a recurring task was set to repeat every N weeks (where N > 1) on multiple weekdays that span a week boundary (e.g., Saturday + Sunday), the algorithm incorrectly calculated the next occurrence dates. The issue was in the calculateWeeklyRecurrence function, which didn't properly determine when to add the interval skip for multi-weekday patterns. It would: - Correctly handle Sat -> Sun (adjacent days, same cycle) - Incorrectly handle Sun -> Sat (should skip weeks, but didn't) This fix improves the logic to: 1. Detect when the current day is the last weekday in the pattern cycle 2. Account for Sunday (day 0) wrapping around in the day-of-week numbering 3. Only add interval skips when truly moving to a new cycle, not when moving between weekdays within the same cycle Test coverage added for: - Bi-weekly Saturday + Sunday pattern (the reported bug) - Starting from different days in the pattern - Bi-weekly Tuesday + Thursday pattern - Tri-weekly Friday + Saturday + Sunday pattern * docs: update MEMORY.md with GitHub template requirements - Add detailed PR template requirements and structure - Expand bug report template requirements with all fields - Update last modified date
127 lines
4.2 KiB
JavaScript
127 lines
4.2 KiB
JavaScript
const {
|
|
calculateWeeklyRecurrence,
|
|
calculateVirtualOccurrences,
|
|
} = require('../../../../modules/tasks/recurringTaskService');
|
|
|
|
describe('Bug #1004 - Bi-weekly recurrence with weekend days', () => {
|
|
describe('Saturday + Sunday pattern', () => {
|
|
it('should correctly schedule every 2 weeks on Saturday and Sunday', () => {
|
|
const saturday = new Date(Date.UTC(2026, 3, 11, 0, 0, 0, 0));
|
|
const weekdays = [0, 6];
|
|
|
|
const firstNext = calculateWeeklyRecurrence(
|
|
saturday,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(firstNext.getUTCDate()).toBe(12);
|
|
expect(firstNext.getUTCDay()).toBe(0);
|
|
|
|
const secondNext = calculateWeeklyRecurrence(
|
|
firstNext,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(secondNext.getUTCDate()).toBe(25);
|
|
expect(secondNext.getUTCDay()).toBe(6);
|
|
|
|
const thirdNext = calculateWeeklyRecurrence(
|
|
secondNext,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(thirdNext.getUTCDate()).toBe(26);
|
|
expect(thirdNext.getUTCDay()).toBe(0);
|
|
});
|
|
|
|
it('should generate correct virtual occurrences for bi-weekly weekend pattern', () => {
|
|
const task = {
|
|
due_date: new Date(Date.UTC(2026, 3, 11, 0, 0, 0, 0)),
|
|
recurrence_type: 'weekly',
|
|
recurrence_interval: 2,
|
|
recurrence_weekdays: [0, 6],
|
|
};
|
|
|
|
const occurrences = calculateVirtualOccurrences(task, 6);
|
|
|
|
const dates = occurrences.map((o) =>
|
|
new Date(o.due_date).getUTCDate()
|
|
);
|
|
const days = occurrences.map((o) =>
|
|
new Date(o.due_date).getUTCDay()
|
|
);
|
|
|
|
expect(dates).toEqual([11, 12, 25, 26, 9, 10]);
|
|
expect(days).toEqual([6, 0, 6, 0, 6, 0]);
|
|
});
|
|
|
|
it('should work when starting from Sunday', () => {
|
|
const sunday = new Date(Date.UTC(2026, 3, 12, 0, 0, 0, 0));
|
|
const weekdays = [0, 6];
|
|
|
|
const firstNext = calculateWeeklyRecurrence(
|
|
sunday,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(firstNext.getUTCDate()).toBe(25);
|
|
expect(firstNext.getUTCDay()).toBe(6);
|
|
|
|
const secondNext = calculateWeeklyRecurrence(
|
|
firstNext,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(secondNext.getUTCDate()).toBe(26);
|
|
expect(secondNext.getUTCDay()).toBe(0);
|
|
});
|
|
});
|
|
|
|
describe('Other multi-day patterns with interval > 1', () => {
|
|
it('should handle Tuesday + Thursday every 2 weeks', () => {
|
|
const tuesday = new Date(Date.UTC(2026, 3, 14, 0, 0, 0, 0));
|
|
const weekdays = [2, 4];
|
|
|
|
const firstNext = calculateWeeklyRecurrence(
|
|
tuesday,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(firstNext.getUTCDay()).toBe(4);
|
|
expect(firstNext.getUTCDate()).toBe(16);
|
|
|
|
const secondNext = calculateWeeklyRecurrence(
|
|
firstNext,
|
|
2,
|
|
null,
|
|
weekdays
|
|
);
|
|
expect(secondNext.getUTCDay()).toBe(2);
|
|
expect(secondNext.getUTCDate()).toBe(28);
|
|
});
|
|
|
|
it('should handle Friday + Saturday + Sunday every 3 weeks', () => {
|
|
const friday = new Date(Date.UTC(2026, 3, 10, 0, 0, 0, 0));
|
|
const weekdays = [0, 5, 6];
|
|
|
|
const occurrences = [friday];
|
|
let current = friday;
|
|
for (let i = 0; i < 8; i++) {
|
|
current = calculateWeeklyRecurrence(current, 3, null, weekdays);
|
|
occurrences.push(current);
|
|
}
|
|
|
|
const days = occurrences.map((d) => d.getUTCDay());
|
|
expect(days).toEqual([5, 6, 0, 5, 6, 0, 5, 6, 0]);
|
|
|
|
const dates = occurrences.map((d) => d.getUTCDate());
|
|
expect(dates).toEqual([10, 11, 12, 1, 2, 3, 22, 23, 24]);
|
|
});
|
|
});
|
|
});
|