@happychef/algorithm 1.2.29 → 1.2.30

package/assignTables.js

@@ -236,9 +236,11 @@ async function assignTablesIfPossible({
       }
     }
 
-    // 2) Get floors data directly from the restaurant document
-    let floorsData = restaurantSettings.floors;
-    if (!floorsData || !Array.isArray(floorsData) || floorsData.length === 0) {
+    // 2) Get floors data directly from the restaurant document (include manualFloors)
+    const regularFloors = Array.isArray(restaurantSettings.floors) ? restaurantSettings.floors : [];
+    const manualFloors = Array.isArray(restaurantSettings.manualFloors) ? restaurantSettings.manualFloors : [];
+    let floorsData = [...regularFloors, ...manualFloors];
+    if (floorsData.length === 0) {
       if (enforceTableAvailability) {
         throw new Error('No floors data found in restaurant document.');
       } else {
@@ -257,21 +259,31 @@ async function assignTablesIfPossible({
       }
     }
 
-    // 3) Helper to collect tables from floors
+    // 3) Helper to safely parse int from MongoDB $numberInt or plain value
+    function safeInt(val, fallback) {
+      if (val == null) return fallback;
+      const raw = (typeof val === 'object' && val.$numberInt != null) ? val.$numberInt : val;
+      const parsed = parseInt(raw, 10);
+      return isNaN(parsed) ? fallback : parsed;
+    }
+
+    // 4) Helper to collect tables from floors
     function collectTablesFromFloors(floors) {
       const tables = [];
       floors.forEach(floor => {
         if (floor.tables && Array.isArray(floor.tables)) {
           floor.tables.forEach(tbl => {
             if (tbl.objectType === "Tafel") {
+              const tableNumber = safeInt(tbl.tableNumber, null);
+              if (tableNumber == null) return; // skip tables without a number
               tables.push({
                 tableId: tbl.id,
-                tableNumber: parseInt(tbl.tableNumber.$numberInt || tbl.tableNumber),
-                minCapacity: parseInt(tbl.minCapacity.$numberInt || tbl.minCapacity),
-                maxCapacity: parseInt(tbl.maxCapacity.$numberInt || tbl.maxCapacity),
-                priority: parseInt(tbl.priority.$numberInt || tbl.priority),
-                x: parseInt(tbl.x.$numberInt || tbl.x),
-                y: parseInt(tbl.y.$numberInt || tbl.y),
+                tableNumber,
+                minCapacity: safeInt(tbl.minCapacity, 1),
+                maxCapacity: safeInt(tbl.maxCapacity, 99),
+                priority: safeInt(tbl.priority, 99),
+                x: safeInt(tbl.x, 0),
+                y: safeInt(tbl.y, 0),
                 isTemporary: tbl.isTemporary === true,
                 startDate: tbl.startDate || null,
                 endDate: tbl.endDate || null,

package/bundle_entry.js

@@ -96,5 +96,5 @@ globalThis.HappyAlgorithm = {
   },
 
   // Version info
-  VERSION: '1.2.28'
+  VERSION: '1.2.29'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happychef/algorithm",
-  "version": "1.2.29",
+  "version": "1.2.30",
   "description": "Restaurant and reservation algorithm utilities",
   "main": "index.js",
   "scripts": {

package/tableHelpers.js

@@ -72,63 +72,71 @@ function getFloorIdForSeatPlace(restaurantData, seatPlace) {
  * @param {string|null} selectedZitplaats - Optional seat place to filter by linked floor.
  * @returns {Array} An array of processed table objects.
  */
+/**
+ * Safely parse int from MongoDB $numberInt or plain value, with fallback.
+ */
+function safeInt(val, fallback) {
+    if (val == null) return fallback;
+    if (typeof val === 'object' && val !== null && val.$numberInt != null) {
+        const parsed = parseInt(val.$numberInt, 10);
+        return isNaN(parsed) ? fallback : parsed;
+    }
+    if (typeof val === 'number' && !isNaN(val)) return val;
+    const parsed = parseInt(val, 10);
+    return isNaN(parsed) ? fallback : parsed;
+}
+
 function getAllTables(restaurantData, selectedZitplaats) {
     let allTables = [];
-    if (restaurantData?.floors && Array.isArray(restaurantData.floors)) {
-        // If a zitplaats is specified and has a floor link, only use that floor
-        let floorsToUse = restaurantData.floors;
-        if (selectedZitplaats) {
-            const linkedFloorId = getFloorIdForSeatPlace(restaurantData, selectedZitplaats);
-            if (linkedFloorId) {
-                const linkedFloor = restaurantData.floors.find(f => f.id === linkedFloorId);
-                if (linkedFloor) {
-                    floorsToUse = [linkedFloor];
-                    console.log(`[getAllTables] Floor link found: zitplaats '${selectedZitplaats}' -> floor '${linkedFloorId}'`);
-                }
+    // Combine regular floors and manualFloors
+    const regularFloors = Array.isArray(restaurantData?.floors) ? restaurantData.floors : [];
+    const manualFloors = Array.isArray(restaurantData?.manualFloors) ? restaurantData.manualFloors : [];
+    let allFloors = [...regularFloors, ...manualFloors];
+
+    if (allFloors.length === 0) {
+        console.warn("Restaurant data is missing 'floors' array.");
+        return allTables;
+    }
+
+    // If a zitplaats is specified and has a floor link, only use that floor
+    let floorsToUse = allFloors;
+    if (selectedZitplaats) {
+        const linkedFloorId = getFloorIdForSeatPlace(restaurantData, selectedZitplaats);
+        if (linkedFloorId) {
+            const linkedFloor = allFloors.find(f => f.id === linkedFloorId);
+            if (linkedFloor) {
+                floorsToUse = [linkedFloor];
+                console.log(`[getAllTables] Floor link found: zitplaats '${selectedZitplaats}' -> floor '${linkedFloorId}'`);
             }
         }
+    }
 
-        floorsToUse.forEach(floor => {
-            if (floor?.tables && Array.isArray(floor.tables)) {
-                floor.tables.forEach(tbl => {
-                    // Ensure table number, capacities, priority exist before parsing
-                    const tableNumberRaw = tbl.tableNumber?.$numberInt ?? tbl.tableNumber;
-                    const minCapacityRaw = tbl.minCapacity?.$numberInt ?? tbl.minCapacity;
-                    const maxCapacityRaw = tbl.maxCapacity?.$numberInt ?? tbl.maxCapacity;
-                    const priorityRaw = tbl.priority?.$numberInt ?? tbl.priority;
-                    const xRaw = tbl.x?.$numberInt ?? tbl.x;
-                    const yRaw = tbl.y?.$numberInt ?? tbl.y;
-
-                    if (tbl.objectType === "Tafel" &&
-                        tableNumberRaw !== undefined &&
-                        minCapacityRaw !== undefined &&
-                        maxCapacityRaw !== undefined &&
-                        priorityRaw !== undefined &&
-                        xRaw !== undefined &&
-                        yRaw !== undefined)
-                    {
-                        allTables.push({
-                            tableId: tbl.id,
-                            tableNumber: parseInt(tableNumberRaw, 10),
-                            minCapacity: parseInt(minCapacityRaw, 10),
-                            maxCapacity: parseInt(maxCapacityRaw, 10),
-                            priority: parseInt(priorityRaw, 10),
-                            x: parseInt(xRaw, 10),
-                            y: parseInt(yRaw, 10),
-                            isTemporary: tbl.isTemporary === true, // Ensure boolean
-                            startDate: tbl.startDate || null, // Expects 'YYYY-MM-DD'
-                            endDate: tbl.endDate || null,     // Expects 'YYYY-MM-DD'
-                            application: tbl.application || null // Expects 'breakfast', 'lunch', or 'dinner'
-                        });
-                    } else if (tbl.objectType === "Tafel") {
-                        console.warn(`Skipping table due to missing essential properties: ${JSON.stringify(tbl)}`);
+    floorsToUse.forEach(floor => {
+        if (floor?.tables && Array.isArray(floor.tables)) {
+            floor.tables.forEach(tbl => {
+                if (tbl.objectType === "Tafel") {
+                    const tableNumber = safeInt(tbl.tableNumber, NaN);
+                    if (isNaN(tableNumber)) {
+                        console.warn(`Skipping table without valid tableNumber: ${JSON.stringify(tbl)}`);
+                        return;
                     }
-                });
-            }
-        });
-    } else {
-        console.warn("Restaurant data is missing 'floors' array.");
-    }
+                    allTables.push({
+                        tableId: tbl.id,
+                        tableNumber,
+                        minCapacity: safeInt(tbl.minCapacity, 1),
+                        maxCapacity: safeInt(tbl.maxCapacity, 99),
+                        priority: safeInt(tbl.priority, 99),
+                        x: safeInt(tbl.x, 0),
+                        y: safeInt(tbl.y, 0),
+                        isTemporary: tbl.isTemporary === true,
+                        startDate: tbl.startDate || null,
+                        endDate: tbl.endDate || null,
+                        application: tbl.application || null
+                    });
+                }
+            });
+        }
+    });
 
     // Sort tables
     allTables.sort((a, b) => {
@@ -136,22 +144,11 @@ function getAllTables(restaurantData, selectedZitplaats) {
             return a.maxCapacity - b.maxCapacity;
         }
         if (a.priority !== b.priority) {
-            // Assuming lower priority number means higher priority
             return a.priority - b.priority;
         }
         return a.minCapacity - b.minCapacity;
     });
 
-    // Filter out tables where parsing failed (resulted in NaN)
-     allTables = allTables.filter(t =>
-        !isNaN(t.tableNumber) &&
-        !isNaN(t.minCapacity) &&
-        !isNaN(t.maxCapacity) &&
-        !isNaN(t.priority) &&
-        !isNaN(t.x) &&
-        !isNaN(t.y)
-    );
-
     return allTables;
 }