ti2-tourplan 1.0.125 → 1.0.127

package/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(gh pr diff:*)",
+      "Bash(gh pr view:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package/availability/itinerary-availability-helper.js

@@ -172,7 +172,7 @@ const getAvailabilityOnly = async ({
   const model = {
     OptionInfoRequest: {
       Opt: optionId,
-      Info: 'AD',
+      Info: 'GAR',
       AgentID: hostConnectAgentID,
       Password: hostConnectAgentPassword,
       DateFrom: startDate,
@@ -186,7 +186,11 @@ const getAvailabilityOnly = async ({
     axios,
     xmlOptions: hostConnectXmlOptions,
   });
-  return R.pathOr([], ['OptionInfoReply', 'Option', 'OptAvail'], replyObj);
+  const option = R.path(['OptionInfoReply', 'Option'], replyObj);
+  return {
+    optAvail: R.pathOr([], ['OptAvail'], option),
+    optRates: R.path(['OptRates'], option),
+  };
 };
 /*
     Get general option information from Tourplan API.

package/availability/itinerary-availability.js

@@ -152,7 +152,7 @@ const searchAvailabilityForItinerary = async ({
   const isAvailabilityOnly = availabilityOnly === true;
 
   if (isAvailabilityOnly) {
-    const availabilityOnlyResponse = await getAvailabilityOnly({
+    const { optAvail, optRates } = await getAvailabilityOnly({
       optionId,
       hostConnectEndpoint,
       hostConnectAgentID,
@@ -162,8 +162,9 @@ const searchAvailabilityForItinerary = async ({
       requestedEndDate,
       callTourplan,
     });
-    const optAvailValues = getOptAvailValues(availabilityOnlyResponse);
+    const optAvailValues = getOptAvailValues(optAvail);
     const SCheckPass = isOptAvailBookable(optAvailValues);
+    const rates = (SCheckPass && optRates) ? [optRates] : [];
     return {
       bookable: SCheckPass,
       type: 'availability',
@@ -172,7 +173,7 @@ const searchAvailabilityForItinerary = async ({
         ? 'Availability checked successfully'
         : 'No availability found for the requested range',
       availability: optAvailValues,
-      rates: [],
+      rates,
     };
   }
 

package/availability/itinerary-availability.validation-flags.test.js

@@ -24,7 +24,7 @@ jest.mock('./itinerary-availability-helper', () => ({
     maxPaxPerCharge: null,
   })),
   getNoRatesAvailableError: jest.fn(async () => 'No rates available'),
-  getAvailabilityOnly: jest.fn(async () => '-1 -1 -1'),
+  getAvailabilityOnly: jest.fn(async () => ({ optAvail: '-1 -1 -1', optRates: null })),
   getStayResults: jest.fn(async () => ([{
     RateId: 'R1',
     Currency: 'USD',
@@ -149,7 +149,18 @@ describe('searchAvailabilityForItinerary validation flags', () => {
   });
 
   it('uses availabilityOnly flow and keeps response shape consistent', async () => {
-    itineraryAvailabilityHelper.getAvailabilityOnly.mockResolvedValueOnce('-1 -2 -1');
+    const mockOptRates = {
+      Currency: 'JPY',
+      OptRate: {
+        Date: '2026-06-01',
+        RateName: '26年',
+        PersonRates: { AdultRate: 2700000, ChildRate: 1700000 },
+      },
+    };
+    itineraryAvailabilityHelper.getAvailabilityOnly.mockResolvedValueOnce({
+      optAvail: '-1 -2 -1',
+      optRates: mockOptRates,
+    });
 
     const result = await searchAvailabilityForItinerary({
       axios: jest.fn(),
@@ -160,6 +171,7 @@ describe('searchAvailabilityForItinerary validation flags', () => {
     });
 
     expect(itineraryAvailabilityHelper.getAvailabilityOnly).toHaveBeenCalledTimes(1);
+    expect(itineraryAvailabilityHelper.getStayResults).not.toHaveBeenCalled();
     expect(itineraryAvailabilityHelper.getAgentCurrencyCode).not.toHaveBeenCalled();
     expect(result).toEqual({
       bookable: true,
@@ -167,12 +179,15 @@ describe('searchAvailabilityForItinerary validation flags', () => {
       endDate: '2025-04-05',
       message: 'Availability checked successfully',
       availability: [-1, -2, -1],
-      rates: [],
+      rates: [mockOptRates],
     });
   });
 
   it('marks availabilityOnly response as not bookable when all days are unavailable', async () => {
-    itineraryAvailabilityHelper.getAvailabilityOnly.mockResolvedValueOnce('-1 -1 -1');
+    itineraryAvailabilityHelper.getAvailabilityOnly.mockResolvedValueOnce({
+      optAvail: '-1 -1 -1',
+      optRates: null,
+    });
 
     const result = await searchAvailabilityForItinerary({
       axios: jest.fn(),
@@ -186,5 +201,6 @@ describe('searchAvailabilityForItinerary validation flags', () => {
     expect(result.message).toBe('No availability found for the requested range');
     expect(result.availability).toEqual([-1, -1, -1]);
     expect(result.rates).toEqual([]);
+    expect(itineraryAvailabilityHelper.getStayResults).not.toHaveBeenCalled();
   });
 });

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 () => ({

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/package.json

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