@happychef/algorithm 1.2.5 → 1.2.6

package/filters/maxArrivalsFilter.js

@@ -49,16 +49,16 @@ function getMealType(time) {
   }
   
   /**
-   * Count number of groups/reservations arriving at exact time
+   * Count guests arriving at exact time
    * @param {Array} reservations - Reservation list
    * @param {string} date - Date (YYYY-MM-DD)
    * @param {string} time - Time (HH:MM)
-   * @returns {number} - Number of groups/arrivals (count of reservations)
+   * @returns {number} - Guest count
    */
   function countArrivalsAtTime(reservations, date, time) {
 	return reservations
 	  .filter(r => r.date === date && r.time === time)
-	  .length; // Count number of reservations, not total guests
+	  .reduce((sum, r) => sum + (parseInt(r.guests, 10) || 0), 0);
   }
   
   /**
@@ -92,18 +92,17 @@ function getMealType(time) {
 	  
 	  // Get max arrivals value for this specific time
 	  const maxArrivals = extractNumber(maxArrivalsConfig[time]);
-	  if (maxArrivals === null || maxArrivals <= 0) {
-		// Keep the timeblock if no specific max arrivals for this time, or if set to 0 (unlimited)
+	  if (maxArrivals === null) {
+		// Keep the timeblock if no specific max arrivals for this time
 		filteredBlocks[time] = timeData;
 		continue;
 	  }
-
+	  
 	  // Count current arrivals at this exact time
 	  const currentArrivals = countArrivalsAtTime(reservations, date, time);
-
+	  
 	  // Only include timeblock if adding these guests doesn't exceed max arrivals
-	  // Note: maxArrivals is the number of GROUPS (arrivals), not guests
-	  if (currentArrivals + 1 <= maxArrivals) {
+	  if (currentArrivals + guests <= maxArrivals) {
 		filteredBlocks[time] = timeData;
 	  }
 	}

package/filters/maxGroupsFilter.js

@@ -166,11 +166,10 @@ function getMealType(time) {
 		  // Extract the maximum number of groups allowed for this threshold
 		  const maxAllowedCount = extractNumber(maxGroupSettings[limitSizeStr]);
 		  logDebug(`      Max groups allowed for >=${limitSize} is: ${maxAllowedCount} (raw setting: ${JSON.stringify(maxGroupSettings[limitSizeStr])})`);
-
-		  // If the setting for this limit size is invalid (null, zero, or negative), treat it as 'no limit'
-		  // IMPORTANT: A value of 0 means "unlimited" - don't apply this filter
-		  if (maxAllowedCount === null || maxAllowedCount <= 0) {
-			logDebug(`      Skipping check: Invalid or non-positive max count (${maxAllowedCount}) - treating as unlimited for size ${limitSize}.`);
+  
+		  // If the setting for this limit size is invalid (null or negative), treat it as 'no limit'
+		  if (maxAllowedCount === null || maxAllowedCount < 0) {
+			logDebug(`      Skipping check: Invalid or non-positive max count defined for size ${limitSize}.`);
 			continue; // Skip to the next limitSize
 		  }
   

package/getAvailableTimeblocks.js

@@ -1,27 +1,22 @@
 // getAvailableTimeblocks.js
 
 const { timeblocksAvailable } = require('./processing/timeblocksAvailable');
-const { filterTimeblocksByMaxArrivals } = require('./filters/maxArrivalsFilter');
-const { filterTimeblocksByMaxGroups } = require('./filters/maxGroupsFilter');
+const { parseTime, getMealTypeByTime } = require('./tableHelpers');
 
 /**
  * Parses a time string in "HH:MM" format into a Date object on a specific date.
  * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
  * @param {string} timeStr - Time string in "HH:MM" format.
- * @param {string} timeZone - The IANA time zone identifier.
- * @returns {Date} Date object representing the time on the specified date and time zone.
+ * @param {string} timeZone - The IANA time zone identifier (not used, kept for compatibility).
+ * @returns {Date} Date object representing the time on the specified date.
  */
 function parseDateTimeInTimeZone(dateStr, timeStr, timeZone) {
   const [year, month, day] = dateStr.split('-').map(Number);
   const [hours, minutes] = timeStr.split(':').map(Number);
 
-  // Create a date object in UTC
-  const date = new Date(Date.UTC(year, month - 1, day, hours, minutes));
-  // Convert that UTC date/time to the specified time zone
-  const dateInTimeZone = new Date(
-    date.toLocaleString('en-US', { timeZone: timeZone })
-  );
-  return dateInTimeZone;
+  // Create a simple date object for the given date and time
+  // This represents the local time on that date
+  return new Date(year, month - 1, day, hours, minutes);
 }
 
 /**
@@ -59,23 +54,19 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
   // Time zone for CEST/CET (Europe/Amsterdam)
   const timeZone = 'Europe/Amsterdam';
 
-  // Current date/time in CEST
+  // Current date/time in local timezone (system time)
+  // Note: We assume the server is running in the correct timezone
   const now = new Date();
-  const currentTimeInTimeZone = new Date(
-    now.toLocaleString('en-US', { timeZone: timeZone })
-  );
+  const currentTimeInTimeZone = now;
 
   // Calculate the maximum allowed date
   const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
   maxAllowedDate.setDate(maxAllowedDate.getDate() + dagenInToekomst);
   maxAllowedDate.setHours(23, 59, 59, 999);
 
-  // Parse the target date in the specified time zone
+  // Parse the target date (just the date part, no time)
   const [year, month, day] = dateStr.split('-').map(Number);
-  const targetDate = new Date(Date.UTC(year, month - 1, day));
-  const targetDateInTimeZone = new Date(
-    targetDate.toLocaleString('en-US', { timeZone: timeZone })
-  );
+  const targetDateInTimeZone = new Date(year, month - 1, day);
 
   // Check if targetDateInTimeZone is within dagenInToekomst (skip for admin)
   if (!isAdmin && targetDateInTimeZone > maxAllowedDate) {
@@ -88,7 +79,7 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
     currentTimeInTimeZone.toDateString() === targetDateInTimeZone.toDateString();
 
   // Get available time blocks or shifts
-  let availableTimeblocks = timeblocksAvailable(data, dateStr, reservations, guests, blockedSlots, giftcard, isAdmin);
+  const availableTimeblocks = timeblocksAvailable(data, dateStr, reservations, guests, blockedSlots, giftcard, isAdmin);
 
   // If the date is today and uurOpVoorhand is greater than zero, prune time blocks (skip for admin)
   if (!isAdmin && isToday && uurOpVoorhand >= 0) {
@@ -106,14 +97,44 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
     }
   }
 
-  // Apply max arrivals filter (skip for admin)
+  // Apply last booking time filter (lunchStop, dinerStop, ontbijtStop) - skip for admin
   if (!isAdmin) {
-    availableTimeblocks = filterTimeblocksByMaxArrivals(data, dateStr, availableTimeblocks, reservations, guests);
-  }
-
-  // Apply max groups filter (skip for admin)
-  if (!isAdmin) {
-    availableTimeblocks = filterTimeblocksByMaxGroups(data, dateStr, availableTimeblocks, reservations, guests);
+    const settings = data?.['general-settings'] || {};
+    const breakfastStop = settings.ontbijtStop || null;
+    const lunchStop = settings.lunchStop || null;
+    const dinnerStop = settings.dinerStop || null;
+
+    // Only apply if at least one stop time is configured
+    if (breakfastStop || lunchStop || dinnerStop) {
+      for (const time in availableTimeblocks) {
+        const mealType = getMealTypeByTime(time);
+        const timeMinutes = parseTime(time);
+        let shouldRemove = false;
+
+        // Check if this time is AT OR AFTER the stop time for its meal type
+        // Using ">=" so that lunchStop="14:00" blocks 14:00 and later times
+        if (mealType === 'breakfast' && breakfastStop) {
+          const stopMinutes = parseTime(breakfastStop);
+          if (timeMinutes >= stopMinutes) {
+            shouldRemove = true;
+          }
+        } else if (mealType === 'lunch' && lunchStop) {
+          const stopMinutes = parseTime(lunchStop);
+          if (timeMinutes >= stopMinutes) {
+            shouldRemove = true;
+          }
+        } else if (mealType === 'dinner' && dinnerStop) {
+          const stopMinutes = parseTime(dinnerStop);
+          if (timeMinutes >= stopMinutes) {
+            shouldRemove = true;
+          }
+        }
+
+        if (shouldRemove) {
+          delete availableTimeblocks[time];
+        }
+      }
+    }
   }
 
   return availableTimeblocks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happychef/algorithm",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Restaurant and reservation algorithm utilities",
   "main": "index.js",
   "author": "happy chef",