@happychef/algorithm 1.4.0 → 1.4.1

package/__tests__/tableHelpers.test.js

@@ -1,247 +1,247 @@
-const {
-  parseTime,
-  getMealTypeByTime,
-  getAllTables,
-  isTemporaryTableValid,
-  shifts
-} = require('../tableHelpers');
-
-describe('tableHelpers - parseTime', () => {
-  test('should parse valid time string correctly', () => {
-    expect(parseTime('12:30')).toBe(750); // 12*60 + 30 = 750
-    expect(parseTime('00:00')).toBe(0);
-    expect(parseTime('23:59')).toBe(1439);
-  });
-
-  test('should return NaN for invalid time strings', () => {
-    expect(parseTime('')).toBeNaN();
-    expect(parseTime(null)).toBeNaN();
-    expect(parseTime(undefined)).toBeNaN();
-    expect(parseTime('25:00')).toBeNaN(); // Invalid hour
-    expect(parseTime('12:60')).toBeNaN(); // Invalid minute
-    expect(parseTime('12')).toBeNaN(); // Missing colon
-    expect(parseTime('ab:cd')).toBeNaN(); // Not numbers
-  });
-
-  test('should handle edge cases', () => {
-    expect(parseTime('0:0')).toBe(0);
-    expect(parseTime('1:1')).toBe(61);
-  });
-});
-
-describe('tableHelpers - getMealTypeByTime', () => {
-  test('should identify breakfast times correctly', () => {
-    expect(getMealTypeByTime('07:00')).toBe('breakfast');
-    expect(getMealTypeByTime('09:30')).toBe('breakfast');
-    expect(getMealTypeByTime('10:59')).toBe('breakfast');
-  });
-
-  test('should identify lunch times correctly', () => {
-    expect(getMealTypeByTime('11:00')).toBe('lunch');
-    expect(getMealTypeByTime('12:30')).toBe('lunch');
-    expect(getMealTypeByTime('15:59')).toBe('lunch');
-  });
-
-  test('should identify dinner times correctly', () => {
-    expect(getMealTypeByTime('16:00')).toBe('dinner');
-    expect(getMealTypeByTime('18:30')).toBe('dinner');
-    expect(getMealTypeByTime('22:59')).toBe('dinner');
-  });
-
-  test('should return null for times outside defined shifts', () => {
-    expect(getMealTypeByTime('06:59')).toBeNull();
-    expect(getMealTypeByTime('23:00')).toBeNull();
-    expect(getMealTypeByTime('02:00')).toBeNull();
-  });
-
-  test('should return null for invalid time strings', () => {
-    expect(getMealTypeByTime('invalid')).toBeNull();
-    expect(getMealTypeByTime('')).toBeNull();
-    expect(getMealTypeByTime(null)).toBeNull();
-  });
-});
-
-describe('tableHelpers - getAllTables', () => {
-  test('should extract tables correctly from restaurant data', () => {
-    const restaurantData = {
-      floors: [
-        {
-          tables: [
-            {
-              objectType: 'Tafel',
-              id: 'table1',
-              tableNumber: 1,
-              minCapacity: 2,
-              maxCapacity: 4,
-              priority: 1,
-              x: 10,
-              y: 20,
-              isTemporary: false
-            },
-            {
-              objectType: 'Tafel',
-              id: 'table2',
-              tableNumber: { $numberInt: '2' },
-              minCapacity: { $numberInt: '4' },
-              maxCapacity: { $numberInt: '6' },
-              priority: { $numberInt: '2' },
-              x: { $numberInt: '30' },
-              y: { $numberInt: '40' },
-              isTemporary: false
-            }
-          ]
-        }
-      ]
-    };
-
-    const tables = getAllTables(restaurantData);
-    expect(tables).toHaveLength(2);
-    expect(tables[0].tableNumber).toBe(1);
-    expect(tables[0].maxCapacity).toBe(4);
-    expect(tables[1].tableNumber).toBe(2);
-    expect(tables[1].maxCapacity).toBe(6);
-  });
-
-  test('should sort tables by maxCapacity, priority, and minCapacity', () => {
-    const restaurantData = {
-      floors: [
-        {
-          tables: [
-            {
-              objectType: 'Tafel',
-              id: 'table1',
-              tableNumber: 1,
-              minCapacity: 2,
-              maxCapacity: 6,
-              priority: 1,
-              x: 10,
-              y: 20
-            },
-            {
-              objectType: 'Tafel',
-              id: 'table2',
-              tableNumber: 2,
-              minCapacity: 2,
-              maxCapacity: 4,
-              priority: 1,
-              x: 30,
-              y: 40
-            }
-          ]
-        }
-      ]
-    };
-
-    const tables = getAllTables(restaurantData);
-    expect(tables[0].tableNumber).toBe(2); // Smaller maxCapacity comes first
-    expect(tables[1].tableNumber).toBe(1);
-  });
-
-  test('should handle empty or missing data gracefully', () => {
-    expect(getAllTables({})).toEqual([]);
-    expect(getAllTables({ floors: [] })).toEqual([]);
-    expect(getAllTables(null)).toEqual([]);
-  });
-
-  test('should filter out non-Tafel objects', () => {
-    const restaurantData = {
-      floors: [
-        {
-          tables: [
-            {
-              objectType: 'Wall',
-              id: 'wall1',
-              tableNumber: 1
-            },
-            {
-              objectType: 'Tafel',
-              id: 'table1',
-              tableNumber: 2,
-              minCapacity: 2,
-              maxCapacity: 4,
-              priority: 1,
-              x: 10,
-              y: 20
-            }
-          ]
-        }
-      ]
-    };
-
-    const tables = getAllTables(restaurantData);
-    expect(tables).toHaveLength(1);
-    expect(tables[0].tableNumber).toBe(2);
-  });
-});
-
-describe('tableHelpers - isTemporaryTableValid', () => {
-  test('should return true for non-temporary tables', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: false
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
-  });
-
-  test('should validate temporary table within date range and correct meal type', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
-  });
-
-  test('should reject temporary table outside date range', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-07-01', '12:00')).toBe(false);
-    expect(isTemporaryTableValid(table, '2025-05-31', '12:00')).toBe(false);
-  });
-
-  test('should reject temporary table with wrong meal type', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'dinner'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false); // lunch time
-  });
-
-  test('should reject temporary table with missing date range', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false);
-  });
-
-  test('should reject temporary table with invalid time', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', 'invalid')).toBe(false);
-  });
-});
-
-describe('tableHelpers - shifts constant', () => {
-  test('should have correct shift definitions', () => {
-    expect(shifts.breakfast).toEqual({ start: '07:00', end: '11:00' });
-    expect(shifts.lunch).toEqual({ start: '11:00', end: '16:00' });
-    expect(shifts.dinner).toEqual({ start: '16:00', end: '23:00' });
-  });
-});
+const {
+  parseTime,
+  getMealTypeByTime,
+  getAllTables,
+  isTemporaryTableValid,
+  shifts
+} = require('../tableHelpers');
+
+describe('tableHelpers - parseTime', () => {
+  test('should parse valid time string correctly', () => {
+    expect(parseTime('12:30')).toBe(750); // 12*60 + 30 = 750
+    expect(parseTime('00:00')).toBe(0);
+    expect(parseTime('23:59')).toBe(1439);
+  });
+
+  test('should return NaN for invalid time strings', () => {
+    expect(parseTime('')).toBeNaN();
+    expect(parseTime(null)).toBeNaN();
+    expect(parseTime(undefined)).toBeNaN();
+    expect(parseTime('25:00')).toBeNaN(); // Invalid hour
+    expect(parseTime('12:60')).toBeNaN(); // Invalid minute
+    expect(parseTime('12')).toBeNaN(); // Missing colon
+    expect(parseTime('ab:cd')).toBeNaN(); // Not numbers
+  });
+
+  test('should handle edge cases', () => {
+    expect(parseTime('0:0')).toBe(0);
+    expect(parseTime('1:1')).toBe(61);
+  });
+});
+
+describe('tableHelpers - getMealTypeByTime', () => {
+  test('should identify breakfast times correctly', () => {
+    expect(getMealTypeByTime('07:00')).toBe('breakfast');
+    expect(getMealTypeByTime('09:30')).toBe('breakfast');
+    expect(getMealTypeByTime('10:59')).toBe('breakfast');
+  });
+
+  test('should identify lunch times correctly', () => {
+    expect(getMealTypeByTime('11:00')).toBe('lunch');
+    expect(getMealTypeByTime('12:30')).toBe('lunch');
+    expect(getMealTypeByTime('15:59')).toBe('lunch');
+  });
+
+  test('should identify dinner times correctly', () => {
+    expect(getMealTypeByTime('16:00')).toBe('dinner');
+    expect(getMealTypeByTime('18:30')).toBe('dinner');
+    expect(getMealTypeByTime('22:59')).toBe('dinner');
+  });
+
+  test('should return null for times outside defined shifts', () => {
+    expect(getMealTypeByTime('06:59')).toBeNull();
+    expect(getMealTypeByTime('23:00')).toBeNull();
+    expect(getMealTypeByTime('02:00')).toBeNull();
+  });
+
+  test('should return null for invalid time strings', () => {
+    expect(getMealTypeByTime('invalid')).toBeNull();
+    expect(getMealTypeByTime('')).toBeNull();
+    expect(getMealTypeByTime(null)).toBeNull();
+  });
+});
+
+describe('tableHelpers - getAllTables', () => {
+  test('should extract tables correctly from restaurant data', () => {
+    const restaurantData = {
+      floors: [
+        {
+          tables: [
+            {
+              objectType: 'Tafel',
+              id: 'table1',
+              tableNumber: 1,
+              minCapacity: 2,
+              maxCapacity: 4,
+              priority: 1,
+              x: 10,
+              y: 20,
+              isTemporary: false
+            },
+            {
+              objectType: 'Tafel',
+              id: 'table2',
+              tableNumber: { $numberInt: '2' },
+              minCapacity: { $numberInt: '4' },
+              maxCapacity: { $numberInt: '6' },
+              priority: { $numberInt: '2' },
+              x: { $numberInt: '30' },
+              y: { $numberInt: '40' },
+              isTemporary: false
+            }
+          ]
+        }
+      ]
+    };
+
+    const tables = getAllTables(restaurantData);
+    expect(tables).toHaveLength(2);
+    expect(tables[0].tableNumber).toBe(1);
+    expect(tables[0].maxCapacity).toBe(4);
+    expect(tables[1].tableNumber).toBe(2);
+    expect(tables[1].maxCapacity).toBe(6);
+  });
+
+  test('should sort tables by maxCapacity, priority, and minCapacity', () => {
+    const restaurantData = {
+      floors: [
+        {
+          tables: [
+            {
+              objectType: 'Tafel',
+              id: 'table1',
+              tableNumber: 1,
+              minCapacity: 2,
+              maxCapacity: 6,
+              priority: 1,
+              x: 10,
+              y: 20
+            },
+            {
+              objectType: 'Tafel',
+              id: 'table2',
+              tableNumber: 2,
+              minCapacity: 2,
+              maxCapacity: 4,
+              priority: 1,
+              x: 30,
+              y: 40
+            }
+          ]
+        }
+      ]
+    };
+
+    const tables = getAllTables(restaurantData);
+    expect(tables[0].tableNumber).toBe(2); // Smaller maxCapacity comes first
+    expect(tables[1].tableNumber).toBe(1);
+  });
+
+  test('should handle empty or missing data gracefully', () => {
+    expect(getAllTables({})).toEqual([]);
+    expect(getAllTables({ floors: [] })).toEqual([]);
+    expect(getAllTables(null)).toEqual([]);
+  });
+
+  test('should filter out non-Tafel objects', () => {
+    const restaurantData = {
+      floors: [
+        {
+          tables: [
+            {
+              objectType: 'Wall',
+              id: 'wall1',
+              tableNumber: 1
+            },
+            {
+              objectType: 'Tafel',
+              id: 'table1',
+              tableNumber: 2,
+              minCapacity: 2,
+              maxCapacity: 4,
+              priority: 1,
+              x: 10,
+              y: 20
+            }
+          ]
+        }
+      ]
+    };
+
+    const tables = getAllTables(restaurantData);
+    expect(tables).toHaveLength(1);
+    expect(tables[0].tableNumber).toBe(2);
+  });
+});
+
+describe('tableHelpers - isTemporaryTableValid', () => {
+  test('should return true for non-temporary tables', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: false
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
+  });
+
+  test('should validate temporary table within date range and correct meal type', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
+  });
+
+  test('should reject temporary table outside date range', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-07-01', '12:00')).toBe(false);
+    expect(isTemporaryTableValid(table, '2025-05-31', '12:00')).toBe(false);
+  });
+
+  test('should reject temporary table with wrong meal type', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'dinner'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false); // lunch time
+  });
+
+  test('should reject temporary table with missing date range', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false);
+  });
+
+  test('should reject temporary table with invalid time', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', 'invalid')).toBe(false);
+  });
+});
+
+describe('tableHelpers - shifts constant', () => {
+  test('should have correct shift definitions', () => {
+    expect(shifts.breakfast).toEqual({ start: '07:00', end: '11:00' });
+    expect(shifts.lunch).toEqual({ start: '11:00', end: '16:00' });
+    expect(shifts.dinner).toEqual({ start: '16:00', end: '23:00' });
+  });
+});

package/assignTables.js

@@ -1,5 +1,4 @@
 const { tryGroupTables } = require("./grouping");
-const { getNextDateStr, getPrevDateStr } = require("./dateHelpers");
 
 /**
  * server side
@@ -357,67 +356,6 @@ async function assignTablesIfPossible({
       }
     }
 
-    // 9b) Cross-date table conflicts: include previous-day reservations that spill past midnight
-    const prevDateStr = getPrevDateStr(date);
-    const prevDayReservations = await db.collection('reservations').find({
-      restaurantId: restaurantId,
-      date: prevDateStr
-    }).toArray();
-
-    for (let r of prevDayReservations) {
-      let rDuration = duurReservatie;
-      if (r.duration) {
-        const rawDur = r.duration.$numberInt ?? r.duration;
-        const parsed = parseInt(rawDur, 10);
-        if (!isNaN(parsed) && parsed > 0) {
-          rDuration = parsed;
-        }
-      }
-      const startMinutes = parseTime(r.time);
-      if (!isNaN(startMinutes) && startMinutes + rDuration > 1440 && r.tables) {
-        // This previous-day reservation crosses midnight into current day
-        const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
-        for (let tn of r.tables) {
-          if (!tableOccupiedSlots[tn]) {
-            tableOccupiedSlots[tn] = new Set();
-          }
-          // Slots >1440 naturally overlap with current day's late-night slots on the same table
-          rSlots.forEach(slot => tableOccupiedSlots[tn].add(slot));
-        }
-      }
-    }
-
-    // 9c) 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 = await db.collection('reservations').find({
-        restaurantId: restaurantId,
-        date: nextDateStr
-      }).toArray();
-
-      for (let r of nextDayReservations) {
-        let rDuration = duurReservatie;
-        if (r.duration) {
-          const rawDur = r.duration.$numberInt ?? r.duration;
-          const parsed = parseInt(rawDur, 10);
-          if (!isNaN(parsed) && parsed > 0) {
-            rDuration = parsed;
-          }
-        }
-        const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
-        if (r.tables) {
-          for (let tn of r.tables) {
-            if (!tableOccupiedSlots[tn]) {
-              tableOccupiedSlots[tn] = new Set();
-            }
-            // Offset next-day slots by +1440 so they align with our cross-midnight slots
-            rSlots.forEach(slot => tableOccupiedSlots[tn].add(slot + 1440));
-          }
-        }
-      }
-    }
-
     // 10) Helper function to try table assignment from a given set of tables
     function tryAssignTables(tables, label) {
       // Sort tables

package/bundle_entry.js

@@ -0,0 +1,100 @@
+// bundle_entry.js - Entry point for esbuild bundling
+// Exposes all @happychef/algorithm functions on globalThis.HappyAlgorithm
+// for use with flutter_js (QuickJS / JavaScriptCore)
+
+const algorithm = require('./index.js');
+
+// Intl.DateTimeFormat polyfill for QuickJS (which lacks Intl support)
+if (typeof globalThis.Intl === 'undefined' || typeof globalThis.Intl.DateTimeFormat === 'undefined') {
+  // EU DST rules for Europe/Brussels
+  function getBrusselsOffsetHours(date) {
+    const year = date.getUTCFullYear();
+    const marchLast = new Date(Date.UTC(year, 2, 31));
+    const marchSunday = 31 - marchLast.getUTCDay();
+    const dstStart = Date.UTC(year, 2, marchSunday, 1, 0, 0);
+    const octLast = new Date(Date.UTC(year, 9, 31));
+    const octSunday = 31 - octLast.getUTCDay();
+    const dstEnd = Date.UTC(year, 9, octSunday, 1, 0, 0);
+    const ts = date.getTime();
+    return (ts >= dstStart && ts < dstEnd) ? 2 : 1;
+  }
+
+  if (!globalThis.Intl) globalThis.Intl = {};
+
+  globalThis.Intl.DateTimeFormat = function IntlDateTimeFormat(locale, options) {
+    this._options = options || {};
+    this.formatToParts = function(date) {
+      const d = date || new Date();
+      const tz = (this._options.timeZone || '').replace(/\//g, '/');
+      // Only support Europe/Brussels
+      const offset = getBrusselsOffsetHours(d);
+      const brusselsDate = new Date(d.getTime() + offset * 60 * 60 * 1000);
+      const parts = [];
+      if (this._options.hour) {
+        parts.push({ type: 'hour', value: String(brusselsDate.getUTCHours()).padStart(2, '0') });
+      }
+      if (this._options.minute) {
+        parts.push({ type: 'literal', value: ':' });
+        parts.push({ type: 'minute', value: String(brusselsDate.getUTCMinutes()).padStart(2, '0') });
+      }
+      return parts;
+    };
+    this.format = function(date) {
+      return this.formatToParts(date).map(function(p) { return p.value; }).join('');
+    };
+  };
+}
+
+// Expose all algorithm functions globally
+globalThis.HappyAlgorithm = {
+  // Core availability functions
+  getAvailableTimeblocks: algorithm.getAvailableTimeblocks,
+  isDateAvailable: algorithm.isDateAvailable,
+  isDateAvailableWithTableCheck: algorithm.isDateAvailableWithTableCheck,
+  isTimeAvailable: algorithm.isTimeAvailable,
+
+  // Table assignment functions
+  isTimeAvailableSync: algorithm.isTimeAvailableSync,
+  filterTimeblocksByTableAvailability: algorithm.filterTimeblocksByTableAvailability,
+  getAvailableTimeblocksWithTableCheck: algorithm.getAvailableTimeblocksWithTableCheck,
+  getAvailableTablesForTime: algorithm.getAvailableTablesForTime,
+
+  // Processing functions
+  timeblocksAvailable: algorithm.timeblocksAvailable,
+  getDailyGuestCounts: algorithm.getDailyGuestCounts,
+
+  // Filter functions
+  filterTimeblocksByStopTimes: algorithm.filterTimeblocksByStopTimes,
+  filterTimeblocksByMaxArrivals: algorithm.filterTimeblocksByMaxArrivals,
+  filterTimeblocksByMaxGroups: algorithm.filterTimeblocksByMaxGroups,
+
+  // Table helpers
+  parseTime: algorithm.parseTime,
+  getMealTypeByTime: algorithm.getMealTypeByTime,
+  getAllTables: algorithm.getAllTables,
+  getFloorIdForSeatPlace: algorithm.getFloorIdForSeatPlace,
+  isTemporaryTableValid: algorithm.isTemporaryTableValid,
+
+  // Grouping
+  tryGroupTables: algorithm.tryGroupTables,
+
+  // Batch functions for calendar performance (avoid 30 separate JSON serializations)
+  batchIsDateAvailable: function(data, dates, reservations, guests, blockedSlots, giftcard, isAdmin, duration) {
+    var result = {};
+    for (var i = 0; i < dates.length; i++) {
+      result[dates[i]] = algorithm.isDateAvailable(data, dates[i], reservations, guests, blockedSlots, giftcard, isAdmin, duration);
+    }
+    return result;
+  },
+
+  batchIsDateAvailableWithTableCheck: function(data, dates, reservations, guests, blockedSlots, selectedGiftcard, isAdmin, duration, selectedZitplaats) {
+    var result = {};
+    for (var i = 0; i < dates.length; i++) {
+      result[dates[i]] = algorithm.isDateAvailableWithTableCheck(data, dates[i], reservations, guests, blockedSlots, selectedGiftcard, isAdmin, duration, selectedZitplaats);
+    }
+    return result;
+  },
+
+  // Version info
+  VERSION: '1.2.29'
+};