@happychef/algorithm 1.4.0 → 1.4.1

package/reservation_data/counter.js

@@ -1,82 +1,75 @@
 // counter.js
 
-const { getPrevDateStr } = require('../dateHelpers');
-
 /**
  * Parses a time string in "HH:MM" format into minutes since midnight.
  * @param {string} timeStr - The time string in "HH:MM" format.
  * @returns {number} The time in minutes since midnight.
  */
 function parseTime(timeStr) {
-  const [hours, minutes] = timeStr.split(':').map(Number);
-  return hours * 60 + minutes;
-}
-
-function getDuurReservatie(data) {
-  let duurReservatie = 120;
-  if (
-    data['general-settings'] &&
-    data['general-settings'].duurReservatie &&
-    parseInt(data['general-settings'].duurReservatie, 10) > 0
-  ) {
-    duurReservatie = parseInt(data['general-settings'].duurReservatie, 10);
+	const [hours, minutes] = timeStr.split(':').map(Number);
+	return hours * 60 + minutes;
   }
 
-  return duurReservatie;
-}
+  function getDuurReservatie(data) {
+	let duurReservatie = 120;
+	if (
+	  data['general-settings'] &&
+	  data['general-settings'].duurReservatie &&
+	  parseInt(data['general-settings'].duurReservatie, 10) > 0
+	) {
+	  duurReservatie = parseInt(data['general-settings'].duurReservatie, 10);
+	}
 
-/**
- * Parses a reservation's duration, falling back to the default.
- */
-function getReservationDuration(reservation, defaultDuration) {
-  if (reservation.duration) {
-    const rawDur = reservation.duration.$numberInt ?? reservation.duration;
-    const parsed = parseInt(rawDur, 10);
-    if (!isNaN(parsed) && parsed > 0) {
-      return parsed;
-    }
+	return duurReservatie;
   }
-  return defaultDuration;
-}
-
-/**
- * Calculates the total number of guests for reservations that cover a specific hour on a specific date.
- * Also includes guests from previous-day reservations whose duration extends past midnight.
- * @param {Object} data - The main data object containing general settings.
- * @param {Array} reservations - An array of reservation objects.
- * @param {string} hour - The hour to check in "HH:MM" format.
- * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
- * @returns {number} The total number of guests for that hour on the specified date.
- */
-function getGuestCountAtHour(data, reservations, hour, dateStr) {
-  const duurReservatie = getDuurReservatie(data);
-  const targetTime = parseTime(hour);
-  const prevDateStr = getPrevDateStr(dateStr);
-
-  let totalGuests = 0;
+  
+  /**
+   * Calculates the total number of guests for reservations that cover a specific hour on a specific date.
+   * @param {Object} data - The main data object containing general settings.
+   * @param {Array} reservations - An array of reservation objects.
+   * @param {string} hour - The hour to check in "HH:MM" format.
+   * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
+   * @returns {number} The total number of guests for that hour on the specified date.
+   */
+  function getGuestCountAtHour(data, reservations, hour, dateStr) {
+	// Get 'duurReservatie' from general settings, default to 120 if not set or zero
+	let duurReservatie = getDuurReservatie(data)
+  
+	// Convert the target hour to minutes since midnight
+	const targetTime = parseTime(hour);
+  
+	let totalGuests = 0;
+  
+	for (const reservation of reservations) {
+	  // Only consider reservations on the specified date
+	  if (reservation.date !== dateStr) {
+		continue;
+	  }
+  
+	  const startTime = parseTime(reservation.time);
 
-  for (const reservation of reservations) {
-    const startTime = parseTime(reservation.time);
-    const rDuration = getReservationDuration(reservation, duurReservatie);
-    const endTime = startTime + rDuration;
+	  // Use reservation specific duration if available, else default
+	  let rDuration = duurReservatie;
+	  if (reservation.duration) {
+		const rawDur = reservation.duration.$numberInt ?? reservation.duration;
+		const parsed = parseInt(rawDur, 10);
+		if (!isNaN(parsed) && parsed > 0) {
+			rDuration = parsed;
+		}
+	  }
 
-    if (reservation.date === dateStr) {
-      // Same-day reservation
-      if (targetTime >= startTime && targetTime < endTime) {
-        totalGuests += parseInt(reservation.guests, 10);
-      }
-    } else if (reservation.date === prevDateStr && endTime > 1440) {
-      // Previous-day reservation that crosses midnight
-      const spilloverEnd = endTime - 1440;
-      if (targetTime < spilloverEnd) {
-        totalGuests += parseInt(reservation.guests, 10);
-      }
-    }
+	  const endTime = startTime + rDuration;
+  	  // Check if the target time is within the reservation time range
+	  // Start time is inclusive, end time is exclusive
+	  if (targetTime >= startTime && targetTime < endTime) {
+		totalGuests += parseInt(reservation.guests, 10);
+	  }
+	}
+  
+	return totalGuests;
   }
-
-  return totalGuests;
-}
-
-module.exports = {
-  getGuestCountAtHour,
-};
+  
+  module.exports = {
+	getGuestCountAtHour,
+  };
+  

package/restaurant_data/openinghours.js

@@ -38,6 +38,11 @@ function getMealTypeByTime(timeStr) {
       return mealType;
     }
   }
+  // Times at or past dinner end are considered dinner (cross-midnight support for bowling)
+  const dinnerEnd = parseTime(shifts.dinner.end);
+  if (time >= dinnerEnd) {
+    return 'dinner';
+  }
   return null;
 }
 
@@ -104,6 +109,24 @@ function getDataByDateAndMeal(data, dateStr, mealType) {
 
   adjustMealData(mealData, data['general-settings']);
 
+  // Extend dinner end time past midnight for bowling venues
+  const hoursOpenedPastMidnight = Number(mealData.hoursOpenedPastMidnight) || 0;
+  if (hoursOpenedPastMidnight > 0 && mealType === 'dinner') {
+    const newEndMinutes = 1440 + (hoursOpenedPastMidnight * 60); // midnight + hours
+    const hours = String(Math.floor(newEndMinutes / 60)).padStart(2, '0');
+    const minutes = String(newEndMinutes % 60).padStart(2, '0');
+    mealData.endTime = `${hours}:${minutes}`;
+  } else if (mealType === 'dinner') {
+    // For bowling accounts, ensure dinner extends to at least 24:00 (midnight)
+    const isBowling = data?.account_type === 'bowling' || data?.accountType === 'bowling' || data?.['general-settings']?.account_type === 'bowling';
+    if (isBowling) {
+      const currentEndMinutes = parseTime(mealData.endTime);
+      if (currentEndMinutes < 1440) {
+        mealData.endTime = '24:00';
+      }
+    }
+  }
+
   // Add duurReservatie to endTime
   addDuurReservatieToEndTime(mealData, data);
 

package/simulateTableAssignment.js

@@ -8,7 +8,6 @@ const {
     getAllTables,
     isTemporaryTableValid,
 } = require('./tableHelpers');
-const { getNextDateStr, getPrevDateStr } = require('./dateHelpers');
 
 
 /**
@@ -84,7 +83,8 @@ function getActualTableAssignment(reservation) {
  * Converts a reservation's start time and duration into discrete time slots (in minutes from midnight).
  */
 function computeRequiredSlots(timeString, durationMinutes, intervalMinutes) {
-    const timePattern = /^([01]\d|2[0-3]):([0-5]\d)$/;
+    // Support cross-midnight times (e.g., "24:00", "25:00") for bowling venues
+    const timePattern = /^([0-2]\d):([0-5]\d)$/;
     if (!timeString || !timePattern.test(timeString)) {
         console.error(`Invalid time format for computeRequiredSlots: ${timeString}. Expected 'HH:MM'.`);
         return [];
@@ -524,59 +524,6 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
             }
         }
 
-        // Cross-date: include previous-day reservations that spill past midnight
-        const prevDateStr = getPrevDateStr(date);
-        const prevDayReservations = reservations
-            .filter(r => r.date === prevDateStr && r.time && r.guests > 0);
-
-        for (const r of prevDayReservations) {
-            const rDuration = safeParseInt(r.duration, defaultDuurReservatie);
-            const startMinutes = r.time.split(':').map(Number);
-            const startMin = startMinutes[0] * 60 + startMinutes[1];
-            if (startMin + rDuration > 1440) {
-                const actualTables = getActualTableAssignment(r);
-                let assignedTables = actualTables.length > 0 ? actualTables :
-                    assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, r.zitplaats || null, rDuration);
-                if (assignedTables.length > 0) {
-                    const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
-                    if (rSlots && rSlots.length > 0) {
-                        assignedTables.forEach(tableNumber => {
-                            if (!tableOccupiedSlots[tableNumber]) {
-                                tableOccupiedSlots[tableNumber] = new Set();
-                            }
-                            rSlots.forEach(slot => tableOccupiedSlots[tableNumber].add(slot));
-                        });
-                    }
-                }
-            }
-        }
-
-        // Cross-date: if new reservation crosses midnight, include next-day reservations offset by +1440
-        const crossesMidnight = requiredSlots.some(s => s >= 1440);
-        if (crossesMidnight) {
-            const nextDateStr = getNextDateStr(date);
-            const nextDayReservations = reservations
-                .filter(r => r.date === nextDateStr && r.time && r.guests > 0);
-
-            for (const r of nextDayReservations) {
-                const rDuration = safeParseInt(r.duration, defaultDuurReservatie);
-                const actualTables = getActualTableAssignment(r);
-                let assignedTables = actualTables.length > 0 ? actualTables :
-                    assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, r.zitplaats || null, rDuration);
-                if (assignedTables.length > 0) {
-                    const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
-                    if (rSlots && rSlots.length > 0) {
-                        assignedTables.forEach(tableNumber => {
-                            if (!tableOccupiedSlots[tableNumber]) {
-                                tableOccupiedSlots[tableNumber] = new Set();
-                            }
-                            rSlots.forEach(slot => tableOccupiedSlots[tableNumber].add(slot + 1440));
-                        });
-                    }
-                }
-            }
-        }
-
         console.log(`[isTimeAvailableSync] Occupancy map built, checking availability for new reservation`);
 
         const allTables = getAllTables(restaurantData, selectedZitplaats); // Get all tables
@@ -747,59 +694,6 @@ function getAvailableTablesForTime(restaurantData, date, time, guests, reservati
                 });
             }
         }
-        // Cross-date: include previous-day reservations that spill past midnight
-        const prevDateStr = getPrevDateStr(date);
-        const prevDayReservationsGAT = reservations
-            .filter(r => r.date === prevDateStr && r.time && r.guests > 0);
-
-        for (const r of prevDayReservationsGAT) {
-            const rDuration = safeParseInt(r.duration, duurReservatie);
-            const startMinutes = r.time.split(':').map(Number);
-            const startMin = startMinutes[0] * 60 + startMinutes[1];
-            if (startMin + rDuration > 1440) {
-                const actualTables = getActualTableAssignment(r);
-                let assignedTables = actualTables.length > 0 ? actualTables :
-                    assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, r.zitplaats || null, rDuration);
-                if (assignedTables.length > 0) {
-                    const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
-                    if (rSlots && rSlots.length > 0) {
-                        assignedTables.forEach(tableNumber => {
-                            if (!tableOccupiedSlots[tableNumber]) {
-                                tableOccupiedSlots[tableNumber] = new Set();
-                            }
-                            rSlots.forEach(slot => tableOccupiedSlots[tableNumber].add(slot));
-                        });
-                    }
-                }
-            }
-        }
-
-        // Cross-date: if new reservation crosses midnight, include next-day reservations offset by +1440
-        const crossesMidnightGAT = requiredSlots.some(s => s >= 1440);
-        if (crossesMidnightGAT) {
-            const nextDateStr = getNextDateStr(date);
-            const nextDayReservationsGAT = reservations
-                .filter(r => r.date === nextDateStr && r.time && r.guests > 0);
-
-            for (const r of nextDayReservationsGAT) {
-                const rDuration = safeParseInt(r.duration, duurReservatie);
-                const actualTables = getActualTableAssignment(r);
-                let assignedTables = actualTables.length > 0 ? actualTables :
-                    assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, r.zitplaats || null, rDuration);
-                if (assignedTables.length > 0) {
-                    const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
-                    if (rSlots && rSlots.length > 0) {
-                        assignedTables.forEach(tableNumber => {
-                            if (!tableOccupiedSlots[tableNumber]) {
-                                tableOccupiedSlots[tableNumber] = new Set();
-                            }
-                            rSlots.forEach(slot => tableOccupiedSlots[tableNumber].add(slot + 1440));
-                        });
-                    }
-                }
-            }
-        }
-
         console.log("[getAvailableTablesForTime] Occupancy map built");
         const allTables = getAllTables(restaurantData, selectedZitplaats); // Get all tables with zitplaats filter applied
         const availableIndividualTables = [];

package/tableHelpers.js

@@ -12,7 +12,7 @@ function parseTime(timeStr) {
     if (parts.length !== 2) return NaN;
     const hours = parseInt(parts[0], 10);
     const minutes = parseInt(parts[1], 10);
-    if (isNaN(hours) || isNaN(minutes) || hours < 0 || hours > 23 || minutes < 0 || minutes > 59) {
+    if (isNaN(hours) || isNaN(minutes) || hours < 0 || minutes < 0 || minutes > 59) {
         return NaN;
     }
     return hours * 60 + minutes;
@@ -43,7 +43,10 @@ function getMealTypeByTime(timeStr) {
             return mealType;
         }
     }
-    return null; // Return null if no matching shift is found
+    // Times at or past dinner end are considered dinner (cross-midnight support for bowling)
+    const dinnerEnd = parseTime(shifts.dinner.end);
+    if (!isNaN(dinnerEnd) && time >= dinnerEnd) return 'dinner';
+    return null;
 }
 
 

package/test-detailed-filter.js

@@ -1,100 +1,100 @@
-// Detailed filter test - simulating getAvailableTimeblocks logic
-const { timeblocksAvailable } = require('./processing/timeblocksAvailable');
-const { getMealTypeByTime, parseTime } = require('./tableHelpers');
-
-const restaurantData = {
-  "_id": "demo",
-  "openinghours-lunch": {
-    "schemeSettings": {
-      "Monday": {
-        "enabled": true,
-        "startTime": "14:15",
-        "endTime": "15:00",
-        "maxCapacityEnabled": true,
-        "maxCapacity": "10"
-      }
-    }
-  },
-  "general-settings": {
-    "zitplaatsen": 13,
-    "uurOpVoorhand": 0,
-    "dagenInToekomst": 365,
-    "intervalReservatie": 30,
-    "duurReservatie": 60,
-    "ontbijtStop": "",
-    "lunchStop": "",
-    "dinerStop": ""
-  },
-  "max-arrivals-lunch": {
-    "14:15": 10,
-    "14:30": 10,
-    "14:45": 10
-  }
-};
-
-const testDate = "2025-12-08";
-const guests = 2;
-const reservations = [];
-const uurOpVoorhand = 0;
-const isAdmin = false;
-
-console.log('=== DETAILED FILTER TEST ===\n');
-
-// Get timeblocks
-const availableTimeblocks = timeblocksAvailable(restaurantData, testDate, reservations, guests, [], null, isAdmin);
-console.log('Initial timeblocks:', Object.keys(availableTimeblocks));
-
-// Simulate the time filtering logic
-const now = new Date();
-const [year, month, day] = testDate.split('-').map(Number);
-const targetDateInTimeZone = new Date(year, month - 1, day);
-const isToday = now.toDateString() === targetDateInTimeZone.toDateString();
-
-console.log('\nTime filter check:');
-console.log('Is today:', isToday);
-console.log('uurOpVoorhand:', uurOpVoorhand);
-console.log('Current time:', now.toString());
-
-if (isToday && uurOpVoorhand >= 0) {
-  const cutoffTime = new Date(now.getTime());
-  cutoffTime.setHours(cutoffTime.getHours() + uurOpVoorhand);
-  console.log('Cutoff time:', cutoffTime.toString());
-
-  for (const key of Object.keys(availableTimeblocks)) {
-    const timeStr = key;
-    const [hours, minutes] = timeStr.split(':').map(Number);
-    const timeBlockDateTime = new Date(year, month - 1, day, hours, minutes);
-
-    console.log(`\n  Checking ${timeStr}:`);
-    console.log(`    timeBlockDateTime: ${timeBlockDateTime.toString()}`);
-    console.log(`    cutoffTime: ${cutoffTime.toString()}`);
-    console.log(`    timeBlockDateTime < cutoffTime: ${timeBlockDateTime < cutoffTime}`);
-    console.log(`    Would be deleted: ${timeBlockDateTime < cutoffTime ? 'YES' : 'NO'}`);
-  }
-}
-
-// Check lunchStop filter
-console.log('\n\nLunch Stop filter check:');
-const settings = restaurantData['general-settings'];
-const lunchStop = settings.lunchStop || null;
-console.log('lunchStop value:', JSON.stringify(lunchStop));
-console.log('lunchStop truthy:', !!lunchStop);
-
-if (lunchStop) {
-  console.log('LunchStop is set, would apply filter');
-  for (const time in availableTimeblocks) {
-    const mealType = getMealTypeByTime(time);
-    console.log(`  ${time}: mealType=${mealType}`);
-
-    if (mealType === 'lunch') {
-      const timeMinutes = parseTime(time);
-      const stopMinutes = parseTime(lunchStop);
-      console.log(`    timeMinutes=${timeMinutes}, stopMinutes=${stopMinutes}`);
-      console.log(`    Would remove: ${timeMinutes >= stopMinutes ? 'YES' : 'NO'}`);
-    }
-  }
-} else {
-  console.log('LunchStop is NOT set, no filter applied');
-}
-
-console.log('\n=== END TEST ===');
+// Detailed filter test - simulating getAvailableTimeblocks logic
+const { timeblocksAvailable } = require('./processing/timeblocksAvailable');
+const { getMealTypeByTime, parseTime } = require('./tableHelpers');
+
+const restaurantData = {
+  "_id": "demo",
+  "openinghours-lunch": {
+    "schemeSettings": {
+      "Monday": {
+        "enabled": true,
+        "startTime": "14:15",
+        "endTime": "15:00",
+        "maxCapacityEnabled": true,
+        "maxCapacity": "10"
+      }
+    }
+  },
+  "general-settings": {
+    "zitplaatsen": 13,
+    "uurOpVoorhand": 0,
+    "dagenInToekomst": 365,
+    "intervalReservatie": 30,
+    "duurReservatie": 60,
+    "ontbijtStop": "",
+    "lunchStop": "",
+    "dinerStop": ""
+  },
+  "max-arrivals-lunch": {
+    "14:15": 10,
+    "14:30": 10,
+    "14:45": 10
+  }
+};
+
+const testDate = "2025-12-08";
+const guests = 2;
+const reservations = [];
+const uurOpVoorhand = 0;
+const isAdmin = false;
+
+console.log('=== DETAILED FILTER TEST ===\n');
+
+// Get timeblocks
+const availableTimeblocks = timeblocksAvailable(restaurantData, testDate, reservations, guests, [], null, isAdmin);
+console.log('Initial timeblocks:', Object.keys(availableTimeblocks));
+
+// Simulate the time filtering logic
+const now = new Date();
+const [year, month, day] = testDate.split('-').map(Number);
+const targetDateInTimeZone = new Date(year, month - 1, day);
+const isToday = now.toDateString() === targetDateInTimeZone.toDateString();
+
+console.log('\nTime filter check:');
+console.log('Is today:', isToday);
+console.log('uurOpVoorhand:', uurOpVoorhand);
+console.log('Current time:', now.toString());
+
+if (isToday && uurOpVoorhand >= 0) {
+  const cutoffTime = new Date(now.getTime());
+  cutoffTime.setHours(cutoffTime.getHours() + uurOpVoorhand);
+  console.log('Cutoff time:', cutoffTime.toString());
+
+  for (const key of Object.keys(availableTimeblocks)) {
+    const timeStr = key;
+    const [hours, minutes] = timeStr.split(':').map(Number);
+    const timeBlockDateTime = new Date(year, month - 1, day, hours, minutes);
+
+    console.log(`\n  Checking ${timeStr}:`);
+    console.log(`    timeBlockDateTime: ${timeBlockDateTime.toString()}`);
+    console.log(`    cutoffTime: ${cutoffTime.toString()}`);
+    console.log(`    timeBlockDateTime < cutoffTime: ${timeBlockDateTime < cutoffTime}`);
+    console.log(`    Would be deleted: ${timeBlockDateTime < cutoffTime ? 'YES' : 'NO'}`);
+  }
+}
+
+// Check lunchStop filter
+console.log('\n\nLunch Stop filter check:');
+const settings = restaurantData['general-settings'];
+const lunchStop = settings.lunchStop || null;
+console.log('lunchStop value:', JSON.stringify(lunchStop));
+console.log('lunchStop truthy:', !!lunchStop);
+
+if (lunchStop) {
+  console.log('LunchStop is set, would apply filter');
+  for (const time in availableTimeblocks) {
+    const mealType = getMealTypeByTime(time);
+    console.log(`  ${time}: mealType=${mealType}`);
+
+    if (mealType === 'lunch') {
+      const timeMinutes = parseTime(time);
+      const stopMinutes = parseTime(lunchStop);
+      console.log(`    timeMinutes=${timeMinutes}, stopMinutes=${stopMinutes}`);
+      console.log(`    Would remove: ${timeMinutes >= stopMinutes ? 'YES' : 'NO'}`);
+    }
+  }
+} else {
+  console.log('LunchStop is NOT set, no filter applied');
+}
+
+console.log('\n=== END TEST ===');