ti2 1.0.119 → 1.0.120

package/controllers/__tests__/bookings-searchProducts.js

@@ -872,6 +872,85 @@ describe('Bookings Product Search Lock Mechanism (Job Queuing on Stale Cache)',
     expect(addJob).not.toHaveBeenCalled();
   });
 
+  it('does not save a cold optionId hydration as the full product catalog', async () => {
+    await clearProductSearchCache();
+
+    const scopedProducts = [{
+      productId: 'scoped-product',
+      productName: 'Scoped Product',
+      options: [{
+        optionId: 'scoped-option',
+        optionName: 'Scoped Option',
+      }],
+    }];
+    const fullCatalog = [{
+      productId: 'catalog-product',
+      productName: 'Catalog Product',
+      options: [{
+        optionId: 'catalog-option',
+        optionName: 'Catalog Option',
+      }],
+    }];
+    const emitSpy = jest.spyOn(lockTestPlugin.events, 'emit');
+    lockTestPlugin.searchProducts
+      .mockResolvedValueOnce({ products: scopedProducts })
+      .mockResolvedValueOnce({ products: fullCatalog });
+
+    const scopedResult = await doApiPost({
+      url: `/products/${testAppName}/${testUserId}/${ttrTestHint}/search`,
+      token: userToken,
+      payload: { optionId: ['scoped-option'] },
+    });
+    const catalogResult = await makeProductSearchRequest();
+
+    expect(scopedResult.products).toEqual(scopedProducts);
+    expect(catalogResult.products).toEqual(fullCatalog);
+    expect(lockTestPlugin.searchProducts).toHaveBeenCalledTimes(2);
+    expect(lockTestPlugin.searchProducts.mock.calls[0][0].payload.optionId).toEqual([
+      'scoped-option',
+    ]);
+    expect(lockTestPlugin.searchProducts.mock.calls[1][0].payload.optionId).toBeUndefined();
+    expect(emitSpy).toHaveBeenCalledWith(
+      'bookingsProductSearch:cache:decision',
+      expect.objectContaining({
+        action: 'scoped_result_not_cached',
+        returnedProductCount: scopedProducts.length,
+        returnedOptionCount: 1,
+      }),
+    );
+    emitSpy.mockRestore();
+  });
+
+  it('queues an unscoped refresh when an optionId request finds stale catalog data', async () => {
+    await clearProductSearchCache();
+    const cachedProducts = [{
+      productId: 'cached-product',
+      productName: 'Cached Product',
+      options: [{
+        optionId: 'cached-option',
+        optionName: 'Cached Option',
+      }],
+    }];
+    lockTestPlugin.searchProducts.mockResolvedValueOnce({ products: cachedProducts });
+    await makeProductSearchRequest();
+    lockTestPlugin.searchProducts.mockClear();
+    addJob.mockClear();
+    await new Promise(resolve => {
+      setTimeout(resolve, 1500);
+    });
+
+    const result = await doApiPost({
+      url: `/products/${testAppName}/${testUserId}/${ttrTestHint}/search`,
+      token: userToken,
+      payload: { optionId: ['cached-option'] },
+    });
+
+    expect(result.products).toEqual(cachedProducts);
+    expect(lockTestPlugin.searchProducts).not.toHaveBeenCalled();
+    expect(addJob).toHaveBeenCalledTimes(1);
+    expect(addJob.mock.calls[0][0].payload.payload).toEqual({ forceRefresh: false });
+  });
+
   it('concurrent forceRefresh requests should wait for one plugin fetch', async () => {
     await clearProductSearchCache();
 

package/controllers/bookings.js

@@ -52,8 +52,29 @@ const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 
 const productSearchCacheKey = ({ userId, hint }) => hash({ userId, hint, operationId: productSearchOperationId });
 
+const productSearchSelectorFields = [
+  'searchInput',
+  'optionId',
+  'productId',
+  'productName',
+  'lastUpdatedFrom',
+  'skipAccommodation',
+];
+
+const hasProductSearchSelector = payload => productSearchSelectorFields.some(field => {
+  const value = R.path([field], payload);
+  if (Array.isArray(value)) return value.length > 0;
+  if (typeof value === 'string') return Boolean(value.trim());
+  return value !== undefined && value !== null && value !== false;
+});
+
 const productCount = value => R.pathOr([], ['products'], value).length;
 
+const optionCount = value => R.pathOr([], ['products'], value).reduce(
+  (count, product) => count + R.pathOr([], ['options'], product).length,
+  0,
+);
+
 const hasProductCache = cacheContent => Boolean(cacheContent && cacheContent.products);
 
 const safeHash = value => (value === undefined || value === null ? undefined : hash(String(value)));
@@ -291,7 +312,11 @@ const $bookingsProductSearch = plugins => async ({
 
   // Payload for the plugin function (func) - pass forceRefresh so plugins can trigger background cache rebuilds
   const payloadForPlugin = { ...R.omit(['forceRefresh'], originalRequestBody), forceRefresh };
-  const payloadForBackgroundJob = R.omit(['credentials'], payloadForPlugin);
+  const isScopedSearch = hasProductSearchSelector(originalRequestBody);
+  const payloadForBackgroundJob = R.omit(
+    ['credentials', ...productSearchSelectorFields],
+    payloadForPlugin,
+  );
 
   const { app, token } = await getAppAndToken({ plugins, appKey, userId, hint });
   assert(userId, 'userId is required');
@@ -359,6 +384,26 @@ const $bookingsProductSearch = plugins => async ({
 
   // Helper function to call the plugin, save cache, and return results
   const fetchFromPluginAndCache = async (reason = 'cache_miss') => {
+    if (isScopedSearch) {
+      const pluginStartedAt = Date.now();
+      const pluginResults = await func({
+        axios,
+        token,
+        payload: payloadForPlugin,
+        typeDefsAndQueries,
+        requestId,
+        userId,
+        hint,
+      });
+      emitDecision('scoped_result_not_cached', {
+        reason,
+        pluginElapsedMs: Date.now() - pluginStartedAt,
+        returnedProductCount: productCount(pluginResults),
+        returnedOptionCount: optionCount(pluginResults),
+      });
+      return pluginResults || { products: [] };
+    }
+
     const lockOwnerToken = crypto.randomBytes(16).toString('hex');
     const lockStartedAt = Date.now();
     const lockAcquired = await acquirePluginExecutionLock(lockOwnerToken);

package/package.json

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