@happychef/algorithm 1.2.31 → 1.3.0

package/processing/mealTypeCount.js

@@ -1,133 +1,133 @@
-// mealTypeCount.js
-
-const { getDataByDateAndMealWithExceptions } = require('../restaurant_data/exceptions');
-const { parseTime } = require('../restaurant_data/openinghours');
-const { getGuestCountAtHour } = require('../reservation_data/counter');
-
-function getInterval(data) {
-  let intervalReservatie = 15;
-  if (
-    data['general-settings'] &&
-    data['general-settings'].intervalReservatie &&
-    parseInt(data['general-settings'].intervalReservatie, 10) > 0
-  ) {
-    intervalReservatie = parseInt(data['general-settings'].intervalReservatie, 10);
-  }
-  return intervalReservatie;
-}
-
-/**
- * Retrieves meal types with shifts enabled and at least one shift defined for the specified date.
- * @param {Object} data - The main data object.
- * @param {string} dateStr - The date string (YYYY-MM-DD).
- * @returns {Array} - An array of meal types with shifts.
- */
-function getMealTypesWithShifts(data, dateStr) {
-  const mealTypes = ['breakfast', 'lunch', 'dinner'];
-  const mealTypesWithShifts = [];
-
-  for (const mealType of mealTypes) {
-    const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
-    if (
-      mealData &&
-      mealData.shiftsEnabled &&
-      Array.isArray(mealData.shifts) &&
-      mealData.shifts.length > 0
-    ) {
-      mealTypesWithShifts.push(mealType);
-    }
-  }
-
-  return mealTypesWithShifts;
-}
-
-function shouldIncludeEndTime(mealType, endTime) {  
-  if ((mealType === 'breakfast' && endTime === '11:00') ||
-      (mealType === 'lunch' && endTime === '16:00')) {
-    return false; // Do not include endTime for breakfast at 11:00 and lunch at 16:00
-  }
-  return true; // Include endTime for all other cases
-}
-
-/**
- * Calculates guest counts for each interval during a meal period or at shift times.
- * @param {Object} data - The main data object.
- * @param {string} dateStr - The date string (YYYY-MM-DD).
- * @param {string} mealType - The meal type ("breakfast", "lunch", "dinner").
- * @param {Array} reservations - An array of reservation objects.
- * @returns {Object|null} An object mapping times to guest counts, or null if meal is not available.
- */
-function getGuestCountsForMeal(data, dateStr, mealType, reservations) {
-  const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
-  if (!mealData) {
-    return null;
-  }
-
-  const guestCounts = {};
-  const shiftsInfo = [];
-
-  // Get 'intervalReservatie' from general settings, default to 15 if not set or zero
-  let intervalReservatie = getInterval(data);
-
-  // Check if shifts are enabled and shifts array has valid content
-  if (
-    mealData.shiftsEnabled &&
-    Array.isArray(mealData.shifts) &&
-    mealData.shifts.length > 0
-  ) {
-    // If shifts are enabled and valid, calculate guest counts at shift times
-    const shifts = mealData.shifts; // Array of shifts
-
-    for (const shift of shifts) {
-      const timeStr = shift.time; // Time of the shift in "HH:MM" format
-
-      // Get guest count at this time
-      const guestCount = getGuestCountAtHour(data, reservations, timeStr, dateStr);
-
-      // Store in guestCounts
-      guestCounts[timeStr] = mealData.maxCapacity - guestCount;
-
-      // Store shift information
-      shiftsInfo.push({
-        mealType,
-        shiftName: shift.name,
-        time: timeStr,
-        availableSeats: mealData.maxCapacity - guestCount,
-      });
-    }
-  } else {
-    // If shifts are not enabled or shifts array is empty/invalid, calculate guest counts at intervals
-    const startTime = mealData.startTime;
-    const endTime = mealData.endTime;
-
-    // Determine if endTime should be included
-    const includeEndTime = shouldIncludeEndTime(mealType, endTime);
-
-    // Convert startTime and endTime to minutes since midnight
-    let currentTime = parseTime(startTime);
-    const endTimeMinutes = parseTime(endTime);
-
-    while (includeEndTime ? currentTime <= endTimeMinutes : currentTime < endTimeMinutes) {
-      // Convert currentTime back to "HH:MM" format
-      const hours = Math.floor(currentTime / 60).toString().padStart(2, '0');
-      const minutes = (currentTime % 60).toString().padStart(2, '0');
-      const timeStr = `${hours}:${minutes}`;
-
-      // Get guest count at this time
-      const guestCount = getGuestCountAtHour(data, reservations, timeStr, dateStr);
-
-      // Store in guestCounts
-      guestCounts[timeStr] = mealData.maxCapacity - guestCount;
-
-      // Increment currentTime by 'intervalReservatie' minutes
-      currentTime += intervalReservatie;
-    }
-  }
-
-  return { guestCounts, shiftsInfo };
-}
-
-module.exports = {
-  getGuestCountsForMeal,
-  getMealTypesWithShifts, // Exported
-};
+// mealTypeCount.js
+
+const { getDataByDateAndMealWithExceptions } = require('../restaurant_data/exceptions');
+const { parseTime } = require('../restaurant_data/openinghours');
+const { getGuestCountAtHour } = require('../reservation_data/counter');
+
+function getInterval(data) {
+  let intervalReservatie = 15;
+  if (
+    data['general-settings'] &&
+    data['general-settings'].intervalReservatie &&
+    parseInt(data['general-settings'].intervalReservatie, 10) > 0
+  ) {
+    intervalReservatie = parseInt(data['general-settings'].intervalReservatie, 10);
+  }
+  return intervalReservatie;
+}
+
+/**
+ * Retrieves meal types with shifts enabled and at least one shift defined for the specified date.
+ * @param {Object} data - The main data object.
+ * @param {string} dateStr - The date string (YYYY-MM-DD).
+ * @returns {Array} - An array of meal types with shifts.
+ */
+function getMealTypesWithShifts(data, dateStr) {
+  const mealTypes = ['breakfast', 'lunch', 'dinner'];
+  const mealTypesWithShifts = [];
+
+  for (const mealType of mealTypes) {
+    const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
+    if (
+      mealData &&
+      mealData.shiftsEnabled &&
+      Array.isArray(mealData.shifts) &&
+      mealData.shifts.length > 0
+    ) {
+      mealTypesWithShifts.push(mealType);
+    }
+  }
+
+  return mealTypesWithShifts;
+}
+
+function shouldIncludeEndTime(mealType, endTime) {  
+  if ((mealType === 'breakfast' && endTime === '11:00') ||
+      (mealType === 'lunch' && endTime === '16:00')) {
+    return false; // Do not include endTime for breakfast at 11:00 and lunch at 16:00
+  }
+  return true; // Include endTime for all other cases
+}
+
+/**
+ * Calculates guest counts for each interval during a meal period or at shift times.
+ * @param {Object} data - The main data object.
+ * @param {string} dateStr - The date string (YYYY-MM-DD).
+ * @param {string} mealType - The meal type ("breakfast", "lunch", "dinner").
+ * @param {Array} reservations - An array of reservation objects.
+ * @returns {Object|null} An object mapping times to guest counts, or null if meal is not available.
+ */
+function getGuestCountsForMeal(data, dateStr, mealType, reservations) {
+  const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
+  if (!mealData) {
+    return null;
+  }
+
+  const guestCounts = {};
+  const shiftsInfo = [];
+
+  // Get 'intervalReservatie' from general settings, default to 15 if not set or zero
+  let intervalReservatie = getInterval(data);
+
+  // Check if shifts are enabled and shifts array has valid content
+  if (
+    mealData.shiftsEnabled &&
+    Array.isArray(mealData.shifts) &&
+    mealData.shifts.length > 0
+  ) {
+    // If shifts are enabled and valid, calculate guest counts at shift times
+    const shifts = mealData.shifts; // Array of shifts
+
+    for (const shift of shifts) {
+      const timeStr = shift.time; // Time of the shift in "HH:MM" format
+
+      // Get guest count at this time
+      const guestCount = getGuestCountAtHour(data, reservations, timeStr, dateStr);
+
+      // Store in guestCounts
+      guestCounts[timeStr] = mealData.maxCapacity - guestCount;
+
+      // Store shift information
+      shiftsInfo.push({
+        mealType,
+        shiftName: shift.name,
+        time: timeStr,
+        availableSeats: mealData.maxCapacity - guestCount,
+      });
+    }
+  } else {
+    // If shifts are not enabled or shifts array is empty/invalid, calculate guest counts at intervals
+    const startTime = mealData.startTime;
+    const endTime = mealData.endTime;
+
+    // Determine if endTime should be included
+    const includeEndTime = shouldIncludeEndTime(mealType, endTime);
+
+    // Convert startTime and endTime to minutes since midnight
+    let currentTime = parseTime(startTime);
+    const endTimeMinutes = parseTime(endTime);
+
+    while (includeEndTime ? currentTime <= endTimeMinutes : currentTime < endTimeMinutes) {
+      // Convert currentTime back to "HH:MM" format
+      const hours = Math.floor(currentTime / 60).toString().padStart(2, '0');
+      const minutes = (currentTime % 60).toString().padStart(2, '0');
+      const timeStr = `${hours}:${minutes}`;
+
+      // Get guest count at this time
+      const guestCount = getGuestCountAtHour(data, reservations, timeStr, dateStr);
+
+      // Store in guestCounts
+      guestCounts[timeStr] = mealData.maxCapacity - guestCount;
+
+      // Increment currentTime by 'intervalReservatie' minutes
+      currentTime += intervalReservatie;
+    }
+  }
+
+  return { guestCounts, shiftsInfo };
+}
+
+module.exports = {
+  getGuestCountsForMeal,
+  getMealTypesWithShifts, // Exported
+};

package/processing/timeblocksAvailable.js

@@ -1,183 +1,183 @@
-const { getDailyGuestCounts } = require('./dailyGuestCounts');
-const { getMealTypesWithShifts } = require('./mealTypeCount');
-const { getDataByDateAndMealWithExceptions } = require('../restaurant_data/exceptions');
-const { getMealTypeByTime, parseTime: parseTimeOH, daysOfWeekEnglish } = require('../restaurant_data/openinghours');
-const moment = require('moment-timezone');
-
-/**
- * Parses a time string in "HH:MM" format into minutes since midnight.
- */
-function parseTime(timeStr) {
-  const [hours, minutes] = timeStr.split(':').map(Number);
-  return hours * 60 + minutes;
-}
-
-/**
- * Retrieves interval and duurReservatie from general settings
- */
-function getInterval(data) {
-  let intervalReservatie = 15;
-  if (
-    data['general-settings'] &&
-    data['general-settings'].intervalReservatie &&
-    parseInt(data['general-settings'].intervalReservatie, 10) > 0
-  ) {
-    intervalReservatie = parseInt(data['general-settings'].intervalReservatie, 10);
-  }
-  return intervalReservatie;
-}
-
-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);
-  }
-  return duurReservatie;
-}
-
-/**
- * Checks if a time slot belongs to a meal that has the selected giftcard enabled.
- */
-function timeHasGiftcard(data, dateStr, timeStr, giftcard) {
-  if (!giftcard || (typeof giftcard === 'string' && !giftcard.trim())) {
-    return true; // No giftcard => no restriction
-  }
-
-  const mealType = getMealTypeByTime(timeStr);
-  if (!mealType) return false;
-
-  const m = moment.tz(dateStr, 'YYYY-MM-DD', 'Europe/Brussels');
-  if (!m.isValid()) return false;
-  const englishDay = daysOfWeekEnglish[m.day()];
-
-  const ohKey = `openinghours-${mealType}`;
-  const daySettings =
-    data[ohKey] &&
-    data[ohKey].schemeSettings &&
-    data[ohKey].schemeSettings[englishDay]
-      ? data[ohKey].schemeSettings[englishDay]
-      : null;
-
-  if (!daySettings) return false;
-  if (daySettings.giftcardsEnabled !== true) return false;
-  if (!Array.isArray(daySettings.giftcards) || daySettings.giftcards.length === 0) return false;
-
-  return daySettings.giftcards.includes(giftcard);
-}
-
-/**
- * Determines if a given start time plus duurReservatie fits within the meal timeframe.
- */
-function fitsWithinMeal(data, dateStr, startTimeStr, duurReservatie) {
-  // Determine the meal type based on the start time
-  const mealType = getMealTypeByTime(startTimeStr);
-  if (!mealType) return false;
-
-  // Get the meal data (with exceptions applied)
-  const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
-  if (!mealData) return false;
-
-  const mealStartTime = parseTime(mealData.startTime);
-  const mealEndTime = parseTime(mealData.endTime);
-  const startTime = parseTime(startTimeStr);
-  
-  // Check if startTime is after or equal to mealStartTime AND startTime + duurReservatie is within the mealEndTime
-  return startTime >= mealStartTime && startTime + duurReservatie <= mealEndTime;
-}
-
-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
-  const slotsNeeded = Math.ceil(duurReservatie / intervalReservatie);
-
-  // Get guest counts and shifts info
-  const { guestCounts, shiftsInfo } = getDailyGuestCounts(data, dateStr, reservations);
-
-  const availableTimeblocks = {};
-
-  // Handle shifts first
-  const mealTypesWithShifts = getMealTypesWithShifts(data, dateStr);
-  if (mealTypesWithShifts.length > 0 && shiftsInfo && shiftsInfo.length > 0) {
-    for (const shift of shiftsInfo) {
-      const { time, availableSeats } = shift;
-      if (availableSeats >= guests && fitsWithinMeal(data, dateStr, time, duurReservatie)) {
-        // Check if time matches giftcard requirement
-        if (timeHasGiftcard(data, dateStr, time, giftcard)) {
-          availableTimeblocks[time] = { name: time };
-        }
-      }
-    }
-  }
-
-  // Handle non-shift times
-  if (guestCounts && Object.keys(guestCounts).length > 0) {
-    const timeSlots = Object.keys(guestCounts).sort((a, b) => parseTime(a) - parseTime(b));
-
-    for (let i = 0; i <= timeSlots.length - slotsNeeded; i++) {
-      // Check capacity for all needed slots
-      let consecutiveSlotsAvailable = true;
-      if (guestCounts[timeSlots[i]] < guests) {
-        continue;
-      }
-
-      let previousTime = parseTime(timeSlots[i]);
-      for (let j = 1; j < slotsNeeded; j++) {
-        const currentTimeSlot = timeSlots[i + j];
-        const currentTime = parseTime(currentTimeSlot);
-
-        // Check interval and capacity
-        if ((currentTime - previousTime) !== intervalReservatie || guestCounts[currentTimeSlot] < guests) {
-          consecutiveSlotsAvailable = false;
-          break;
-        }
-        previousTime = currentTime;
-      }
-
-      // If all consecutive slots are available, check if the full duration fits
-      if (consecutiveSlotsAvailable && fitsWithinMeal(data, dateStr, timeSlots[i], duurReservatie)) {
-        // Check if time matches giftcard requirement
-        if (timeHasGiftcard(data, dateStr, timeSlots[i], giftcard)) {
-          availableTimeblocks[timeSlots[i]] = { name: timeSlots[i] };
-        }
-      }
-    }
-  }
-
-  // Filter out blocked time slots (skip for admin)
-  if (!isAdmin && blockedSlots && blockedSlots.length > 0) {
-    // Check if waitlist is enabled in settings (default to true if not defined)
-    // The setting key is 'waitlistEnabled' in 'general-settings'
-    const settings = data['general-settings'] || {};
-    const waitlistEnabled = settings.waitlistEnabled !== undefined ? settings.waitlistEnabled === true : true;
-
-    for (const blockedSlot of blockedSlots) {
-      // Check if the blocked slot matches the current date
-      if (blockedSlot.date === dateStr && blockedSlot.time) {
-        if (waitlistEnabled) {
-          // If waitlist is enabled, mark it as a waitlist item instead of deleting
-          // We force it into the list even if it wasn't there (e.g. if it was full)
-          // because a manual block + waitlist implies we want to capture interest for this specific blocked time.
-          availableTimeblocks[blockedSlot.time] = { 
-            name: blockedSlot.time,
-            isWaitlist: true 
-          };
-        } else {
-          // Default behavior: Remove the blocked time from available timeblocks
-          delete availableTimeblocks[blockedSlot.time];
-        }
-      }
-    }
-  }
-
-  return availableTimeblocks;
-}
-
-module.exports = {
-  timeblocksAvailable,
+const { getDailyGuestCounts } = require('./dailyGuestCounts');
+const { getMealTypesWithShifts } = require('./mealTypeCount');
+const { getDataByDateAndMealWithExceptions } = require('../restaurant_data/exceptions');
+const { getMealTypeByTime, parseTime: parseTimeOH, daysOfWeekEnglish } = require('../restaurant_data/openinghours');
+const moment = require('moment-timezone');
+
+/**
+ * Parses a time string in "HH:MM" format into minutes since midnight.
+ */
+function parseTime(timeStr) {
+  const [hours, minutes] = timeStr.split(':').map(Number);
+  return hours * 60 + minutes;
+}
+
+/**
+ * Retrieves interval and duurReservatie from general settings
+ */
+function getInterval(data) {
+  let intervalReservatie = 15;
+  if (
+    data['general-settings'] &&
+    data['general-settings'].intervalReservatie &&
+    parseInt(data['general-settings'].intervalReservatie, 10) > 0
+  ) {
+    intervalReservatie = parseInt(data['general-settings'].intervalReservatie, 10);
+  }
+  return intervalReservatie;
+}
+
+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);
+  }
+  return duurReservatie;
+}
+
+/**
+ * Checks if a time slot belongs to a meal that has the selected giftcard enabled.
+ */
+function timeHasGiftcard(data, dateStr, timeStr, giftcard) {
+  if (!giftcard || (typeof giftcard === 'string' && !giftcard.trim())) {
+    return true; // No giftcard => no restriction
+  }
+
+  const mealType = getMealTypeByTime(timeStr);
+  if (!mealType) return false;
+
+  const m = moment.tz(dateStr, 'YYYY-MM-DD', 'Europe/Brussels');
+  if (!m.isValid()) return false;
+  const englishDay = daysOfWeekEnglish[m.day()];
+
+  const ohKey = `openinghours-${mealType}`;
+  const daySettings =
+    data[ohKey] &&
+    data[ohKey].schemeSettings &&
+    data[ohKey].schemeSettings[englishDay]
+      ? data[ohKey].schemeSettings[englishDay]
+      : null;
+
+  if (!daySettings) return false;
+  if (daySettings.giftcardsEnabled !== true) return false;
+  if (!Array.isArray(daySettings.giftcards) || daySettings.giftcards.length === 0) return false;
+
+  return daySettings.giftcards.includes(giftcard);
+}
+
+/**
+ * Determines if a given start time plus duurReservatie fits within the meal timeframe.
+ */
+function fitsWithinMeal(data, dateStr, startTimeStr, duurReservatie) {
+  // Determine the meal type based on the start time
+  const mealType = getMealTypeByTime(startTimeStr);
+  if (!mealType) return false;
+
+  // Get the meal data (with exceptions applied)
+  const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
+  if (!mealData) return false;
+
+  const mealStartTime = parseTime(mealData.startTime);
+  const mealEndTime = parseTime(mealData.endTime);
+  const startTime = parseTime(startTimeStr);
+  
+  // Check if startTime is after or equal to mealStartTime AND startTime + duurReservatie is within the mealEndTime
+  return startTime >= mealStartTime && startTime + duurReservatie <= mealEndTime;
+}
+
+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
+  const slotsNeeded = Math.ceil(duurReservatie / intervalReservatie);
+
+  // Get guest counts and shifts info
+  const { guestCounts, shiftsInfo } = getDailyGuestCounts(data, dateStr, reservations);
+
+  const availableTimeblocks = {};
+
+  // Handle shifts first
+  const mealTypesWithShifts = getMealTypesWithShifts(data, dateStr);
+  if (mealTypesWithShifts.length > 0 && shiftsInfo && shiftsInfo.length > 0) {
+    for (const shift of shiftsInfo) {
+      const { time, availableSeats } = shift;
+      if (availableSeats >= guests && fitsWithinMeal(data, dateStr, time, duurReservatie)) {
+        // Check if time matches giftcard requirement
+        if (timeHasGiftcard(data, dateStr, time, giftcard)) {
+          availableTimeblocks[time] = { name: time };
+        }
+      }
+    }
+  }
+
+  // Handle non-shift times
+  if (guestCounts && Object.keys(guestCounts).length > 0) {
+    const timeSlots = Object.keys(guestCounts).sort((a, b) => parseTime(a) - parseTime(b));
+
+    for (let i = 0; i <= timeSlots.length - slotsNeeded; i++) {
+      // Check capacity for all needed slots
+      let consecutiveSlotsAvailable = true;
+      if (guestCounts[timeSlots[i]] < guests) {
+        continue;
+      }
+
+      let previousTime = parseTime(timeSlots[i]);
+      for (let j = 1; j < slotsNeeded; j++) {
+        const currentTimeSlot = timeSlots[i + j];
+        const currentTime = parseTime(currentTimeSlot);
+
+        // Check interval and capacity
+        if ((currentTime - previousTime) !== intervalReservatie || guestCounts[currentTimeSlot] < guests) {
+          consecutiveSlotsAvailable = false;
+          break;
+        }
+        previousTime = currentTime;
+      }
+
+      // If all consecutive slots are available, check if the full duration fits
+      if (consecutiveSlotsAvailable && fitsWithinMeal(data, dateStr, timeSlots[i], duurReservatie)) {
+        // Check if time matches giftcard requirement
+        if (timeHasGiftcard(data, dateStr, timeSlots[i], giftcard)) {
+          availableTimeblocks[timeSlots[i]] = { name: timeSlots[i] };
+        }
+      }
+    }
+  }
+
+  // Filter out blocked time slots (skip for admin)
+  if (!isAdmin && blockedSlots && blockedSlots.length > 0) {
+    // Check if waitlist is enabled in settings (default to true if not defined)
+    // The setting key is 'waitlistEnabled' in 'general-settings'
+    const settings = data['general-settings'] || {};
+    const waitlistEnabled = settings.waitlistEnabled !== undefined ? settings.waitlistEnabled === true : true;
+
+    for (const blockedSlot of blockedSlots) {
+      // Check if the blocked slot matches the current date
+      if (blockedSlot.date === dateStr && blockedSlot.time) {
+        if (waitlistEnabled) {
+          // If waitlist is enabled, mark it as a waitlist item instead of deleting
+          // We force it into the list even if it wasn't there (e.g. if it was full)
+          // because a manual block + waitlist implies we want to capture interest for this specific blocked time.
+          availableTimeblocks[blockedSlot.time] = { 
+            name: blockedSlot.time,
+            isWaitlist: true 
+          };
+        } else {
+          // Default behavior: Remove the blocked time from available timeblocks
+          delete availableTimeblocks[blockedSlot.time];
+        }
+      }
+    }
+  }
+
+  return availableTimeblocks;
+}
+
+module.exports = {
+  timeblocksAvailable,
 };