@happychef/algorithm 1.2.13 → 1.2.15

package/jest.config.js

@@ -1,23 +1,23 @@
-module.exports = {
-  testEnvironment: 'node',
-  coverageDirectory: 'coverage',
-  collectCoverageFrom: [
-    '**/*.js',
-    '!**/node_modules/**',
-    '!**/coverage/**',
-    '!jest.config.js',
-    '!test.js',
-    '!test-*.js',
-    '!**/__tests__/**'
-  ],
-  testMatch: [
-    '**/__tests__/**/*.test.js'
-  ],
-  testPathIgnorePatterns: [
-    '/node_modules/',
-    '/test\\.js$',
-    '/test-.*\\.js$'
-  ],
-  verbose: true,
-  testTimeout: 10000
-};
+module.exports = {
+  testEnvironment: 'node',
+  coverageDirectory: 'coverage',
+  collectCoverageFrom: [
+    '**/*.js',
+    '!**/node_modules/**',
+    '!**/coverage/**',
+    '!jest.config.js',
+    '!test.js',
+    '!test-*.js',
+    '!**/__tests__/**'
+  ],
+  testMatch: [
+    '**/__tests__/**/*.test.js'
+  ],
+  testPathIgnorePatterns: [
+    '/node_modules/',
+    '/test\\.js$',
+    '/test-.*\\.js$'
+  ],
+  verbose: true,
+  testTimeout: 10000
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happychef/algorithm",
-  "version": "1.2.13",
+  "version": "1.2.15",
   "description": "Restaurant and reservation algorithm utilities",
   "main": "index.js",
   "scripts": {

package/processing/timeblocksAvailable.js

@@ -89,8 +89,8 @@ function fitsWithinMeal(data, dateStr, startTimeStr, duurReservatie) {
   return startTime >= mealStartTime && startTime + duurReservatie <= mealEndTime;
 }
 
-function timeblocksAvailable(data, dateStr, reservations, guests, blockedSlots = [], giftcard = null, isAdmin = false) {
-  const duurReservatie = getDuurReservatie(data);
+function timeblocksAvailable(data, dateStr, reservations, guests, blockedSlots = [], giftcard = null, isAdmin = false, duration = null) {
+  const duurReservatie = duration && duration > 0 ? duration : getDuurReservatie(data);
   const intervalReservatie = getInterval(data);
 
   // Slots needed

package/reservation_data/counter.js

@@ -48,7 +48,17 @@ function parseTime(timeStr) {
   
 	  const startTime = parseTime(reservation.time);
 
-	  const endTime = startTime + duurReservatie; // Use 'duurReservatie' from general settings
+	  // 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;
+		}
+	  }
+
+	  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) {

package/simulateTableAssignment.js

@@ -322,7 +322,7 @@ function findMultiTableCombination(tables, guestsTotal, startIndex, currentSet,
     }
 }
 
-function assignTablesForGivenTime(restaurantData, date, time, guests, tableOccupiedSlots, selectedZitplaats = null) {
+function assignTablesForGivenTime(restaurantData, date, time, guests, tableOccupiedSlots, selectedZitplaats = null, duration = null) {
     console.log(`[assignTablesForGivenTime] Processing ${date} ${time} for ${guests} guests`);
 
     // Clear cache if it gets too large (prevent memory leaks)
@@ -341,6 +341,11 @@ function assignTablesForGivenTime(restaurantData, date, time, guests, tableOccup
     duurReservatie = safeParseInt(generalSettings.duurReservatie, 120);
     intervalReservatie = safeParseInt(generalSettings.intervalReservatie, 15);
 
+    // Use passed duration if available, otherwise default
+    if (duration && duration > 0) {
+        duurReservatie = duration;
+    }
+
     console.log(`[assignTablesForGivenTime] Using duration: ${duurReservatie}min, interval: ${intervalReservatie}min`);
 
     if (intervalReservatie <= 0) {
@@ -411,8 +416,8 @@ function assignTablesForGivenTime(restaurantData, date, time, guests, tableOccup
     return best.tables.map(t => t.tableNumber);
 }
 
-function isTimeAvailableSync(restaurantData, date, time, guests, reservations, selectedZitplaats = null) {
-    console.log(`\n[isTimeAvailableSync] Checking ${date} ${time} for ${guests} guests`);
+function isTimeAvailableSync(restaurantData, date, time, guests, reservations, selectedZitplaats = null, duration = null) {
+    console.log(`\n[isTimeAvailableSync] Checking ${date} ${time} for ${guests} guests (duration: ${duration || 'default'})`);
     
     if (guests < 0) {
         console.log(`[isTimeAvailableSync] Detected negative guest count (${guests}), adjusting to default of 2`);
@@ -445,19 +450,22 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
         }
 
         const generalSettings = restaurantData["general-settings"] || {};
-        let duurReservatie = 120;  // Default: 2 hours in minutes
+        let defaultDuurReservatie = 120;  // Default: 2 hours in minutes
         let intervalReservatie = 15;  // Default: 15 minute intervals
-        duurReservatie = safeParseInt(generalSettings.duurReservatie, 120);
+        defaultDuurReservatie = safeParseInt(generalSettings.duurReservatie, 120);
         intervalReservatie = safeParseInt(generalSettings.intervalReservatie, 15);
         
-        console.log(`[isTimeAvailableSync] Using duration: ${duurReservatie}min, interval: ${intervalReservatie}min`);
+        // Use passed duration or default
+        const currentDuurReservatie = duration && duration > 0 ? duration : defaultDuurReservatie;
+
+        console.log(`[isTimeAvailableSync] Using duration: ${currentDuurReservatie}min (default: ${defaultDuurReservatie}), interval: ${intervalReservatie}min`);
 
         if (intervalReservatie <= 0) {
             console.error(`[isTimeAvailableSync] Invalid interval settings for ${date} ${time}`);
             return false;
         }
 
-        const requiredSlots = computeRequiredSlots(time, duurReservatie, intervalReservatie);
+        const requiredSlots = computeRequiredSlots(time, currentDuurReservatie, intervalReservatie);
         if (!requiredSlots || requiredSlots.length === 0) {
             console.error(`[isTimeAvailableSync] Could not compute required slots for ${date} ${time}`);
             return false; // Cannot proceed if slots are invalid
@@ -477,8 +485,15 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
         console.log(`[isTimeAvailableSync] Processing ${reservationsForDate.length} existing reservations on ${date}`);
 
         for (const r of reservationsForDate) {
+            // Calculate duration once per reservation
+            const rDuration = safeParseInt(r.duration, defaultDuurReservatie);
+
+            console.log(`[DEBUG] Reservation ${r.time} (${r.firstName}): Duration=${rDuration}, Tables raw=${JSON.stringify(r.tables)}`);
+
             // NEW: Try to get actual table assignment first
             const actualTables = getActualTableAssignment(r);
+            console.log(`[DEBUG] Reservation ${r.time}: actualTables detected = ${JSON.stringify(actualTables)}`);
+
             let assignedTables = [];
             
             if (actualTables.length > 0) {
@@ -486,14 +501,17 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
                 assignedTables = actualTables;
                 console.log(`[isTimeAvailableSync] Using actual table assignment for reservation: ${assignedTables.join(', ')}`);
             } else {
-                // Fall back to simulation for backwards compatibility
+                // ... simulation log ...
                 console.log(`[isTimeAvailableSync] No actual table data, simulating assignment for reservation`);
-                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots);
+                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, null, rDuration); // Simulation
             }
 
             // Update the occupancy map based on the actual or simulated assignment
             if (assignedTables.length > 0) {
-                const rSlots = computeRequiredSlots(r.time, duurReservatie, intervalReservatie);
+                // Use reservation specific duration if available
+                const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
+                console.log(`[DEBUG] Reservation ${r.time}: Occupying slots=${rSlots.join(',')} on tables=${assignedTables.join(',')}`);
+
                 if (!rSlots || rSlots.length === 0) continue; // Skip if slots invalid
 
                 assignedTables.forEach(tableNumber => {
@@ -502,8 +520,6 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
                     }
                     rSlots.forEach(slot => tableOccupiedSlots[tableNumber].add(slot));
                 });
-                
-                console.log(`[isTimeAvailableSync] Marked tables ${assignedTables.join(', ')} as occupied for time ${r.time}`);
             }
         }
 
@@ -566,7 +582,7 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
     }
 }
 
-function filterTimeblocksByTableAvailability(restaurantData, date, timeblocks, guests, reservations, selectedZitplaats = null) {
+function filterTimeblocksByTableAvailability(restaurantData, date, timeblocks, guests, reservations, selectedZitplaats = null, duration = null) {
     console.log(`[filterTimeblocksByTableAvailability] Filtering timeblocks for ${date} with ${guests} guests`);
     
     if (guests < 0) {
@@ -590,7 +606,7 @@ function filterTimeblocksByTableAvailability(restaurantData, date, timeblocks, g
     let unavailableCount = 0;
 
     for (const time in timeblocks) {
-        if (isTimeAvailableSync(restaurantData, date, time, guests, reservations, selectedZitplaats)) {
+        if (isTimeAvailableSync(restaurantData, date, time, guests, reservations, selectedZitplaats, duration)) {
             filteredTimeblocks[time] = timeblocks[time];
             availableCount++;
         } else {
@@ -606,8 +622,8 @@ function filterTimeblocksByTableAvailability(restaurantData, date, timeblocks, g
     return filteredTimeblocks;
 }
 
-function getAvailableTimeblocksWithTableCheck(restaurantData, date, timeblocks, guests, reservations, selectedZitplaats = null) {
-    return filterTimeblocksByTableAvailability(restaurantData, date, timeblocks, guests, reservations, selectedZitplaats);
+function getAvailableTimeblocksWithTableCheck(restaurantData, date, timeblocks, guests, reservations, selectedZitplaats = null, duration = null) {
+    return filterTimeblocksByTableAvailability(restaurantData, date, timeblocks, guests, reservations, selectedZitplaats, duration);
 }
 
 function getAvailableTablesForTime(restaurantData, date, time, guests, reservations, selectedZitplaats = null) {
@@ -656,17 +672,18 @@ function getAvailableTablesForTime(restaurantData, date, time, guests, reservati
 
         console.log(`[getAvailableTablesForTime] Building occupancy map (Processing ${reservationsForDate.length} existing reservations)`);
         for (const r of reservationsForDate) {
+            const rDuration = safeParseInt(r.duration, duurReservatie);
             const actualTables = getActualTableAssignment(r);
             let assignedTables = [];
             
             if (actualTables.length > 0) {
                 assignedTables = actualTables;
             } else {
-                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, null);
+                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, null, rDuration);
             }
             
             if (assignedTables.length > 0) {
-                const rSlots = computeRequiredSlots(r.time, duurReservatie, intervalReservatie);
+                const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
                  if (!rSlots || rSlots.length === 0) continue;
                 assignedTables.forEach(tableNumber => {
                     if (!tableOccupiedSlots[tableNumber]) {

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 ===');