ti2-tourplan 1.0.126 → 1.0.128

package/index.test.js

@@ -132,6 +132,84 @@ describe('search tests', () => {
         }
       });
     });
+    describe('addServiceToItinerary', () => {
+      it('limits new booking names after escaping XML characters', async () => {
+        mockCallTourplan.mockImplementationOnce(async () => ({
+          AddServiceReply: {
+            BookingId: '12345',
+            Ref: 'TESTREF',
+            Services: {
+              Service: {
+                LinePrice: '10.00',
+              },
+            },
+            ServiceLineId: '10',
+          },
+        }));
+
+        const quoteName = 'Ä'.repeat(30);
+        await app.addServiceToItinerary({
+          axios,
+          token,
+          payload: {
+            quoteName,
+            optionId: 'ABC123',
+            startDate: '2026-07-03',
+            reference: 'TESTREF',
+            paxConfigs: [{ roomType: 'Double', adults: 2 }],
+            notes: '',
+          },
+        });
+
+        expect(mockCallTourplan).toHaveBeenCalledTimes(1);
+        const newBookingName = mockCallTourplan.mock.calls[0][0]
+          .model.AddServiceRequest.NewBookingInfo.Name;
+
+        expect(newBookingName.length).toBe(59);
+        expect(newBookingName).toBe(`${'Ae'.repeat(29)}A`);
+      });
+
+      it('limits new booking names supplied by directHeaderPayload after escaping XML characters', async () => {
+        mockCallTourplan.mockImplementationOnce(async () => ({
+          AddServiceReply: {
+            BookingId: '12345',
+            Ref: 'TESTREF',
+            Services: {
+              Service: {
+                LinePrice: '10.00',
+              },
+            },
+            ServiceLineId: '10',
+          },
+        }));
+
+        await app.addServiceToItinerary({
+          axios,
+          token,
+          payload: {
+            quoteName: 'Short quote name',
+            optionId: 'ABC123',
+            startDate: '2026-07-03',
+            reference: 'TESTREF',
+            paxConfigs: [{ roomType: 'Double', adults: 2 }],
+            notes: '',
+            directHeaderPayload: {
+              Name: 'Ä'.repeat(30),
+              HeaderField: 'kept',
+            },
+          },
+        });
+
+        expect(mockCallTourplan).toHaveBeenCalledTimes(1);
+        const newBookingInfo = mockCallTourplan.mock.calls[0][0]
+          .model.AddServiceRequest.NewBookingInfo;
+
+        expect(newBookingInfo.Name.length).toBe(59);
+        expect(newBookingInfo.Name).toBe(`${'Ae'.repeat(29)}A`);
+        expect(newBookingInfo.HeaderField).toBe('kept');
+      });
+    });
+
     describe('cancelBooking', () => {
       it('cancels a booking by id', async () => {
         mockCallTourplan.mockImplementationOnce(async () => ({
@@ -721,6 +799,68 @@ 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',
+      },
+    };
+
+    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');
+        }
+        if (opt === '???BD????????????') {
+          return { OptionInfoReply: { Option: bdOption } };
+        }
+        throw new Error(`Unexpected OptionInfo Opt: ${opt}`);
+      });
+
+    const retVal = await app.searchProductsForItinerary({
+      axios,
+      token,
+      typeDefsAndQueries,
+      payload: {
+        searchInput: '',
+        skipAccommodation: true,
+      },
+    });
+
+    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');
+
+    debugSpy.mockRestore();
+  });
+
   describe('availability tests', () => {
     it('searchAvailabilityForItinerary - not bookable', async () => {
       axios.mockImplementation(getFixture);

package/itinerary-add-service.js

@@ -8,8 +8,12 @@ const {
 } = require('./utils');
 
 const DEFAULT_TOURPLAN_SERVICE_STATUS = 'IR';
+const MAX_BOOKING_NAME_LENGTH = 59;
 const SERVICE_CANNOT_BE_ADDED_ERROR_MESSAGE = 'Service cannot be added to quote for the requested date/stay. (e.g. no rates, block out period, on request, minimum stay etc.)';
 
+const getBookingName = quoteName => escapeInvalidXmlChars(quoteName)
+  .substring(0, MAX_BOOKING_NAME_LENGTH);
+
 const addServiceToItinerary = async ({
   axios,
   token: {
@@ -61,6 +65,10 @@ const addServiceToItinerary = async ({
       return acc;
     }, {});
 
+  const directHeaderPayloadHasName = directHeaderPayload &&
+    Object.prototype.hasOwnProperty.call(directHeaderPayload, 'Name');
+  const bookingNameSource = directHeaderPayloadHasName ? directHeaderPayload.Name : quoteName;
+
   const rateIdFromAvailCheckObj = R.path(['rateId'], availCheckObj);
   if (availCheckObj &&
     (rateIdFromAvailCheckObj === CUSTOM_RATE_ID_NAME
@@ -141,9 +149,9 @@ const addServiceToItinerary = async ({
         ExistingBookingInfo: { BookingId: quoteId },
       } : {
         NewBookingInfo: {
-          Name: escapeInvalidXmlChars(quoteName),
           QB: QB || 'Q',
           ...(directHeaderPayload || {}),
+          Name: getBookingName(bookingNameSource),
         },
       }),
       ...(puTime ? { puTime } : {}),

package/itinerary-products-search.js

@@ -22,6 +22,8 @@ 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,
   },
   callTourplan,
 }) => {
@@ -58,7 +60,7 @@ const searchProductsForItinerary = async ({
     /*
       Full catalog path:
       1. getServiceCodes -> [AC, BD]
-      2. for each serviceCode getoptions
+      2. for each serviceCode getoptions (optionally skip AC when skipAccommodation is set)
       3. convert them to ti2 products structure
       4. merge all products from all serviceCodes
     */
@@ -77,7 +79,12 @@ const searchProductsForItinerary = async ({
     });
     let serviceCodes = R.pathOr([], ['GetServicesReply', 'TPLServices', 'TPLService'], getServicesReply);
     if (!Array.isArray(serviceCodes)) serviceCodes = [serviceCodes];
-    serviceCodes = serviceCodes.map(s => s.Code);
+    if (skipAccommodation) {
+      console.debug('[tourplan] Accommodation (AC) service code will be skipped in full catalog product search');
+    }
+    serviceCodes = serviceCodes
+      .map(s => s.Code)
+      .filter(code => !(skipAccommodation && code === 'AC'));
     await Promise.each(serviceCodes, async serviceCode => {
       const getOptionsModel = {
         OptionInfoRequest: {

package/package.json

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