ti2-tourplan 1.0.128 → 1.0.129-beta.1

package/.github/workflows/nodejs.yml

@@ -22,12 +22,17 @@ jobs:
   publish-npm:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: build_and_test
+    permissions:
+      contents: read
+      id-token: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
-          node-version: 12
+          node-version: '24'
+          registry-url: 'https://registry.npmjs.org'
+          package-manager-cache: false
       - name: Validate release tag
         id: release_meta
         env:
@@ -55,9 +60,5 @@ jobs:
 
           echo "tag_version=${TAG_VERSION}" >> "$GITHUB_OUTPUT"
           echo "dist_tag=${DIST_TAG}" >> "$GITHUB_OUTPUT"
-      - name: Configure npm auth
-        run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Publish package
         run: npm publish --tag "${{ steps.release_meta.outputs.dist_tag }}"

package/index.test.js

@@ -5,10 +5,11 @@ const path = require('path');
 const xml2js = require('xml2js');
 const R = require('ramda');
 const hash = require('object-hash');
+const js2xmlparser = require('js2xmlparser');
 const { XMLParser } = require('fast-xml-parser');
 const { typeDefs: itineraryProductTypeDefs, query: itineraryProductQuery } = require('./node_modules/ti2/controllers/graphql-schemas/itinerary-product');
 const { typeDefs: itineraryBookingTypeDefs, query: itineraryBookingQuery } = require('./node_modules/ti2/controllers/graphql-schemas/itinerary-booking');
-const { CUSTOM_RATE_ID_NAME } = require('./utils');
+const { CUSTOM_RATE_ID_NAME, hostConnectXmlOptions } = require('./utils');
 const {
   getRatesObjectArray,
   getImmediateLastDateRange,
@@ -169,6 +170,69 @@ describe('search tests', () => {
         expect(newBookingName).toBe(`${'Ae'.repeat(29)}A`);
       });
 
+      it('serializes valid DOB instead of age and falls back to age for invalid DOB', async () => {
+        mockCallTourplan
+          .mockImplementationOnce(async () => ({
+            AddServiceReply: { BookingId: 'valid-dob' },
+          }))
+          .mockImplementationOnce(async () => ({
+            AddServiceReply: { BookingId: 'invalid-dob' },
+          }));
+        const payloadFor = passenger => ({
+          quoteName: 'DOB serialization test',
+          optionId: 'ABC123',
+          startDate: '2026-07-03',
+          reference: 'TESTREF',
+          paxConfigs: [{
+            roomType: 'Double',
+            adults: 1,
+            passengers: [passenger],
+          }],
+          notes: '',
+        });
+
+        await app.addServiceToItinerary({
+          axios,
+          token,
+          payload: payloadFor({
+            firstName: 'Ada',
+            lastName: 'Lovelace',
+            passengerType: 'Adult',
+            dob: '1990-02-28',
+            age: 36,
+          }),
+        });
+        await app.addServiceToItinerary({
+          axios,
+          token,
+          payload: payloadFor({
+            firstName: 'Grace',
+            lastName: 'Hopper',
+            passengerType: 'Adult',
+            dob: '1990-02-29',
+            age: 36,
+          }),
+        });
+
+        const validModel = mockCallTourplan.mock.calls[0][0].model;
+        const invalidModel = mockCallTourplan.mock.calls[1][0].model;
+        const validPax = validModel.AddServiceRequest.RoomConfigs.RoomConfig[0]
+          .PaxList.PaxDetails[0];
+        const invalidPax = invalidModel.AddServiceRequest.RoomConfigs.RoomConfig[0]
+          .PaxList.PaxDetails[0];
+        const validXml = js2xmlparser.parse('Request', validModel, hostConnectXmlOptions);
+        const invalidXml = js2xmlparser.parse('Request', invalidModel, hostConnectXmlOptions);
+
+        expect(validPax).toMatchObject({ DateOfBirth: '1990-02-28' });
+        expect(validPax).not.toHaveProperty('Age');
+        expect(validXml).toContain('<DateOfBirth>1990-02-28</DateOfBirth>');
+        expect(validXml).not.toContain('<Age>');
+        expect(invalidPax).toMatchObject({ Age: 36 });
+        expect(invalidPax).not.toHaveProperty('DateOfBirth');
+        expect(invalidXml).toContain('<Age>36</Age>');
+        expect(invalidXml).not.toContain('<DateOfBirth>');
+      });
+
       it('limits new booking names supplied by directHeaderPayload after escaping XML characters', async () => {
         mockCallTourplan.mockImplementationOnce(async () => ({
           AddServiceReply: {

package/package.json

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

package/utils.js

@@ -71,6 +71,26 @@ const escapeInvalidXmlChars = str => {
     .replace(BAD_XML_CHARS, '');
 };
 
+const getValidDateOfBirth = dob => {
+  if (typeof dob !== 'string') return undefined;
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(dob);
+  if (!match) return undefined;
+
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  if (year === 0) return undefined;
+
+  // setUTCFullYear avoids Date.UTC's 0-99 year remapping.
+  const date = new Date(0);
+  date.setUTCFullYear(year, month - 1, day);
+  if (date.getUTCFullYear() !== year ||
+    date.getUTCMonth() !== month - 1 ||
+    date.getUTCDate() !== day) return undefined;
+
+  return dob;
+};
+
 const getRoomConfigs = (paxConfigs, noPaxList) => {
   // There should be only 1 RoomConfigs for AddServiceRequest
   const RoomConfigs = {};
@@ -139,12 +159,13 @@ const getRoomConfigs = (paxConfigs, noPaxList) => {
           }[p.passengerType] || 'A',
         };
         if (p.salutation) EachPaxDetails.Title = escapeInvalidXmlChars(p.salutation);
-        if (p.dob) EachPaxDetails.DateOfBirth = p.dob;
+        const validDateOfBirth = getValidDateOfBirth(p.dob);
+        if (validDateOfBirth) EachPaxDetails.DateOfBirth = validDateOfBirth;
         // NOTE: TourPlan API doesn't accept age as empty string, i.e. empty XML tag <Age/>
         // and trhows and error like - "1000 SCN System.InvalidOperationException: There is an
         // error in XML document (29, 8). (Input string was not in a correct format.)"
         // The solution is to NOT send the Age tag if it's empty
-        if (!R.isNil(p.age) && !Number.isNaN(p.age) && p.age) {
+        if (!validDateOfBirth && !R.isNil(p.age) && !Number.isNaN(p.age) && p.age) {
           if (!(p.passengerType === passengerTypeMap.Adult && p.age === 0)) {
             EachPaxDetails.Age = p.age;
           }

package/utils.test.js

@@ -1,4 +1,105 @@
-const { escapeInvalidXmlChars } = require('./utils');
+const { escapeInvalidXmlChars, getRoomConfigs } = require('./utils');
+
+describe('getRoomConfigs', () => {
+  const getPaxDetails = passenger => getRoomConfigs([{
+    roomType: 'Double',
+    passengers: [passenger],
+  }]).RoomConfig[0].PaxList.PaxDetails[0];
+
+  it('uses a valid DOB instead of age', () => {
+    const withDobAndAge = getPaxDetails({
+      firstName: 'Ada',
+      lastName: 'Lovelace',
+      passengerType: 'Adult',
+      dob: '1990-02-28',
+      age: 36,
+    });
+    const withDobOnly = getPaxDetails({
+      passengerType: 'Child',
+      dob: '2000-02-29',
+    });
+    const withPre100Dob = getPaxDetails({
+      passengerType: 'Adult',
+      dob: '0099-12-31',
+      age: 99,
+    });
+
+    expect(withDobAndAge.DateOfBirth).toBe('1990-02-28');
+    expect(withDobAndAge).not.toHaveProperty('Age');
+    expect(withDobOnly.DateOfBirth).toBe('2000-02-29');
+    expect(withDobOnly).not.toHaveProperty('Age');
+    expect(withPre100Dob.DateOfBirth).toBe('0099-12-31');
+    expect(withPre100Dob).not.toHaveProperty('Age');
+  });
+
+  it('uses age when DOB is absent', () => {
+    const paxDetails = getPaxDetails({
+      passengerType: 'Adult',
+      age: 36,
+    });
+
+    expect(paxDetails.Age).toBe(36);
+    expect(paxDetails).not.toHaveProperty('DateOfBirth');
+  });
+
+  it.each([
+    ['blank', ''],
+    ['malformed', '1990/02/28'],
+    ['unpadded', '1990-2-28'],
+    ['date-time', '1990-02-28T00:00:00Z'],
+    ['boxed string', Object('1990-02-28')],
+    ['Date object', new Date('1990-02-28T00:00:00Z')],
+    ['number', 19900228],
+  ])('falls back to age for a %s DOB', (description, dob) => {
+    const paxDetails = getPaxDetails({
+      passengerType: 'Adult',
+      dob,
+      age: 36,
+    });
+
+    expect(paxDetails.Age).toBe(36);
+    expect(paxDetails).not.toHaveProperty('DateOfBirth');
+  });
+
+  it.each([
+    ['year zero', '0000-01-01'],
+    ['month zero', '1990-00-01'],
+    ['day zero', '1990-01-00'],
+    ['day rollover', '1990-04-31'],
+    ['non-leap day', '2025-02-29'],
+    ['non-leap century day', '1900-02-29'],
+  ])('falls back to age for an impossible %s DOB', (description, dob) => {
+    const paxDetails = getPaxDetails({
+      passengerType: 'Adult',
+      dob,
+      age: 36,
+    });
+
+    expect(paxDetails.Age).toBe(36);
+    expect(paxDetails).not.toHaveProperty('DateOfBirth');
+  });
+
+  it('preserves the PersonId early return', () => {
+    expect(getPaxDetails({
+      personId: 'person-123',
+      passengerType: 'Adult',
+      dob: '1990-02-28',
+      age: 36,
+    })).toEqual({ PersonId: 'person-123' });
+  });
+
+  it('preserves zero, blank, and NaN age behavior without a valid DOB', () => {
+    const adultZero = getPaxDetails({ passengerType: 'Adult', age: 0 });
+    const childZero = getPaxDetails({ passengerType: 'Child', age: 0 });
+    const blank = getPaxDetails({ passengerType: 'Adult', age: '' });
+    const nan = getPaxDetails({ passengerType: 'Adult', age: NaN });
+
+    [adultZero, childZero, blank, nan].forEach(paxDetails => {
+      expect(paxDetails).not.toHaveProperty('Age');
+      expect(paxDetails).not.toHaveProperty('DateOfBirth');
+    });
+  });
+});
 
 describe('escapeInvalidXmlChars', () => {
   it('returns empty string for falsy input', () => {