@happychef/algorithm 1.3.0 → 1.4.0

package/grouping.js

@@ -1,162 +1,162 @@
-// grouping.js
-/**
- * Try to allocate a reservation via pinned groups.
- * Returns { tables: number[], tableIds: string[], viaGroup: string } on success,
- * null if grouping is enabled but no match (and strict=false),
- * and throws if grouping is strict and no group matches.
- *
- * Dependencies (passed in): isTemporaryTableValid, isTableFreeForAllSlots
- */
-function tryGroupTables({
-  restaurantSettings,
-  allTables,
-  guests,
-  date,
-  time,
-  requiredSlots,
-  tableOccupiedSlots,
-  isTemporaryTableValid,
-  isTableFreeForAllSlots,
-}) {
-  const gset = restaurantSettings["grouping-settings"] || {};
-  const groupingEnabled = gset.enable === true;
-  const groupingStrict = gset.strict === true;
-  const maxSubtablesPerGroup = Number.isFinite(gset.maxSubtables)
-    ? gset.maxSubtables
-    : undefined;
-  const orderStrategy = gset.orderStrategy || "smallest-first"; // 'smallest-first' | 'capacity-asc' | 'closest-fit'
-  const seed = gset.seed ?? 0;
-
-  const pinnedGroups = Array.isArray(restaurantSettings.pinnedGroups)
-    ? restaurantSettings.pinnedGroups
-    : [];
-
-  if (!groupingEnabled || pinnedGroups.length === 0) {
-    return null;
-  }
-
-  // Build lookups from allTables
-  const byId = new Map(allTables.map((t) => [String(t.tableId), t]));
-  const byNumber = new Map(
-    allTables
-      .filter((t) => typeof t.tableNumber === "number")
-      .map((t) => [t.tableNumber, t])
-  );
-
-  // Quick check: is there already a single-table fit?
-  const hasSingleFit = allTables.some(
-    (t) =>
-      t.minCapacity <= guests &&
-      guests <= t.maxCapacity &&
-      isTemporaryTableValid(t, date, time) &&
-      isTableFreeForAllSlots(t.tableNumber, requiredSlots, tableOccupiedSlots)
-  );
-  if (hasSingleFit) {
-    // Let caller handle single-table path; grouping is only used when no single table fits
-    return null;
-  }
-
-  // Stable group ordering
-  const stableGroups = [...pinnedGroups].sort((a, b) => {
-    const aid = String(a.id || a.name || "");
-    const bid = String(b.id || b.name || "");
-    return aid.localeCompare(bid);
-  });
-
-  // Deterministic RNG (kept for parity; not used by default)
-  const rnd = (() => {
-    let x = Math.imul(0x9e3779b1, (seed | 0) + 0x7f4a7c15) | 0;
-    return () => (
-      (x = (x ^ (x >>> 15)) * (x | 1)),
-      (x ^= x + Math.imul(x ^ (x >>> 7), x | 61)),
-      ((x ^ (x >>> 14)) >>> 0) / 4294967296
-    );
-  })();
-
-  // Subtable ordering strategy
-  const subSort = (a, b) => {
-    if (orderStrategy === "closest-fit") {
-      const slA = (a.maxCapacity || 0) - (a.minCapacity || 0);
-      const slB = (b.maxCapacity || 0) - (b.minCapacity || 0);
-      if (slA !== slB) return slA - slB;
-    }
-    if (a.maxCapacity !== b.maxCapacity) return a.maxCapacity - b.maxCapacity;
-    if (a.tableNumber !== b.tableNumber) return a.tableNumber - b.tableNumber;
-    const ida = String(a.tableId),
-      idb = String(b.tableId);
-    return ida.localeCompare(idb);
-  };
-
-  // Try each pinned group
-  for (const g of stableGroups) {
-    const rawIds = Array.isArray(g.tableIds) ? g.tableIds.map(String) : [];
-    const rawNums = Array.isArray(g.tableNumbers)
-      ? g.tableNumbers.filter((n) => typeof n === "number")
-      : [];
-
-    let subs = [];
-    if (rawIds.length) subs = rawIds.map((id) => byId.get(id)).filter(Boolean);
-    else if (rawNums.length)
-      subs = rawNums.map((n) => byNumber.get(n)).filter(Boolean);
-
-    if (maxSubtablesPerGroup && subs.length > maxSubtablesPerGroup) {
-      subs = subs.slice(0, maxSubtablesPerGroup);
-    }
-
-    if (subs.length < 2) continue;
-
-    // All subtables must be valid & free for all required slots
-    if (
-      !subs.every(
-        (t) =>
-          isTemporaryTableValid(t, date, time) &&
-          isTableFreeForAllSlots(
-            t.tableNumber,
-            requiredSlots,
-            tableOccupiedSlots
-          )
-      )
-    ) {
-      continue;
-    }
-
-    // Capacity checks
-    const totalMax = subs.reduce((s, t) => s + (t.maxCapacity || 0), 0);
-    const totalMin = subs.reduce((s, t) => s + (t.minCapacity || 0), 0);
-    if (guests < totalMin) continue;
-    if (guests > totalMax) continue;
-
-    // Deterministic allocation:
-    const ordered = [...subs].sort(subSort);
-    const alloc = new Map(
-      ordered.map((t) => [t.tableNumber, Math.max(0, t.minCapacity || 0)])
-    );
-    let remaining = guests - [...alloc.values()].reduce((s, v) => s + v, 0);
-    if (remaining < 0) continue;
-
-    for (const t of ordered) {
-      if (remaining <= 0) break;
-      const cur = alloc.get(t.tableNumber);
-      const addable = Math.max(0, (t.maxCapacity || 0) - cur);
-      const give = Math.min(addable, remaining);
-      alloc.set(t.tableNumber, cur + give);
-      remaining -= give;
-    }
-    if (remaining !== 0) continue; // couldn’t fit exactly
-
-    // Success
-    return {
-      tables: ordered.map((t) => t.tableNumber),
-      tableIds: ordered.map((t) => t.tableId),
-      viaGroup: String(g.id || g.name || "pinned-group"),
-    };
-  }
-
-  // No match
-  if (groupingStrict) {
-    throw new Error("No matching pinned group found (strict grouping)");
-  }
-  return null;
-}
-
-module.exports = { tryGroupTables };
+// grouping.js
+/**
+ * Try to allocate a reservation via pinned groups.
+ * Returns { tables: number[], tableIds: string[], viaGroup: string } on success,
+ * null if grouping is enabled but no match (and strict=false),
+ * and throws if grouping is strict and no group matches.
+ *
+ * Dependencies (passed in): isTemporaryTableValid, isTableFreeForAllSlots
+ */
+function tryGroupTables({
+  restaurantSettings,
+  allTables,
+  guests,
+  date,
+  time,
+  requiredSlots,
+  tableOccupiedSlots,
+  isTemporaryTableValid,
+  isTableFreeForAllSlots,
+}) {
+  const gset = restaurantSettings["grouping-settings"] || {};
+  const groupingEnabled = gset.enable === true;
+  const groupingStrict = gset.strict === true;
+  const maxSubtablesPerGroup = Number.isFinite(gset.maxSubtables)
+    ? gset.maxSubtables
+    : undefined;
+  const orderStrategy = gset.orderStrategy || "smallest-first"; // 'smallest-first' | 'capacity-asc' | 'closest-fit'
+  const seed = gset.seed ?? 0;
+
+  const pinnedGroups = Array.isArray(restaurantSettings.pinnedGroups)
+    ? restaurantSettings.pinnedGroups
+    : [];
+
+  if (!groupingEnabled || pinnedGroups.length === 0) {
+    return null;
+  }
+
+  // Build lookups from allTables
+  const byId = new Map(allTables.map((t) => [String(t.tableId), t]));
+  const byNumber = new Map(
+    allTables
+      .filter((t) => typeof t.tableNumber === "number")
+      .map((t) => [t.tableNumber, t])
+  );
+
+  // Quick check: is there already a single-table fit?
+  const hasSingleFit = allTables.some(
+    (t) =>
+      t.minCapacity <= guests &&
+      guests <= t.maxCapacity &&
+      isTemporaryTableValid(t, date, time) &&
+      isTableFreeForAllSlots(t.tableNumber, requiredSlots, tableOccupiedSlots)
+  );
+  if (hasSingleFit) {
+    // Let caller handle single-table path; grouping is only used when no single table fits
+    return null;
+  }
+
+  // Stable group ordering
+  const stableGroups = [...pinnedGroups].sort((a, b) => {
+    const aid = String(a.id || a.name || "");
+    const bid = String(b.id || b.name || "");
+    return aid.localeCompare(bid);
+  });
+
+  // Deterministic RNG (kept for parity; not used by default)
+  const rnd = (() => {
+    let x = Math.imul(0x9e3779b1, (seed | 0) + 0x7f4a7c15) | 0;
+    return () => (
+      (x = (x ^ (x >>> 15)) * (x | 1)),
+      (x ^= x + Math.imul(x ^ (x >>> 7), x | 61)),
+      ((x ^ (x >>> 14)) >>> 0) / 4294967296
+    );
+  })();
+
+  // Subtable ordering strategy
+  const subSort = (a, b) => {
+    if (orderStrategy === "closest-fit") {
+      const slA = (a.maxCapacity || 0) - (a.minCapacity || 0);
+      const slB = (b.maxCapacity || 0) - (b.minCapacity || 0);
+      if (slA !== slB) return slA - slB;
+    }
+    if (a.maxCapacity !== b.maxCapacity) return a.maxCapacity - b.maxCapacity;
+    if (a.tableNumber !== b.tableNumber) return a.tableNumber - b.tableNumber;
+    const ida = String(a.tableId),
+      idb = String(b.tableId);
+    return ida.localeCompare(idb);
+  };
+
+  // Try each pinned group
+  for (const g of stableGroups) {
+    const rawIds = Array.isArray(g.tableIds) ? g.tableIds.map(String) : [];
+    const rawNums = Array.isArray(g.tableNumbers)
+      ? g.tableNumbers.filter((n) => typeof n === "number")
+      : [];
+
+    let subs = [];
+    if (rawIds.length) subs = rawIds.map((id) => byId.get(id)).filter(Boolean);
+    else if (rawNums.length)
+      subs = rawNums.map((n) => byNumber.get(n)).filter(Boolean);
+
+    if (maxSubtablesPerGroup && subs.length > maxSubtablesPerGroup) {
+      subs = subs.slice(0, maxSubtablesPerGroup);
+    }
+
+    if (subs.length < 2) continue;
+
+    // All subtables must be valid & free for all required slots
+    if (
+      !subs.every(
+        (t) =>
+          isTemporaryTableValid(t, date, time) &&
+          isTableFreeForAllSlots(
+            t.tableNumber,
+            requiredSlots,
+            tableOccupiedSlots
+          )
+      )
+    ) {
+      continue;
+    }
+
+    // Capacity checks
+    const totalMax = subs.reduce((s, t) => s + (t.maxCapacity || 0), 0);
+    const totalMin = subs.reduce((s, t) => s + (t.minCapacity || 0), 0);
+    if (guests < totalMin) continue;
+    if (guests > totalMax) continue;
+
+    // Deterministic allocation:
+    const ordered = [...subs].sort(subSort);
+    const alloc = new Map(
+      ordered.map((t) => [t.tableNumber, Math.max(0, t.minCapacity || 0)])
+    );
+    let remaining = guests - [...alloc.values()].reduce((s, v) => s + v, 0);
+    if (remaining < 0) continue;
+
+    for (const t of ordered) {
+      if (remaining <= 0) break;
+      const cur = alloc.get(t.tableNumber);
+      const addable = Math.max(0, (t.maxCapacity || 0) - cur);
+      const give = Math.min(addable, remaining);
+      alloc.set(t.tableNumber, cur + give);
+      remaining -= give;
+    }
+    if (remaining !== 0) continue; // couldn’t fit exactly
+
+    // Success
+    return {
+      tables: ordered.map((t) => t.tableNumber),
+      tableIds: ordered.map((t) => t.tableId),
+      viaGroup: String(g.id || g.name || "pinned-group"),
+    };
+  }
+
+  // No match
+  if (groupingStrict) {
+    throw new Error("No matching pinned group found (strict grouping)");
+  }
+  return null;
+}
+
+module.exports = { tryGroupTables };

package/index.js

@@ -1,43 +1,48 @@
-// algorithm/index.js
-
-const processing = {
-    ...require("./processing/dailyGuestCounts"),
-    ...require("./processing/mealTypeCount"),
-    ...require("./processing/timeblocksAvailable")
-};
-
-const reservation_data = {
-    ...require("./reservation_data/counter")
-};
-
-const restaurant_data = {
-    ...require("./restaurant_data/exceptions"),
-    ...require("./restaurant_data/openinghours")
-};
-
-const test = {
-    ...require("./assignTables"),
-    ...require("./getAvailableTimeblocks"),
-    ...require("./grouping"),
-    ...require("./isDateAvailable"),
-    ...require("./isTimeAvailable"),
-    ...require("./simulateTableAssignment"),
-    ...require("./isDateAvailableWithTableCheck"),
-    ...require("./tableHelpers"),
-    ...require("./test"),
-    ...require("./getDateClosingReasons")
-};
-
-const filters = {
-    ...require("./filters/timeFilter"),
-    ...require("./filters/maxArrivalsFilter"),
-    ...require("./filters/maxGroupsFilter")
-};
-// Merge all exports into one
-module.exports = {
-    ...processing,
-    ...reservation_data,
-    ...restaurant_data,
-    ...test,
-    ...filters
-};
+// algorithm/index.js
+
+const processing = {
+    ...require("./processing/dailyGuestCounts"),
+    ...require("./processing/mealTypeCount"),
+    ...require("./processing/timeblocksAvailable")
+};
+
+const reservation_data = {
+    ...require("./reservation_data/counter")
+};
+
+const restaurant_data = {
+    ...require("./restaurant_data/exceptions"),
+    ...require("./restaurant_data/openinghours")
+};
+
+const dateHelpers = {
+    ...require("./dateHelpers")
+};
+
+const test = {
+    ...require("./assignTables"),
+    ...require("./getAvailableTimeblocks"),
+    ...require("./grouping"),
+    ...require("./isDateAvailable"),
+    ...require("./isTimeAvailable"),
+    ...require("./simulateTableAssignment"),
+    ...require("./isDateAvailableWithTableCheck"),
+    ...require("./tableHelpers"),
+    ...require("./test"),
+    ...require("./getDateClosingReasons")
+};
+
+const filters = {
+    ...require("./filters/timeFilter"),
+    ...require("./filters/maxArrivalsFilter"),
+    ...require("./filters/maxGroupsFilter")
+};
+// Merge all exports into one
+module.exports = {
+    ...processing,
+    ...reservation_data,
+    ...restaurant_data,
+    ...dateHelpers,
+    ...test,
+    ...filters
+};

package/isDateAvailable.js

@@ -1,80 +1,80 @@
-// isDateAvailable.js
-
-const { getAvailableTimeblocks } = require('./getAvailableTimeblocks');
-
-/**
- * Parses a time string in "HH:MM" format into minutes since midnight.
- * @param {string} timeStr - Time string in "HH:MM" format.
- * @returns {number} Minutes since midnight.
- */
-function parseTime(timeStr) {
-  const [hours, minutes] = timeStr.split(':').map(Number);
-  return hours * 60 + minutes;
-}
-
-/**
- * Checks if a date is within the allowed future range defined by dagenInToekomst.
- * @param {Object} data - The main data object (to access general settings).
- * @param {string} dateStr - The date string (YYYY-MM-DD).
- * @returns {boolean} true if within range, false otherwise.
- */
-function isDateWithinAllowedRange(data, dateStr) {
-  // Get dagenInToekomst
-  let dagenInToekomst = 90;
-  if (
-    data['general-settings'] &&
-    data['general-settings'].dagenInToekomst &&
-    parseInt(data['general-settings'].dagenInToekomst, 10) > 0
-  ) {
-    dagenInToekomst = parseInt(data['general-settings'].dagenInToekomst, 10);
-  }
-
-  const timeZone = 'Europe/Amsterdam';
-
-  const now = new Date();
-  const currentTimeInTimeZone = new Date(
-    now.toLocaleString('en-US', { timeZone: timeZone })
-  );
-
-  const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
-  maxAllowedDate.setDate(maxAllowedDate.getDate() + dagenInToekomst);
-  maxAllowedDate.setHours(23, 59, 59, 999);
-
-  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 })
-  );
-
-  return targetDateInTimeZone <= maxAllowedDate;
-}
-
-/**
- * Checks if a date is available for a reservation of a specified number of guests.
- * This updated version uses `getAvailableTimeblocks` to ensure that it never returns
- * true if no actual time slots are available, including for today's date.
- * @param {Object} data - The main data object containing settings and meal information.
- * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
- * @param {Array} reservations - An array of reservation objects.
- * @param {number} guests - The number of guests for the reservation.
- * @param {Array} blockedSlots - Optional array of blocked time slots to exclude.
- * @param {string|null} giftcard - Optional giftcard to filter times by meal.
- * @param {boolean} isAdmin - Optional flag to bypass time restrictions for admin users.
- * @returns {boolean} - Returns true if the date has at least one available timeblock, false otherwise.
- */
-function isDateAvailable(data, dateStr, reservations, guests, blockedSlots = [], giftcard = null, isAdmin = false, duration = null) {
-  // Check if date is within allowed range (skip for admin)
-  if (!isAdmin && !isDateWithinAllowedRange(data, dateStr)) {
-    return false;
-  }
-
-  // Get available timeblocks using the existing logic
-  const availableTimeblocks = getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlots, giftcard, isAdmin, duration);
-
-  // Return true only if we have at least one available timeblock
-  return Object.keys(availableTimeblocks).length > 0;
-}
-
-module.exports = {
-  isDateAvailable,
-};
+// isDateAvailable.js
+
+const { getAvailableTimeblocks } = require('./getAvailableTimeblocks');
+
+/**
+ * Parses a time string in "HH:MM" format into minutes since midnight.
+ * @param {string} timeStr - Time string in "HH:MM" format.
+ * @returns {number} Minutes since midnight.
+ */
+function parseTime(timeStr) {
+  const [hours, minutes] = timeStr.split(':').map(Number);
+  return hours * 60 + minutes;
+}
+
+/**
+ * Checks if a date is within the allowed future range defined by dagenInToekomst.
+ * @param {Object} data - The main data object (to access general settings).
+ * @param {string} dateStr - The date string (YYYY-MM-DD).
+ * @returns {boolean} true if within range, false otherwise.
+ */
+function isDateWithinAllowedRange(data, dateStr) {
+  // Get dagenInToekomst
+  let dagenInToekomst = 90;
+  if (
+    data['general-settings'] &&
+    data['general-settings'].dagenInToekomst &&
+    parseInt(data['general-settings'].dagenInToekomst, 10) > 0
+  ) {
+    dagenInToekomst = parseInt(data['general-settings'].dagenInToekomst, 10);
+  }
+
+  const timeZone = 'Europe/Amsterdam';
+
+  const now = new Date();
+  const currentTimeInTimeZone = new Date(
+    now.toLocaleString('en-US', { timeZone: timeZone })
+  );
+
+  const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
+  maxAllowedDate.setDate(maxAllowedDate.getDate() + dagenInToekomst);
+  maxAllowedDate.setHours(23, 59, 59, 999);
+
+  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 })
+  );
+
+  return targetDateInTimeZone <= maxAllowedDate;
+}
+
+/**
+ * Checks if a date is available for a reservation of a specified number of guests.
+ * This updated version uses `getAvailableTimeblocks` to ensure that it never returns
+ * true if no actual time slots are available, including for today's date.
+ * @param {Object} data - The main data object containing settings and meal information.
+ * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
+ * @param {Array} reservations - An array of reservation objects.
+ * @param {number} guests - The number of guests for the reservation.
+ * @param {Array} blockedSlots - Optional array of blocked time slots to exclude.
+ * @param {string|null} giftcard - Optional giftcard to filter times by meal.
+ * @param {boolean} isAdmin - Optional flag to bypass time restrictions for admin users.
+ * @returns {boolean} - Returns true if the date has at least one available timeblock, false otherwise.
+ */
+function isDateAvailable(data, dateStr, reservations, guests, blockedSlots = [], giftcard = null, isAdmin = false, duration = null) {
+  // Check if date is within allowed range (skip for admin)
+  if (!isAdmin && !isDateWithinAllowedRange(data, dateStr)) {
+    return false;
+  }
+
+  // Get available timeblocks using the existing logic
+  const availableTimeblocks = getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlots, giftcard, isAdmin, duration);
+
+  // Return true only if we have at least one available timeblock
+  return Object.keys(availableTimeblocks).length > 0;
+}
+
+module.exports = {
+  isDateAvailable,
+};