ti2-tourplan 1.0.129-beta.1 → 1.0.129

package/index.test.js

@@ -863,66 +863,287 @@ describe('search tests', () => {
     expect(retVal).toMatchSnapshot();
   });
 
-  it('searchProductsForItinerary skips AC in full catalog when skipAccommodation is set', async () => {
-    const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
-    const bdOption = {
-      Opt: 'TESTBDOPTION00001',
-      OptGeneral: {
-        SupplierId: '1001',
-        SupplierName: 'Test Supplier',
-        Description: 'Test BD Product',
-        SType: 'N',
-        AdultsAllowed: 'Y',
-        Adult_From: 16,
-        Adult_To: 999,
-        ButtonName: 'Sightseeing',
+  describe('searchProductsForItinerary omitServiceCodes', () => {
+    const optionGeneral = {
+      SupplierId: '1001',
+      SupplierName: 'Test Supplier',
+      Description: 'Test Product',
+      SType: 'N',
+      AdultsAllowed: 'Y',
+      Adult_From: 16,
+      Adult_To: 999,
+      ButtonName: 'Sightseeing',
+    };
+    const acOption = { Opt: 'TESTACOPTION00001', OptGeneral: optionGeneral };
+    const bdOption = { Opt: 'TESTBDOPTION00001', OptGeneral: optionGeneral };
+    const trOption = { Opt: 'TESTTROPTION00001', OptGeneral: optionGeneral };
+    const getServicesReply = {
+      GetServicesReply: {
+        TPLServices: {
+          TPLService: [
+            { Code: 'AC', Name: 'Accommodation' },
+            { Code: 'BD', Name: 'Bundle' },
+            { Code: 'TR', Name: 'Transfer' },
+          ],
+        },
       },
     };
+    const optionsByOpt = {
+      '???AC????????????': acOption,
+      '???BD????????????': bdOption,
+      '???TR????????????': trOption,
+    };
+    const defaultCallTourplan = mockCallTourplan.getMockImplementation();
+    const getOptionInfoCalls = () => mockCallTourplan.mock.calls
+      .map(([call]) => call.model.OptionInfoRequest)
+      .filter(Boolean)
+      .map(req => req.Opt);
 
-    mockCallTourplan
-      .mockImplementationOnce(async () => ({
-        GetServicesReply: {
-          TPLServices: {
-            TPLService: [
-              { Code: 'AC', Name: 'Accommodation' },
-              { Code: 'BD', Name: 'Bundle' },
-            ],
-          },
-        },
-      }))
-      .mockImplementationOnce(async ({ model }) => {
-        const opt = model.OptionInfoRequest.Opt;
-        if (opt === '???AC????????????') {
-          throw new Error('AC OptionInfo should have been skipped');
+    afterEach(() => {
+      mockCallTourplan.mockImplementation(defaultCallTourplan);
+    });
+
+    const mockFullCatalog = ({ throwOnOpt } = {}) => {
+      mockCallTourplan.mockImplementation(async ({ model }) => {
+        if (model.GetServicesRequest) return getServicesReply;
+        const opt = model.OptionInfoRequest && model.OptionInfoRequest.Opt;
+        if (throwOnOpt && throwOnOpt.includes(opt)) {
+          throw new Error(`${opt} OptionInfo should have been skipped`);
         }
-        if (opt === '???BD????????????') {
-          return { OptionInfoReply: { Option: bdOption } };
+        if (optionsByOpt[opt]) {
+          return { OptionInfoReply: { Option: optionsByOpt[opt] } };
         }
         throw new Error(`Unexpected OptionInfo Opt: ${opt}`);
       });
+    };
 
-    const retVal = await app.searchProductsForItinerary({
-      axios,
-      token,
-      typeDefsAndQueries,
-      payload: {
-        searchInput: '',
-        skipAccommodation: true,
-      },
+    it('fetches all service codes when omitServiceCodes is not provided', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog();
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: { searchInput: '' },
+      });
+
+      expect(getOptionInfoCalls()).toEqual([
+        '???AC????????????',
+        '???BD????????????',
+        '???TR????????????',
+      ]);
+      expect(debugSpy).not.toHaveBeenCalled();
+      expect(retVal.products).toHaveLength(1);
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTACOPTION00001',
+        'TESTBDOPTION00001',
+        'TESTTROPTION00001',
+      ]);
+      debugSpy.mockRestore();
     });
 
-    const optionInfoCalls = mockCallTourplan.mock.calls
-      .map(([call]) => call.model.OptionInfoRequest)
-      .filter(Boolean);
-    expect(optionInfoCalls).toHaveLength(1);
-    expect(optionInfoCalls[0].Opt).toBe('???BD????????????');
-    expect(debugSpy).toHaveBeenCalledWith(
-      '[tourplan] Accommodation (AC) service code will be skipped in full catalog product search',
-    );
-    expect(retVal.products).toHaveLength(1);
-    expect(retVal.products[0].options[0].optionId).toBe('TESTBDOPTION00001');
+    it('fetches all service codes when omitServiceCodes is empty', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog();
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: [],
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual([
+        '???AC????????????',
+        '???BD????????????',
+        '???TR????????????',
+      ]);
+      expect(debugSpy).not.toHaveBeenCalled();
+      expect(retVal.products[0].options).toHaveLength(3);
+      debugSpy.mockRestore();
+    });
+
+    it('omits a single listed service code', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog({ throwOnOpt: ['???AC????????????'] });
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: ['AC'],
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual([
+        '???BD????????????',
+        '???TR????????????',
+      ]);
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[tourplan] Omitting service code(s) from full catalog product search: AC',
+      );
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTBDOPTION00001',
+        'TESTTROPTION00001',
+      ]);
+      debugSpy.mockRestore();
+    });
+
+    it('omits multiple listed service codes', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog({ throwOnOpt: ['???AC????????????', '???TR????????????'] });
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: ['AC', 'TR'],
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual(['???BD????????????']);
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[tourplan] Omitting service code(s) from full catalog product search: AC, TR',
+      );
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTBDOPTION00001',
+      ]);
+      debugSpy.mockRestore();
+    });
+
+    it('coerces a single string omitServiceCodes value to an array', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog({ throwOnOpt: ['???AC????????????'] });
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: 'AC',
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual([
+        '???BD????????????',
+        '???TR????????????',
+      ]);
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[tourplan] Omitting service code(s) from full catalog product search: AC',
+      );
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTBDOPTION00001',
+        'TESTTROPTION00001',
+      ]);
+      debugSpy.mockRestore();
+    });
+
+    it('normalizes case and whitespace in omitServiceCodes', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog({ throwOnOpt: ['???AC????????????'] });
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: [' ac '],
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual([
+        '???BD????????????',
+        '???TR????????????',
+      ]);
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[tourplan] Omitting service code(s) from full catalog product search: AC',
+      );
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTBDOPTION00001',
+        'TESTTROPTION00001',
+      ]);
+      debugSpy.mockRestore();
+    });
+
+    it('splits a comma-separated omitServiceCodes string', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog({ throwOnOpt: ['???AC????????????', '???TR????????????'] });
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: 'AC, TR',
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual(['???BD????????????']);
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[tourplan] Omitting service code(s) from full catalog product search: AC, TR',
+      );
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTBDOPTION00001',
+      ]);
+      debugSpy.mockRestore();
+    });
+
+    it('splits comma-separated entries inside an omitServiceCodes array', async () => {
+      const debugSpy = jest.spyOn(console, 'debug').mockImplementation(() => {});
+      mockFullCatalog({ throwOnOpt: ['???AC????????????', '???TR????????????'] });
+
+      const retVal = await app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: ['AC,SM', ' tr '],
+        },
+      });
+
+      expect(getOptionInfoCalls()).toEqual(['???BD????????????']);
+      expect(debugSpy).toHaveBeenCalledWith(
+        '[tourplan] Omitting service code(s) from full catalog product search: AC, SM, TR',
+      );
+      expect(retVal.products[0].options.map(o => o.optionId)).toEqual([
+        'TESTBDOPTION00001',
+      ]);
+      debugSpy.mockRestore();
+    });
+
+    it('throws No products found when every service code is omitted', async () => {
+      mockFullCatalog({
+        throwOnOpt: [
+          '???AC????????????',
+          '???BD????????????',
+          '???TR????????????',
+        ],
+      });
 
-    debugSpy.mockRestore();
+      await expect(app.searchProductsForItinerary({
+        axios,
+        token,
+        typeDefsAndQueries,
+        payload: {
+          searchInput: '',
+          omitServiceCodes: ['AC', 'BD', 'TR'],
+        },
+      })).rejects.toThrow('No products found');
+
+      expect(getOptionInfoCalls()).toEqual([]);
+    });
   });
 
   describe('availability tests', () => {

package/itinerary-products-search.js

@@ -22,8 +22,9 @@ const searchProductsForItinerary = async ({
     // lastUpdatedFrom is used to get options that were updated after a certain date in Tourplan
     // example: lastUpdatedFrom: '2024-04-22 05:17:57.427Z'
     lastUpdatedFrom,
-    // skip Accommodation (AC) service code in full catalog search
-    skipAccommodation,
+    // service codes to omit from full catalog search
+    // (e.g. ['AC'], 'AC', or 'AC,SM'); when empty/absent, get all
+    omitServiceCodes,
   },
   callTourplan,
 }) => {
@@ -60,7 +61,7 @@ const searchProductsForItinerary = async ({
     /*
       Full catalog path:
       1. getServiceCodes -> [AC, BD]
-      2. for each serviceCode getoptions (optionally skip AC when skipAccommodation is set)
+      2. for each serviceCode getoptions (omitting all service codes in omitServiceCodes)
       3. convert them to ti2 products structure
       4. merge all products from all serviceCodes
     */
@@ -79,12 +80,26 @@ const searchProductsForItinerary = async ({
     });
     let serviceCodes = R.pathOr([], ['GetServicesReply', 'TPLServices', 'TPLService'], getServicesReply);
     if (!Array.isArray(serviceCodes)) serviceCodes = [serviceCodes];
-    if (skipAccommodation) {
-      console.debug('[tourplan] Accommodation (AC) service code will be skipped in full catalog product search');
+    let rawOmitCodes = [];
+    if (Array.isArray(omitServiceCodes)) {
+      rawOmitCodes = omitServiceCodes;
+    } else if (omitServiceCodes) {
+      rawOmitCodes = [omitServiceCodes];
+    }
+    const omitSet = new Set(
+      rawOmitCodes
+        .flatMap(code => String(code == null ? '' : code).split(','))
+        .map(code => code.trim().toUpperCase())
+        .filter(Boolean),
+    );
+    if (omitSet.size > 0) {
+      console.debug(
+        `[tourplan] Omitting service code(s) from full catalog product search: ${[...omitSet].join(', ')}`,
+      );
     }
     serviceCodes = serviceCodes
       .map(s => s.Code)
-      .filter(code => !(skipAccommodation && code === 'AC'));
+      .filter(code => !omitSet.has(String(code).trim().toUpperCase()));
     await Promise.each(serviceCodes, async serviceCode => {
       const getOptionsModel = {
         OptionInfoRequest: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.129-beta.1",
+  "version": "1.0.129",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {