@happychef/algorithm 1.3.2 → 1.3.5

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,
+};

package/restaurant_data/openinghours.js

@@ -1,142 +1,166 @@
-// index.js
-
-const daysOfWeekEnglish = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-const daysOfWeekDutch = ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'];
-
-const shifts = {
-  breakfast: { start: '07:00', end: '11:00' },
-  lunch: { start: '11:00', end: '16:00' },
-  dinner: { start: '16:00', end: '23:00' },
-};
-
-function parseTime(timeStr) {
-  const [hours, minutes] = timeStr.split(':').map(Number);
-  return hours * 60 + minutes;
-}
-
-/**
- * Parse a YYYY-MM-DD date string consistently across browsers.
- * Using new Date(dateStr) directly causes browser differences:
- * - Chrome parses "YYYY-MM-DD" as local midnight
- * - Firefox parses "YYYY-MM-DD" as UTC midnight
- * This function ensures consistent local time parsing.
- */
-function parseDateString(dateStr) {
-  if (!dateStr || typeof dateStr !== 'string') {
-    return new Date(NaN);
-  }
-  const [year, month, day] = dateStr.split('-').map(Number);
-  return new Date(year, month - 1, day);
-}
-
-function getMealTypeByTime(timeStr) {
-  const time = parseTime(timeStr);
-  for (const [mealType, shift] of Object.entries(shifts)) {
-    const start = parseTime(shift.start);
-    const end = parseTime(shift.end);
-    if (time >= start && time < end) {
-      return mealType;
-    }
-  }
-  return null;
-}
-
-function getDataByDayAndMeal(data, dayOfWeek, mealType) {
-  const mealKey = `openinghours-${mealType}`;
-  if (!data[mealKey]) {
-    return null;
-  }
-  const mealData = data[mealKey];
-  if (!mealData.schemeSettings) {
-    return null;
-  }
-  const dayData = mealData.schemeSettings[dayOfWeek];
-  if (!dayData) {
-    return null;
-  }
-  return { ...dayData };
-}
-
-function adjustMealData(mealData, generalSettings) {
-  if (mealData.maxCapacityEnabled === false) {
-    if (generalSettings && generalSettings.zitplaatsen) {
-      mealData.maxCapacity = generalSettings.zitplaatsen;
-      mealData.maxCapacityEnabled = true;
-    } else {
-      mealData.maxCapacity = '0';
-      mealData.maxCapacityEnabled = true;
-    }
-  }
-}
-
-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 getDataByDateAndMeal(data, dateStr, mealType) {
-  const date = parseDateString(dateStr);
-  if (isNaN(date)) {
-    return null;
-  }
-  const dayOfWeekIndex = date.getDay();
-  const dayOfWeek = daysOfWeekEnglish[dayOfWeekIndex];
-  let mealData = getDataByDayAndMeal(data, dayOfWeek, mealType);
-  if (!mealData || mealData.enabled !== true) {
-    return null;
-  }
-
-  adjustMealData(mealData, data['general-settings']);
-
-  // Add duurReservatie to endTime
-  addDuurReservatieToEndTime(mealData, data);
-
-  return mealData;
-}
-
-function getDataByDateAndTime(data, dateStr, timeStr) {
-  const mealType = getMealTypeByTime(timeStr);
-  if (!mealType) {
-    return null;
-  }
-  const mealData = getDataByDateAndMeal(data, dateStr, mealType);
-  if (!mealData) {
-    return null;
-  }
-  const requestedTime = parseTime(timeStr);
-  const startTime = parseTime(mealData.startTime);
-  const endTime = parseTime(mealData.endTime);
-  if (requestedTime >= startTime && requestedTime < endTime) {
-    return mealData;
-  } else {
-    return null;
-  }
-}
-
-module.exports = {
-  getDataByDayAndMeal,
-  getDataByDateAndMeal,
-  getDataByDateAndTime,
-  daysOfWeekEnglish,
-  daysOfWeekDutch,
-  getMealTypeByTime,
-  parseTime,
-  parseDateString,
-  shifts,
-};
+// index.js
+
+const daysOfWeekEnglish = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+const daysOfWeekDutch = ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'];
+
+const shifts = {
+  breakfast: { start: '07:00', end: '11:00' },
+  lunch: { start: '11:00', end: '16:00' },
+  dinner: { start: '16:00', end: '23:00' },
+};
+
+function parseTime(timeStr) {
+  const [hours, minutes] = timeStr.split(':').map(Number);
+  return hours * 60 + minutes;
+}
+
+/**
+ * Parse a YYYY-MM-DD date string consistently across browsers.
+ * Using new Date(dateStr) directly causes browser differences:
+ * - Chrome parses "YYYY-MM-DD" as local midnight
+ * - Firefox parses "YYYY-MM-DD" as UTC midnight
+ * This function ensures consistent local time parsing.
+ */
+function parseDateString(dateStr) {
+  if (!dateStr || typeof dateStr !== 'string') {
+    return new Date(NaN);
+  }
+  const [year, month, day] = dateStr.split('-').map(Number);
+  return new Date(year, month - 1, day);
+}
+
+function getMealTypeByTime(timeStr) {
+  const time = parseTime(timeStr);
+  for (const [mealType, shift] of Object.entries(shifts)) {
+    const start = parseTime(shift.start);
+    const end = parseTime(shift.end);
+    if (time >= start && time < end) {
+      return mealType;
+    }
+  }
+  // Times at or past dinner end are considered dinner (cross-midnight support for bowling)
+  const dinnerEnd = parseTime(shifts.dinner.end);
+  if (time >= dinnerEnd) {
+    return 'dinner';
+  }
+  return null;
+}
+
+function getDataByDayAndMeal(data, dayOfWeek, mealType) {
+  const mealKey = `openinghours-${mealType}`;
+  if (!data[mealKey]) {
+    return null;
+  }
+  const mealData = data[mealKey];
+  if (!mealData.schemeSettings) {
+    return null;
+  }
+  const dayData = mealData.schemeSettings[dayOfWeek];
+  if (!dayData) {
+    return null;
+  }
+  return { ...dayData };
+}
+
+function adjustMealData(mealData, generalSettings) {
+  if (mealData.maxCapacityEnabled === false) {
+    if (generalSettings && generalSettings.zitplaatsen) {
+      mealData.maxCapacity = generalSettings.zitplaatsen;
+      mealData.maxCapacityEnabled = true;
+    } else {
+      mealData.maxCapacity = '0';
+      mealData.maxCapacityEnabled = true;
+    }
+  }
+}
+
+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 getDataByDateAndMeal(data, dateStr, mealType) {
+  const date = parseDateString(dateStr);
+  if (isNaN(date)) {
+    return null;
+  }
+  const dayOfWeekIndex = date.getDay();
+  const dayOfWeek = daysOfWeekEnglish[dayOfWeekIndex];
+  let mealData = getDataByDayAndMeal(data, dayOfWeek, mealType);
+  if (!mealData || mealData.enabled !== true) {
+    return null;
+  }
+
+  adjustMealData(mealData, data['general-settings']);
+
+  // Extend dinner end time past midnight for bowling venues
+  const hoursOpenedPastMidnight = Number(mealData.hoursOpenedPastMidnight) || 0;
+  if (hoursOpenedPastMidnight > 0 && mealType === 'dinner') {
+    const newEndMinutes = 1440 + (hoursOpenedPastMidnight * 60); // midnight + hours
+    const hours = String(Math.floor(newEndMinutes / 60)).padStart(2, '0');
+    const minutes = String(newEndMinutes % 60).padStart(2, '0');
+    mealData.endTime = `${hours}:${minutes}`;
+  } else if (mealType === 'dinner') {
+    // For bowling accounts, ensure dinner extends to at least 24:00 (midnight)
+    const isBowling = data?.account_type === 'bowling' || data?.accountType === 'bowling' || data?.['general-settings']?.account_type === 'bowling';
+    console.log('[BOWLING DEBUG] mealType=dinner, account_type=', data?.account_type, 'accountType=', data?.accountType, 'gs.account_type=', data?.['general-settings']?.account_type, 'isBowling=', isBowling, 'endTime=', mealData.endTime);
+    if (isBowling) {
+      const currentEndMinutes = parseTime(mealData.endTime);
+      if (currentEndMinutes < 1440) {
+        mealData.endTime = '24:00';
+      }
+    }
+  }
+
+  // Add duurReservatie to endTime
+  addDuurReservatieToEndTime(mealData, data);
+
+  return mealData;
+}
+
+function getDataByDateAndTime(data, dateStr, timeStr) {
+  const mealType = getMealTypeByTime(timeStr);
+  if (!mealType) {
+    return null;
+  }
+  const mealData = getDataByDateAndMeal(data, dateStr, mealType);
+  if (!mealData) {
+    return null;
+  }
+  const requestedTime = parseTime(timeStr);
+  const startTime = parseTime(mealData.startTime);
+  const endTime = parseTime(mealData.endTime);
+  if (requestedTime >= startTime && requestedTime < endTime) {
+    return mealData;
+  } else {
+    return null;
+  }
+}
+
+module.exports = {
+  getDataByDayAndMeal,
+  getDataByDateAndMeal,
+  getDataByDateAndTime,
+  daysOfWeekEnglish,
+  daysOfWeekDutch,
+  getMealTypeByTime,
+  parseTime,
+  parseDateString,
+  shifts,
+};