@happychef/algorithm 1.3.2 → 1.4.0

package/reservation_data/counter.js

@@ -1,75 +1,82 @@
-// counter.js
-
-/**
- * Parses a time string in "HH:MM" format into minutes since midnight.
- * @param {string} timeStr - The time string in "HH:MM" format.
- * @returns {number} The time in minutes since midnight.
- */
-function parseTime(timeStr) {
-	const [hours, minutes] = timeStr.split(':').map(Number);
-	return hours * 60 + minutes;
-  }
-
-  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;
-  }
-  
-  /**
-   * Calculates the total number of guests for reservations that cover a specific hour on a specific date.
-   * @param {Object} data - The main data object containing general settings.
-   * @param {Array} reservations - An array of reservation objects.
-   * @param {string} hour - The hour to check in "HH:MM" format.
-   * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
-   * @returns {number} The total number of guests for that hour on the specified date.
-   */
-  function getGuestCountAtHour(data, reservations, hour, dateStr) {
-	// Get 'duurReservatie' from general settings, default to 120 if not set or zero
-	let duurReservatie = getDuurReservatie(data)
-  
-	// Convert the target hour to minutes since midnight
-	const targetTime = parseTime(hour);
-  
-	let totalGuests = 0;
-  
-	for (const reservation of reservations) {
-	  // Only consider reservations on the specified date
-	  if (reservation.date !== dateStr) {
-		continue;
-	  }
-  
-	  const startTime = parseTime(reservation.time);
-
-	  // 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) {
-		totalGuests += parseInt(reservation.guests, 10);
-	  }
-	}
-  
-	return totalGuests;
-  }
-  
-  module.exports = {
-	getGuestCountAtHour,
-  };
-  
+// counter.js
+
+const { getPrevDateStr } = require('../dateHelpers');
+
+/**
+ * Parses a time string in "HH:MM" format into minutes since midnight.
+ * @param {string} timeStr - The time string in "HH:MM" format.
+ * @returns {number} The time in minutes since midnight.
+ */
+function parseTime(timeStr) {
+  const [hours, minutes] = timeStr.split(':').map(Number);
+  return hours * 60 + minutes;
+}
+
+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;
+}
+
+/**
+ * Parses a reservation's duration, falling back to the default.
+ */
+function getReservationDuration(reservation, defaultDuration) {
+  if (reservation.duration) {
+    const rawDur = reservation.duration.$numberInt ?? reservation.duration;
+    const parsed = parseInt(rawDur, 10);
+    if (!isNaN(parsed) && parsed > 0) {
+      return parsed;
+    }
+  }
+  return defaultDuration;
+}
+
+/**
+ * Calculates the total number of guests for reservations that cover a specific hour on a specific date.
+ * Also includes guests from previous-day reservations whose duration extends past midnight.
+ * @param {Object} data - The main data object containing general settings.
+ * @param {Array} reservations - An array of reservation objects.
+ * @param {string} hour - The hour to check in "HH:MM" format.
+ * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
+ * @returns {number} The total number of guests for that hour on the specified date.
+ */
+function getGuestCountAtHour(data, reservations, hour, dateStr) {
+  const duurReservatie = getDuurReservatie(data);
+  const targetTime = parseTime(hour);
+  const prevDateStr = getPrevDateStr(dateStr);
+
+  let totalGuests = 0;
+
+  for (const reservation of reservations) {
+    const startTime = parseTime(reservation.time);
+    const rDuration = getReservationDuration(reservation, duurReservatie);
+    const endTime = startTime + rDuration;
+
+    if (reservation.date === dateStr) {
+      // Same-day reservation
+      if (targetTime >= startTime && targetTime < endTime) {
+        totalGuests += parseInt(reservation.guests, 10);
+      }
+    } else if (reservation.date === prevDateStr && endTime > 1440) {
+      // Previous-day reservation that crosses midnight
+      const spilloverEnd = endTime - 1440;
+      if (targetTime < spilloverEnd) {
+        totalGuests += parseInt(reservation.guests, 10);
+      }
+    }
+  }
+
+  return totalGuests;
+}
+
+module.exports = {
+  getGuestCountAtHour,
+};

package/restaurant_data/exceptions.js

@@ -1,150 +1,150 @@
-// exceptions.js
-
-const {
-	getDataByDateAndMeal,
-	getDataByDateAndTime,
-	getMealTypeByTime,
-	parseTime,
-	parseDateString,
-	shifts,
-	daysOfWeekEnglish,
-	daysOfWeekDutch,
-} = require('./openinghours');
-
-function isDateInRange(dateStr, startDateStr, endDateStr) {
-	const date = parseDateString(dateStr);
-	const startDate = parseDateString(startDateStr);
-	const endDate = parseDateString(endDateStr);
-	if (isNaN(date) || isNaN(startDate) || isNaN(endDate)) {
-	  return false;
-	}
-	return date >= startDate && date <= endDate;
-}
-
-function getDutchDayOfWeek(date) {
-	const dayIndex = date.getDay();
-	return daysOfWeekDutch[dayIndex];
-}
-
-function doesExceptionApply(exception, dateStr, dateDayOfWeekDutch, mealType) {
-	const { timeframe, startDate, endDate, daysOfWeek } = exception;
-
-	if (!isDateInRange(dateStr, startDate, endDate)) {
-	  return false;
-	}
-
-	if (Array.isArray(daysOfWeek) && daysOfWeek.length > 0) {
-	  const daysOfWeekLower = daysOfWeek.map(day => day.toLowerCase());
-	  if (!daysOfWeekLower.includes(dateDayOfWeekDutch)) {
-		return false;
-	  }
-	}
-
-	if (timeframe === 'Volledige Dag' || timeframe === mealType) {
-	  return true;
-	}
-
-	return false;
-}
-
-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;
-}
-
-function addDuurReservatieToEndTime(mealData, data) {
-  const duurReservatie = getDuurReservatie(data);
-  const endMinutes = parseTime(mealData.endTime);
-  const newEndMinutes = endMinutes + duurReservatie;
-  const hours = String(Math.floor(newEndMinutes / 60)).padStart(2, '0');
-  const minutes = String(newEndMinutes % 60).padStart(2, '0');
-  mealData.endTime = `${hours}:${minutes}`;
-}
-
-function mapExceptionToMealData(exception, data) {
-	let mealData = {
-	  enabled: true,
-	  startTime: exception.startHour,
-	  endTime: exception.endHour,
-	  maxCapacityEnabled: exception.maxSeats ? true : false,
-	  maxCapacity: exception.maxSeats || null,
-	  shiftsEnabled: false,
-	  shifts: [],
-	};
-
-	// Add duurReservatie to endTime
-	addDuurReservatieToEndTime(mealData, data);
-
-	return mealData;
-}
-
-function getDataByDateAndMealWithExceptions(data, dateStr, mealType) {
-	const exceptions = data.exceptions || [];
-	const date = parseDateString(dateStr);
-	if (isNaN(date)) {
-	  return null;
-	}
-	const dateDayOfWeekDutch = getDutchDayOfWeek(date).toLowerCase();
-
-	const exceptionTypesPriority = ['Opening', 'Sluiting', 'Uitzondering'];
-
-	for (const exceptionType of exceptionTypesPriority) {
-	  for (const exception of exceptions) {
-		if (exception.type === exceptionType) {
-		  if (doesExceptionApply(exception, dateStr, dateDayOfWeekDutch, mealType)) {
-			if (exceptionType === 'Sluiting') {
-			  return null;
-			} else {
-			  return mapExceptionToMealData(exception, data);
-			}
-		  }
-		}
-	  }
-	}
-
-	return getDataByDateAndMeal(data, dateStr, mealType);
-}
-
-function shouldIncludeEndTime(mealType, endTime) {
-	if ((mealType === 'breakfast' && endTime === '11:00') ||
-		(mealType === 'lunch' && endTime === '16:00')) {
-	  return false;
-	}
-	return true;
-}
-
-function getDataByDateAndTimeWithExceptions(data, dateStr, timeStr) {
-	const mealType = getMealTypeByTime(timeStr);
-	if (!mealType) {
-	  return null;
-	}
-	const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
-	if (!mealData) {
-	  return null;
-	}
-
-	const requestedTime = parseTime(timeStr);
-	const startTime = parseTime(mealData.startTime);
-	const endTime = parseTime(mealData.endTime);
-
-	const includeEndTime = shouldIncludeEndTime(mealType, mealData.endTime);
-
-	const timeFallsWithin =
-	  includeEndTime
-		? requestedTime >= startTime && requestedTime <= endTime
-		: requestedTime >= startTime && requestedTime < endTime;
-
-	return timeFallsWithin ? mealData : null;
-}
-
-module.exports = {
-	getDataByDateAndMealWithExceptions,
-	getDataByDateAndTimeWithExceptions,
-};
+// exceptions.js
+
+const {
+	getDataByDateAndMeal,
+	getDataByDateAndTime,
+	getMealTypeByTime,
+	parseTime,
+	parseDateString,
+	shifts,
+	daysOfWeekEnglish,
+	daysOfWeekDutch,
+} = require('./openinghours');
+
+function isDateInRange(dateStr, startDateStr, endDateStr) {
+	const date = parseDateString(dateStr);
+	const startDate = parseDateString(startDateStr);
+	const endDate = parseDateString(endDateStr);
+	if (isNaN(date) || isNaN(startDate) || isNaN(endDate)) {
+	  return false;
+	}
+	return date >= startDate && date <= endDate;
+}
+
+function getDutchDayOfWeek(date) {
+	const dayIndex = date.getDay();
+	return daysOfWeekDutch[dayIndex];
+}
+
+function doesExceptionApply(exception, dateStr, dateDayOfWeekDutch, mealType) {
+	const { timeframe, startDate, endDate, daysOfWeek } = exception;
+
+	if (!isDateInRange(dateStr, startDate, endDate)) {
+	  return false;
+	}
+
+	if (Array.isArray(daysOfWeek) && daysOfWeek.length > 0) {
+	  const daysOfWeekLower = daysOfWeek.map(day => day.toLowerCase());
+	  if (!daysOfWeekLower.includes(dateDayOfWeekDutch)) {
+		return false;
+	  }
+	}
+
+	if (timeframe === 'Volledige Dag' || timeframe === mealType) {
+	  return true;
+	}
+
+	return false;
+}
+
+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;
+}
+
+function addDuurReservatieToEndTime(mealData, data) {
+  const duurReservatie = getDuurReservatie(data);
+  const endMinutes = parseTime(mealData.endTime);
+  const newEndMinutes = endMinutes + duurReservatie;
+  const hours = String(Math.floor(newEndMinutes / 60)).padStart(2, '0');
+  const minutes = String(newEndMinutes % 60).padStart(2, '0');
+  mealData.endTime = `${hours}:${minutes}`;
+}
+
+function mapExceptionToMealData(exception, data) {
+	let mealData = {
+	  enabled: true,
+	  startTime: exception.startHour,
+	  endTime: exception.endHour,
+	  maxCapacityEnabled: exception.maxSeats ? true : false,
+	  maxCapacity: exception.maxSeats || null,
+	  shiftsEnabled: false,
+	  shifts: [],
+	};
+
+	// Add duurReservatie to endTime
+	addDuurReservatieToEndTime(mealData, data);
+
+	return mealData;
+}
+
+function getDataByDateAndMealWithExceptions(data, dateStr, mealType) {
+	const exceptions = data.exceptions || [];
+	const date = parseDateString(dateStr);
+	if (isNaN(date)) {
+	  return null;
+	}
+	const dateDayOfWeekDutch = getDutchDayOfWeek(date).toLowerCase();
+
+	const exceptionTypesPriority = ['Opening', 'Sluiting', 'Uitzondering'];
+
+	for (const exceptionType of exceptionTypesPriority) {
+	  for (const exception of exceptions) {
+		if (exception.type === exceptionType) {
+		  if (doesExceptionApply(exception, dateStr, dateDayOfWeekDutch, mealType)) {
+			if (exceptionType === 'Sluiting') {
+			  return null;
+			} else {
+			  return mapExceptionToMealData(exception, data);
+			}
+		  }
+		}
+	  }
+	}
+
+	return getDataByDateAndMeal(data, dateStr, mealType);
+}
+
+function shouldIncludeEndTime(mealType, endTime) {
+	if ((mealType === 'breakfast' && endTime === '11:00') ||
+		(mealType === 'lunch' && endTime === '16:00')) {
+	  return false;
+	}
+	return true;
+}
+
+function getDataByDateAndTimeWithExceptions(data, dateStr, timeStr) {
+	const mealType = getMealTypeByTime(timeStr);
+	if (!mealType) {
+	  return null;
+	}
+	const mealData = getDataByDateAndMealWithExceptions(data, dateStr, mealType);
+	if (!mealData) {
+	  return null;
+	}
+
+	const requestedTime = parseTime(timeStr);
+	const startTime = parseTime(mealData.startTime);
+	const endTime = parseTime(mealData.endTime);
+
+	const includeEndTime = shouldIncludeEndTime(mealType, mealData.endTime);
+
+	const timeFallsWithin =
+	  includeEndTime
+		? requestedTime >= startTime && requestedTime <= endTime
+		: requestedTime >= startTime && requestedTime < endTime;
+
+	return timeFallsWithin ? mealData : null;
+}
+
+module.exports = {
+	getDataByDateAndMealWithExceptions,
+	getDataByDateAndTimeWithExceptions,
+};