Skip to content

Fixed issue where scheduler would not schedule anything after first event of day #119

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
Cheyannne merged 1 commit into from
May 11, 2025
Merged

Fixed issue where scheduler would not schedule anything after first event of day #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions backend/src/utils/Scheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class Scheduler {

// when free block not found, find next day
if (!freeBlock) {
// move current time to start of next time block
// move current time to start of next day
const workTimeStart = UserPreferenceUtils.minuteNumberToHourAndMinute(userPreferences.startTime);
currentSearchedTime.setDate(currentSearchedTime.getDate() + 1);
currentSearchedTime.setHours(workTimeStart[0]);
Expand Down Expand Up @@ -216,7 +216,6 @@ export default class Scheduler {
* @param userPreferences The user preferences.
* @param startSearchTime The start time for searching the next free time block.
* @returns an object containing the time and date for the next free time block;
* Returns
*/
static nextFreeTimeBlock(
events: UserEvent[],
Expand All @@ -227,12 +226,14 @@ export default class Scheduler {
const dayEnd = userPreferences.endTime;
const minIncrement = 5;

// Start at startSearchTime and continue search until end of day.
// Increment time by minIncrement minutes if time is not free.
for (
let checkTime = new Date(startSearchTime);
UserPreferenceUtils.dateToMinuteNumber(checkTime) <= dayEnd;
checkTime = new Date(checkTime.getTime() + minIncrement * 60000)
) {
if (this.timeIsFree(events, userPreferences, startSearchTime)) {
if (this.timeIsFree(events, userPreferences, checkTime)) {
const availableMinutes = this.minutesToNextEvent(
events,
userPreferences,
Expand Down Expand Up @@ -266,7 +267,8 @@ export default class Scheduler {
if (!isWithinWorkHours) return false;

// checks whether any events overlap at the current time
const hasConflict = this.eventsAtTime(events, time).length > 0;
const conflictingEvents = this.eventsAtTime(events, time);
const hasConflict = conflictingEvents.length > 0;

// Current time is free when there's no event at this time
return !hasConflict;
Expand All @@ -282,7 +284,7 @@ export default class Scheduler {
return events.filter(
(event) =>
event &&
(event.start_time != undefined && event.end_time != undefined) &&
(event.start_time && event.end_time) &&
(event.start_time <= time && event.end_time > time)
);
}
Expand Down