ti2 1.0.122 → 1.0.123

package/index.js

@@ -60,6 +60,7 @@ const axiosSafeResponse = response => {
 
 module.exports = async ({
   apiDocs = true,
+  pluginCapabilities: pluginCapabilitiesParam = {},
   plugins: pluginsParam = {},
   pluginsInstantiated = false,
   port: portParam,
@@ -83,7 +84,7 @@ module.exports = async ({
     // Create a new axios instance for this plugin and configure SSL if needed
     const pluginAxios = axios.create();
     configureAxiosSSL(pluginAxios, process.env.SSL_INSECURE_ALLOWED_DOMAINS);
-    
+
     const pluginInstance = await new Plugin({
       cache: {
         drop: args => cache.drop({ ...args, pluginName }),
@@ -99,9 +100,18 @@ module.exports = async ({
       events: ti2Events,
       name: pluginName,
       ...params,
+      capabilities: R.pathOr({}, [pluginName], pluginCapabilitiesParam),
     });
     return pluginInstance;
   });
+  plugins.forEach(plugin => {
+    const configuredCapabilities = R.path([plugin.name], pluginCapabilitiesParam);
+    Object.assign(plugin, {
+      capabilities: configuredCapabilities === undefined
+        ? plugin.capabilities || {}
+        : configuredCapabilities,
+    });
+  });
   if (worker) {
     return require('./worker/index')({ plugins });
   }

package/package.json

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

package/worker/__tests__/job-api.js

@@ -52,12 +52,17 @@ jest.mock('../queue', () => {
       })
     },
     addJob: jest.fn().mockResolvedValue('test-job-id'),
-    allDone: jest.fn().mockResolvedValue(true)
+    allDone: jest.fn().mockResolvedValue(true),
+    saveResult: jest.fn().mockResolvedValue(undefined),
   };
 });
 
 // Import the mocked queue and the actual worker module
-const { addJob, queue, allDone } = require('../queue');
+const {
+  addJob,
+  queue,
+  saveResult,
+} = require('../queue');
 const actualWorkerModule = require('../index'); // Actual worker module
 
 describe('worker: API job handling', () => {
@@ -86,7 +91,10 @@ describe('worker: API job handling', () => {
     axios.mockImplementation(config => {
       // This mock is for the internal axios call made by the worker
       if (config.url && config.url.includes('/products/testAppKey/testUserId/testTokenHint/search')) {
-        return Promise.resolve({ status: 200, data: { success: true, message: 'Mocked internal success' } });
+        return Promise.resolve({
+          status: 200,
+          data: { success: true, products: [{ productId: 'incidental-product' }] },
+        });
       }
       console.error('Unexpected axios call to mock:', config);
       return Promise.reject(new Error(`Unexpected axios call in mock for URL: ${config.url}`));
@@ -117,6 +125,10 @@ describe('worker: API job handling', () => {
     actualJobHandler = null; // Clear captured handler
   });
 
+  beforeEach(() => {
+    saveResult.mockClear();
+  });
+
   it('should create a job of type "api" for the product search endpoint and send it to the API server', async () => {
     
     // 1. Test that we can create a job
@@ -169,5 +181,45 @@ describe('worker: API job handling', () => {
         }),
       })
     );
+    expect(saveResult).toHaveBeenCalledWith({
+      id: jobId,
+      resultValue: expect.objectContaining({
+        ti2CatalogProductCount: null,
+        ti2ReturnedProductCount: null,
+      }),
+    });
+  });
+
+  it('reports committed and returned counts for a full catalog refresh', async () => {
+    axios.mockResolvedValueOnce({
+      status: 200,
+      data: {
+        products: [],
+        catalogRefreshOutcome: 'empty_result_preserved_cache',
+        cacheUpdated: false,
+        cachePreserved: true,
+        cachedProductCount: 7,
+      },
+    });
+    const job = {
+      id: 'catalog-refresh-job',
+      data: {
+        type: 'api',
+        method: 'POST',
+        url: '/products/testAppKey/testUserId/testTokenHint/search',
+        headers: { 'content-type': 'application/json' },
+        payload: { forceRefresh: true, backgroundJob: true },
+      },
+    };
+
+    await actualJobHandler(job);
+
+    expect(saveResult).toHaveBeenCalledWith({
+      id: job.id,
+      resultValue: expect.objectContaining({
+        ti2CatalogProductCount: 7,
+        ti2ReturnedProductCount: 0,
+      }),
+    });
   });
 });

package/worker/__tests__/job-plugin.js

@@ -27,7 +27,7 @@ const mockBookingsPostProcessAction = jest.fn();
 jest.mock('../../controllers/bookings', () => {
   return jest.fn(() => ({
     // This action name must match what's in job.data.postProcess.action
-    $updateProductSearchCache: mockBookingsPostProcessAction,
+    $postProcessAction: mockBookingsPostProcessAction,
     // Add other methods if the worker's initialization of bookingsCtrl calls them
   }));
 });
@@ -111,7 +111,7 @@ describe('worker: Plugin job handling', () => {
       inTesting: true,
       postProcess: {
         controller: 'bookings',
-        action: '$updateProductSearchCache', // Must match the mocked action name in bookings mock
+        action: '$postProcessAction',
         args: { staticArg1: 'value1', appKey: mockPluginName }, // Static args for postProcess
       },
     };
@@ -192,7 +192,7 @@ describe('worker: Plugin job handling', () => {
       inTesting: true,
       postProcess: {
         controller: 'bookings',
-        action: '$updateProductSearchCache',
+        action: '$postProcessAction',
         args: { appKey: mockPluginName },
       },
     };

package/worker/index.js

@@ -100,7 +100,22 @@ const worker = ({ plugins: pluginsParam }) => { // pluginsParam are instantiated
               jobLog(`Worker internal server for job ${jobId} closed.`);
             }
           }
-          resultValue = { code, result, success: code >= 200 && code < 300 };
+          const isCatalogRefreshResult = Boolean(
+            result && typeof result.catalogRefreshOutcome === 'string',
+          );
+          const returnedProducts = isCatalogRefreshResult && result.products;
+          resultValue = {
+            code,
+            result,
+            success: code >= 200 && code < 300,
+            ti2CatalogProductCount: isCatalogRefreshResult
+              && Number.isInteger(result.cachedProductCount)
+              ? result.cachedProductCount
+              : null,
+            ti2ReturnedProductCount: Array.isArray(returnedProducts)
+              ? returnedProducts.length
+              : null,
+          };
 
         } else if (type === 'callback') {
           const { callbackUrl, request, result } = jobDataPayload; // jobDataPayload is job.data.payload