@happychef/algorithm 1.2.14 → 1.2.15

package/__tests__/tableHelpers.test.js

@@ -1,247 +1,247 @@
-const {
-  parseTime,
-  getMealTypeByTime,
-  getAllTables,
-  isTemporaryTableValid,
-  shifts
-} = require('../tableHelpers');
-
-describe('tableHelpers - parseTime', () => {
-  test('should parse valid time string correctly', () => {
-    expect(parseTime('12:30')).toBe(750); // 12*60 + 30 = 750
-    expect(parseTime('00:00')).toBe(0);
-    expect(parseTime('23:59')).toBe(1439);
-  });
-
-  test('should return NaN for invalid time strings', () => {
-    expect(parseTime('')).toBeNaN();
-    expect(parseTime(null)).toBeNaN();
-    expect(parseTime(undefined)).toBeNaN();
-    expect(parseTime('25:00')).toBeNaN(); // Invalid hour
-    expect(parseTime('12:60')).toBeNaN(); // Invalid minute
-    expect(parseTime('12')).toBeNaN(); // Missing colon
-    expect(parseTime('ab:cd')).toBeNaN(); // Not numbers
-  });
-
-  test('should handle edge cases', () => {
-    expect(parseTime('0:0')).toBe(0);
-    expect(parseTime('1:1')).toBe(61);
-  });
-});
-
-describe('tableHelpers - getMealTypeByTime', () => {
-  test('should identify breakfast times correctly', () => {
-    expect(getMealTypeByTime('07:00')).toBe('breakfast');
-    expect(getMealTypeByTime('09:30')).toBe('breakfast');
-    expect(getMealTypeByTime('10:59')).toBe('breakfast');
-  });
-
-  test('should identify lunch times correctly', () => {
-    expect(getMealTypeByTime('11:00')).toBe('lunch');
-    expect(getMealTypeByTime('12:30')).toBe('lunch');
-    expect(getMealTypeByTime('15:59')).toBe('lunch');
-  });
-
-  test('should identify dinner times correctly', () => {
-    expect(getMealTypeByTime('16:00')).toBe('dinner');
-    expect(getMealTypeByTime('18:30')).toBe('dinner');
-    expect(getMealTypeByTime('22:59')).toBe('dinner');
-  });
-
-  test('should return null for times outside defined shifts', () => {
-    expect(getMealTypeByTime('06:59')).toBeNull();
-    expect(getMealTypeByTime('23:00')).toBeNull();
-    expect(getMealTypeByTime('02:00')).toBeNull();
-  });
-
-  test('should return null for invalid time strings', () => {
-    expect(getMealTypeByTime('invalid')).toBeNull();
-    expect(getMealTypeByTime('')).toBeNull();
-    expect(getMealTypeByTime(null)).toBeNull();
-  });
-});
-
-describe('tableHelpers - getAllTables', () => {
-  test('should extract tables correctly from restaurant data', () => {
-    const restaurantData = {
-      floors: [
-        {
-          tables: [
-            {
-              objectType: 'Tafel',
-              id: 'table1',
-              tableNumber: 1,
-              minCapacity: 2,
-              maxCapacity: 4,
-              priority: 1,
-              x: 10,
-              y: 20,
-              isTemporary: false
-            },
-            {
-              objectType: 'Tafel',
-              id: 'table2',
-              tableNumber: { $numberInt: '2' },
-              minCapacity: { $numberInt: '4' },
-              maxCapacity: { $numberInt: '6' },
-              priority: { $numberInt: '2' },
-              x: { $numberInt: '30' },
-              y: { $numberInt: '40' },
-              isTemporary: false
-            }
-          ]
-        }
-      ]
-    };
-
-    const tables = getAllTables(restaurantData);
-    expect(tables).toHaveLength(2);
-    expect(tables[0].tableNumber).toBe(1);
-    expect(tables[0].maxCapacity).toBe(4);
-    expect(tables[1].tableNumber).toBe(2);
-    expect(tables[1].maxCapacity).toBe(6);
-  });
-
-  test('should sort tables by maxCapacity, priority, and minCapacity', () => {
-    const restaurantData = {
-      floors: [
-        {
-          tables: [
-            {
-              objectType: 'Tafel',
-              id: 'table1',
-              tableNumber: 1,
-              minCapacity: 2,
-              maxCapacity: 6,
-              priority: 1,
-              x: 10,
-              y: 20
-            },
-            {
-              objectType: 'Tafel',
-              id: 'table2',
-              tableNumber: 2,
-              minCapacity: 2,
-              maxCapacity: 4,
-              priority: 1,
-              x: 30,
-              y: 40
-            }
-          ]
-        }
-      ]
-    };
-
-    const tables = getAllTables(restaurantData);
-    expect(tables[0].tableNumber).toBe(2); // Smaller maxCapacity comes first
-    expect(tables[1].tableNumber).toBe(1);
-  });
-
-  test('should handle empty or missing data gracefully', () => {
-    expect(getAllTables({})).toEqual([]);
-    expect(getAllTables({ floors: [] })).toEqual([]);
-    expect(getAllTables(null)).toEqual([]);
-  });
-
-  test('should filter out non-Tafel objects', () => {
-    const restaurantData = {
-      floors: [
-        {
-          tables: [
-            {
-              objectType: 'Wall',
-              id: 'wall1',
-              tableNumber: 1
-            },
-            {
-              objectType: 'Tafel',
-              id: 'table1',
-              tableNumber: 2,
-              minCapacity: 2,
-              maxCapacity: 4,
-              priority: 1,
-              x: 10,
-              y: 20
-            }
-          ]
-        }
-      ]
-    };
-
-    const tables = getAllTables(restaurantData);
-    expect(tables).toHaveLength(1);
-    expect(tables[0].tableNumber).toBe(2);
-  });
-});
-
-describe('tableHelpers - isTemporaryTableValid', () => {
-  test('should return true for non-temporary tables', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: false
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
-  });
-
-  test('should validate temporary table within date range and correct meal type', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
-  });
-
-  test('should reject temporary table outside date range', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-07-01', '12:00')).toBe(false);
-    expect(isTemporaryTableValid(table, '2025-05-31', '12:00')).toBe(false);
-  });
-
-  test('should reject temporary table with wrong meal type', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'dinner'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false); // lunch time
-  });
-
-  test('should reject temporary table with missing date range', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false);
-  });
-
-  test('should reject temporary table with invalid time', () => {
-    const table = {
-      tableNumber: 1,
-      isTemporary: true,
-      startDate: '2025-06-01',
-      endDate: '2025-06-30',
-      application: 'lunch'
-    };
-    expect(isTemporaryTableValid(table, '2025-06-15', 'invalid')).toBe(false);
-  });
-});
-
-describe('tableHelpers - shifts constant', () => {
-  test('should have correct shift definitions', () => {
-    expect(shifts.breakfast).toEqual({ start: '07:00', end: '11:00' });
-    expect(shifts.lunch).toEqual({ start: '11:00', end: '16:00' });
-    expect(shifts.dinner).toEqual({ start: '16:00', end: '23:00' });
-  });
-});
+const {
+  parseTime,
+  getMealTypeByTime,
+  getAllTables,
+  isTemporaryTableValid,
+  shifts
+} = require('../tableHelpers');
+
+describe('tableHelpers - parseTime', () => {
+  test('should parse valid time string correctly', () => {
+    expect(parseTime('12:30')).toBe(750); // 12*60 + 30 = 750
+    expect(parseTime('00:00')).toBe(0);
+    expect(parseTime('23:59')).toBe(1439);
+  });
+
+  test('should return NaN for invalid time strings', () => {
+    expect(parseTime('')).toBeNaN();
+    expect(parseTime(null)).toBeNaN();
+    expect(parseTime(undefined)).toBeNaN();
+    expect(parseTime('25:00')).toBeNaN(); // Invalid hour
+    expect(parseTime('12:60')).toBeNaN(); // Invalid minute
+    expect(parseTime('12')).toBeNaN(); // Missing colon
+    expect(parseTime('ab:cd')).toBeNaN(); // Not numbers
+  });
+
+  test('should handle edge cases', () => {
+    expect(parseTime('0:0')).toBe(0);
+    expect(parseTime('1:1')).toBe(61);
+  });
+});
+
+describe('tableHelpers - getMealTypeByTime', () => {
+  test('should identify breakfast times correctly', () => {
+    expect(getMealTypeByTime('07:00')).toBe('breakfast');
+    expect(getMealTypeByTime('09:30')).toBe('breakfast');
+    expect(getMealTypeByTime('10:59')).toBe('breakfast');
+  });
+
+  test('should identify lunch times correctly', () => {
+    expect(getMealTypeByTime('11:00')).toBe('lunch');
+    expect(getMealTypeByTime('12:30')).toBe('lunch');
+    expect(getMealTypeByTime('15:59')).toBe('lunch');
+  });
+
+  test('should identify dinner times correctly', () => {
+    expect(getMealTypeByTime('16:00')).toBe('dinner');
+    expect(getMealTypeByTime('18:30')).toBe('dinner');
+    expect(getMealTypeByTime('22:59')).toBe('dinner');
+  });
+
+  test('should return null for times outside defined shifts', () => {
+    expect(getMealTypeByTime('06:59')).toBeNull();
+    expect(getMealTypeByTime('23:00')).toBeNull();
+    expect(getMealTypeByTime('02:00')).toBeNull();
+  });
+
+  test('should return null for invalid time strings', () => {
+    expect(getMealTypeByTime('invalid')).toBeNull();
+    expect(getMealTypeByTime('')).toBeNull();
+    expect(getMealTypeByTime(null)).toBeNull();
+  });
+});
+
+describe('tableHelpers - getAllTables', () => {
+  test('should extract tables correctly from restaurant data', () => {
+    const restaurantData = {
+      floors: [
+        {
+          tables: [
+            {
+              objectType: 'Tafel',
+              id: 'table1',
+              tableNumber: 1,
+              minCapacity: 2,
+              maxCapacity: 4,
+              priority: 1,
+              x: 10,
+              y: 20,
+              isTemporary: false
+            },
+            {
+              objectType: 'Tafel',
+              id: 'table2',
+              tableNumber: { $numberInt: '2' },
+              minCapacity: { $numberInt: '4' },
+              maxCapacity: { $numberInt: '6' },
+              priority: { $numberInt: '2' },
+              x: { $numberInt: '30' },
+              y: { $numberInt: '40' },
+              isTemporary: false
+            }
+          ]
+        }
+      ]
+    };
+
+    const tables = getAllTables(restaurantData);
+    expect(tables).toHaveLength(2);
+    expect(tables[0].tableNumber).toBe(1);
+    expect(tables[0].maxCapacity).toBe(4);
+    expect(tables[1].tableNumber).toBe(2);
+    expect(tables[1].maxCapacity).toBe(6);
+  });
+
+  test('should sort tables by maxCapacity, priority, and minCapacity', () => {
+    const restaurantData = {
+      floors: [
+        {
+          tables: [
+            {
+              objectType: 'Tafel',
+              id: 'table1',
+              tableNumber: 1,
+              minCapacity: 2,
+              maxCapacity: 6,
+              priority: 1,
+              x: 10,
+              y: 20
+            },
+            {
+              objectType: 'Tafel',
+              id: 'table2',
+              tableNumber: 2,
+              minCapacity: 2,
+              maxCapacity: 4,
+              priority: 1,
+              x: 30,
+              y: 40
+            }
+          ]
+        }
+      ]
+    };
+
+    const tables = getAllTables(restaurantData);
+    expect(tables[0].tableNumber).toBe(2); // Smaller maxCapacity comes first
+    expect(tables[1].tableNumber).toBe(1);
+  });
+
+  test('should handle empty or missing data gracefully', () => {
+    expect(getAllTables({})).toEqual([]);
+    expect(getAllTables({ floors: [] })).toEqual([]);
+    expect(getAllTables(null)).toEqual([]);
+  });
+
+  test('should filter out non-Tafel objects', () => {
+    const restaurantData = {
+      floors: [
+        {
+          tables: [
+            {
+              objectType: 'Wall',
+              id: 'wall1',
+              tableNumber: 1
+            },
+            {
+              objectType: 'Tafel',
+              id: 'table1',
+              tableNumber: 2,
+              minCapacity: 2,
+              maxCapacity: 4,
+              priority: 1,
+              x: 10,
+              y: 20
+            }
+          ]
+        }
+      ]
+    };
+
+    const tables = getAllTables(restaurantData);
+    expect(tables).toHaveLength(1);
+    expect(tables[0].tableNumber).toBe(2);
+  });
+});
+
+describe('tableHelpers - isTemporaryTableValid', () => {
+  test('should return true for non-temporary tables', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: false
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
+  });
+
+  test('should validate temporary table within date range and correct meal type', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(true);
+  });
+
+  test('should reject temporary table outside date range', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-07-01', '12:00')).toBe(false);
+    expect(isTemporaryTableValid(table, '2025-05-31', '12:00')).toBe(false);
+  });
+
+  test('should reject temporary table with wrong meal type', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'dinner'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false); // lunch time
+  });
+
+  test('should reject temporary table with missing date range', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', '12:00')).toBe(false);
+  });
+
+  test('should reject temporary table with invalid time', () => {
+    const table = {
+      tableNumber: 1,
+      isTemporary: true,
+      startDate: '2025-06-01',
+      endDate: '2025-06-30',
+      application: 'lunch'
+    };
+    expect(isTemporaryTableValid(table, '2025-06-15', 'invalid')).toBe(false);
+  });
+});
+
+describe('tableHelpers - shifts constant', () => {
+  test('should have correct shift definitions', () => {
+    expect(shifts.breakfast).toEqual({ start: '07:00', end: '11:00' });
+    expect(shifts.lunch).toEqual({ start: '11:00', end: '16:00' });
+    expect(shifts.dinner).toEqual({ start: '16:00', end: '23:00' });
+  });
+});

package/assignTables.js

@@ -416,18 +416,19 @@ async function assignTablesIfPossible({
       return false;
     }
 
-    // 11) Try preferred floor first (if specified), then fall back to all floors
+    // 11) If a linked floor is specified for the Zitplaats, ONLY use that floor (no fallback)
     if (preferredFloorTables && preferredFloorTables.length > 0) {
-      console.log(`[Zitplaats] Trying preferred floor first (${preferredFloorTables.length} tables)`);
-      if (tryAssignTables(preferredFloorTables, 'PreferredFloor')) {
-        return; // Success on preferred floor
+      console.log(`[Zitplaats] Trying linked floor only (${preferredFloorTables.length} tables)`);
+      if (tryAssignTables(preferredFloorTables, 'LinkedFloor')) {
+        return; // Success on linked floor
+      }
+      console.log(`[Zitplaats] No availability on linked floor - not falling back to other floors`);
+      // Do NOT fall back to all floors when a floor link is specified
+    } else {
+      // 12) Try all floors only when no floor link is specified
+      if (tryAssignTables(allTables, 'AllFloors')) {
+        return; // Success
       }
-      console.log(`[Zitplaats] No availability on preferred floor, falling back to all floors`);
-    }
-
-    // 12) Try all floors
-    if (tryAssignTables(allTables, 'AllFloors')) {
-      return; // Success
     }
 
     // 13) No valid table combo found 

package/changes/2026/January/PR11_add__change.md

@@ -0,0 +1,20 @@
+# PR 11 - Duration
+
+**Actions:** 
+
+## Changes Summary
+ADDED:
+- New function `duration(start, end)` added to calculate the time difference between two datetime strings.
+- New import `datetime` from the `datetime` module to support date and time operations.
+
+NO_REMOVALS
+
+CHANGED:
+- Modified the `getAvailableTimeblocks` function to change the calculation of `uurOpVoorhand` from `4` to `0`, affecting the time window for available timeblocks.
+- Updated the `getAvailableTimeblocks` function to adjust the `duration` parameter handling, now using `duration` directly instead of a hardcoded value, impacting the timeblock duration logic.
+
+---
+
+**Author:** Fakhar-Rashid
+**Date:** 2026-01-13
+**PR Link:** https://github.com/thibaultvandesompele2/15-happy-algorithm/pull/11

package/jest.config.js

@@ -1,23 +1,23 @@
-module.exports = {
-  testEnvironment: 'node',
-  coverageDirectory: 'coverage',
-  collectCoverageFrom: [
-    '**/*.js',
-    '!**/node_modules/**',
-    '!**/coverage/**',
-    '!jest.config.js',
-    '!test.js',
-    '!test-*.js',
-    '!**/__tests__/**'
-  ],
-  testMatch: [
-    '**/__tests__/**/*.test.js'
-  ],
-  testPathIgnorePatterns: [
-    '/node_modules/',
-    '/test\\.js$',
-    '/test-.*\\.js$'
-  ],
-  verbose: true,
-  testTimeout: 10000
-};
+module.exports = {
+  testEnvironment: 'node',
+  coverageDirectory: 'coverage',
+  collectCoverageFrom: [
+    '**/*.js',
+    '!**/node_modules/**',
+    '!**/coverage/**',
+    '!jest.config.js',
+    '!test.js',
+    '!test-*.js',
+    '!**/__tests__/**'
+  ],
+  testMatch: [
+    '**/__tests__/**/*.test.js'
+  ],
+  testPathIgnorePatterns: [
+    '/node_modules/',
+    '/test\\.js$',
+    '/test-.*\\.js$'
+  ],
+  verbose: true,
+  testTimeout: 10000
+};

package/package.json

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