ti2 1.0.125 → 1.0.127

package/controllers/__tests__/bookings-searchProducts.js

@@ -24,7 +24,7 @@ beforeAll(async () => {
   // Initialize utils once for the entire test file
   // Ensure all plugins needed across different describe blocks are listed here.
   globalUtils = await testUtils({
-    plugins: ['lockTestPlugin', 'travelgate'],
+    plugins: ['lockTestPlugin', 'travelgate', 'tourplannx'],
     pluginCapabilities: {
       lockTestPlugin: { weeklyProductCatalogSync: true },
       travelgate: { weeklyProductCatalogSync: true },
@@ -877,6 +877,42 @@ describe('user: bookings controller - searchProducts', () => {
   });
 });
 
+describe('Product option identifier lookup', () => {
+  it.each(['tourplannx', 'travelgate'])(
+    'preserves stored identifiers and applies the %s comparison policy',
+    async appName => {
+      const setup = await globalUtils.appSetup({ appName });
+      const plugin = globalPlugins.find(item => item.name === appName);
+      const products = [{
+        productId: 'supplier-1',
+        options: [
+          { optionId: 'ABCDEOPT   ROOM01' },
+          { optionId: 'ABCDELEV\tFEE001' },
+        ],
+      }];
+      plugin.searchProducts.mockResolvedValueOnce({ products });
+      const url = `/products/${appName}/${setup.userId}/${setup.hint}/search`;
+      const token = globalUtils.createUserToken(setup.userId);
+      await globalDoApiPost({ url, token, payload: {} });
+      plugin.searchProducts.mockClear();
+      const result = await globalDoApiPost({
+        url,
+        token,
+        payload: { optionId: ['ABCDEOPTROOM01', 'ABCDELEV FEE001'] },
+      });
+      expect(result.products).toEqual(appName === 'tourplannx' ? products : []);
+      expect(plugin.searchProducts).not.toHaveBeenCalled();
+      const exact = await globalDoApiPost({
+        url,
+        token,
+        payload: { optionId: 'ABCDEOPT   ROOM01', cacheOnly: true },
+      });
+      expect(exact.products[0].options).toEqual([products[0].options[0]]);
+      expect(products[0].options).toHaveLength(2);
+    },
+  );
+});
+
 describe('Bookings Product Search Lock Mechanism (Job Queuing on Stale Cache)', () => {
   let doApiPost;
   let lockTestPlugin; // Specific plugin instance for this suite

package/controllers/bookings.js

@@ -314,7 +314,7 @@ const confirmBooking = plugins => async (req, res, next) => {
   }
 };
 
-const $searchProductList = (products, searchInput = '', optionId = '') => {
+const $searchProductList = (products, searchInput = '', optionId = '', appKey = '') => {
   // NOTE: optionId could be a string or an array of strings
   // NOTE: searchInput should not appear at the same time as optionId
   const trimmedSearchInput = (searchInput || '').trim();
@@ -328,11 +328,16 @@ const $searchProductList = (products, searchInput = '', optionId = '') => {
   } ${R.path(['supplierId'], product) || ''}`;
   const inputValueLower = trimmedSearchInput.toLowerCase();
   const parts = inputValueLower.split(' ').filter(Boolean); // Filter out any empty strings just in case
+  const optionKey = value => appKey === 'tourplannx'
+    ? String(value || '').replace(/\s/g, '')
+    : value;
+  const requestedOptionIds = new Set(
+    (R.is(Array, optionId) ? optionId : [optionId]).map(optionKey),
+  );
   const pwFilteredOptions = products.map(product => {
     const filteredOptions = R.pathOr([], ['options'], product).filter(option => {
       if (optionId && optionId.length) {
-        const optionIdArr = R.is(Array, optionId) ? optionId : [optionId];
-        return optionIdArr.includes(R.path(['optionId'], option));
+        return requestedOptionIds.has(optionKey(R.path(['optionId'], option)));
       }
       const fullSearchStr = getFullSearchStr(product, option).toLowerCase();
       return parts.every(part => fullSearchStr.includes(part));
@@ -751,7 +756,7 @@ const $bookingsProductSearch = plugins => async ({
   // 0. `cacheOnly`: return current Ti2 cache or empty. Never call the plugin.
   if (cacheOnly) {
     if (hasProductCache(initialActualCacheContent)) {
-      const searchResults = $searchProductList(initialActualCacheContent.products, searchInput, optionId);
+      const searchResults = $searchProductList(initialActualCacheContent.products, searchInput, optionId, appKey);
       emitDecision('cache_hit', {
         reason: 'cacheOnly',
         cacheProductCount: initialActualCacheContent.products.length,
@@ -773,7 +778,7 @@ const $bookingsProductSearch = plugins => async ({
   // 1. `doNotCallPluginForProducts` is true, and not `forceRefresh`: Serve from cache or empty.
   if (doNotCallPluginForProducts && !forceRefresh) {
     if (hasProductCache(initialActualCacheContent)) {
-      const searchResults = $searchProductList(initialActualCacheContent.products, searchInput, optionId);
+      const searchResults = $searchProductList(initialActualCacheContent.products, searchInput, optionId, appKey);
       emitDecision('cache_hit', {
         reason: 'doNotCallPluginForProducts',
         cacheProductCount: initialActualCacheContent.products.length,
@@ -792,7 +797,7 @@ const $bookingsProductSearch = plugins => async ({
   if (forceRefresh) {
     emitDecision('force_refresh');
     const funcResults = await fetchFromPluginAndCache('force_refresh');
-    const searchResults = $searchProductList(funcResults.products, searchInput, optionId);
+    const searchResults = $searchProductList(funcResults.products, searchInput, optionId, appKey);
     return {
       ...funcResults,
       products: searchResults,
@@ -814,7 +819,7 @@ const $bookingsProductSearch = plugins => async ({
     const shouldSkipEmptyCache = cacheIsEmpty && searchFilterIsEmpty;
     if (!shouldSkipEmptyCache) {
       const returnCachedResults = (action = 'cache_hit', extra = {}) => {
-        const searchResults = $searchProductList(initialActualCacheContent.products, searchInput, optionId);
+        const searchResults = $searchProductList(initialActualCacheContent.products, searchInput, optionId, appKey);
         emitDecision(action, {
           cacheProductCount: initialActualCacheContent.products.length,
           cacheOptionCount: optionCount(initialActualCacheContent),
@@ -842,7 +847,7 @@ const $bookingsProductSearch = plugins => async ({
   // 4. No cache content (and not caught by previous conditions like forceRefresh or doNotCallPluginForProducts):
   //    Fetch from plugin. fetchFromPluginAndCache will handle caching.
   const funcResults = await fetchFromPluginAndCache('cache_miss');
-  const searchResults = $searchProductList(funcResults.products, searchInput, optionId);
+  const searchResults = $searchProductList(funcResults.products, searchInput, optionId, appKey);
   return {
     ...funcResults,
     products: searchResults,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.125",
+  "version": "1.0.127",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {

package/worker/__tests__/queue-remove.js

@@ -14,6 +14,7 @@ jest.mock('bull', () => jest.fn(() => mockQueue));
 jest.mock('ioredis', () => jest.fn(() => mockRedis));
 
 jest.resetModules();
+const Queue = require('bull');
 const { removeJob } = require('../queue');
 
 const occurrenceId = ({
@@ -26,6 +27,17 @@ const occurrenceId = ({
   return `repeat:${repeatHash}:${timestamp}`;
 };
 
+describe('queue settings', () => {
+  it('keeps long-running jobs locked while the worker is active', () => {
+    expect(Queue).toHaveBeenCalledWith('work', expect.any(String), {
+      settings: {
+        lockDuration: 120e3,
+        lockRenewTime: 15e3,
+      },
+    });
+  });
+});
+
 describe('removeJob', () => {
   beforeEach(() => {
     jest.clearAllMocks();

package/worker/queue.js

@@ -6,7 +6,12 @@ const Redis = require('ioredis');
 const REDIS_URL = process.env.REDIS_URL || 'redis://redis:6379';
 const itemsTTL = 3 * 60 * 60; // 3 hours
 
-const queue = new Queue('work', `${REDIS_URL}/0`);
+const queue = new Queue('work', `${REDIS_URL}/0`, {
+  settings: {
+    lockDuration: 120e3,
+    lockRenewTime: 15e3,
+  },
+});
 const redisResults = new Redis(`${REDIS_URL}/1`);
 
 const getPending = async () => {