ti2-tourplan 1.0.59 → 1.0.61

package/__fixtures__/1f31a4c2a86da422468b2d63e91aee5af5f474a4.txt

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE Reply SYSTEM "hostConnect_5_05_000.dtd"><Reply><OptionInfoReply><Option><Opt>AKLACAKLSOFDYNAMC</Opt><OptionNumber>46052</OptionNumber><OptAvail>3</OptAvail></Option></OptionInfoReply></Reply>

package/__fixtures__/2dddcacad6843b2e1925595ba5a83729f73d9255.txt

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE Reply SYSTEM "hostConnect_5_05_000.dtd"><Reply><OptionInfoReply /></Reply>

package/__fixtures__/53bbb66ab400767d8acbf07cbbf0a209425dbe5a.txt

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE Reply SYSTEM "hostConnect_5_05_000.dtd"><Reply><OptionInfoReply><Option><Opt>LONTRDAVIDSHDWBVC</Opt><OptionNumber>46051</OptionNumber><OptAvail>-1</OptAvail></Option></OptionInfoReply></Reply>

package/__fixtures__/5dc8cf72c01e5936707bca9dc93886b052876710.txt

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><!DOCTYPE Reply SYSTEM "hostConnect_5_05_000.dtd"><Reply><OptionInfoReply><Option><Opt>FWMACINVCASFBSB</Opt><OptionNumber>4138</OptionNumber><OptAvail>-3 </OptAvail></Option></OptionInfoReply></Reply>

package/__fixtures__/7ff49d0caa3c1349cf6d55d3b7497179bbf5472d.txt

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Reply SYSTEM "http://localhost:8080/iCom/hostConnect_4_06_009.dtd">
+<Reply>
+    <AgentInfoReply>
+        <Currency>GBP</Currency>
+        <Email></Email>
+        <Name>Audley Travel</Name>
+        <PriceCodes>2AU2152GS2CO</PriceCodes>
+        <IsSubLogin>N</IsSubLogin>
+        <HasBookingRights>N</HasBookingRights>
+        <AgentCurrencies>
+            <AgentCurrencyInfo>
+                <Currency>EUR</Currency>
+                <CreditLimit>0</CreditLimit>
+            </AgentCurrencyInfo>
+            <AgentCurrencyInfo>
+                <Currency>GBP</Currency>
+                <CreditLimit>0</CreditLimit>
+            </AgentCurrencyInfo>
+            <AgentCurrencyInfo>
+                <Currency>USD</Currency>
+                <CreditLimit>0</CreditLimit>
+            </AgentCurrencyInfo>
+        </AgentCurrencies>
+        <Balances>
+            <Balance>
+                <Currency>GBP</Currency>
+                <CurrentBalance>449392</CurrentBalance>
+                <Overdue1>0</Overdue1>
+                <Overdue2>0</Overdue2>
+                <Overdue3>0</Overdue3>
+                <Overdue4>14557</Overdue4>
+                <FutureEntered>169171190</FutureEntered>
+                <Future1>0</Future1>
+                <Future2>0</Future2>
+                <Future3>0</Future3>
+                <Future4>0</Future4>
+            </Balance>
+            <Balance>
+                <Currency>BC</Currency>
+                <CurrentBalance>0</CurrentBalance>
+                <Overdue1>0</Overdue1>
+                <Overdue2>0</Overdue2>
+                <Overdue3>0</Overdue3>
+                <Overdue4>0</Overdue4>
+                <FutureEntered>0</FutureEntered>
+                <Future1>0</Future1>
+                <Future2>0</Future2>
+                <Future3>0</Future3>
+                <Future4>0</Future4>
+            </Balance>
+        </Balances>
+    </AgentInfoReply>
+</Reply>

package/__snapshots__/index.test.js.snap

@@ -3240,7 +3240,15 @@ Object {
 }
 `;
 
-exports[`search tests searchAvailabilityForItinerary - bookable 1`] = `
+exports[`search tests searchAvailabilityForItinerary - bookable - on request 1`] = `
+Object {
+  "bookable": true,
+  "rates": Array [],
+  "type": "on request",
+}
+`;
+
+exports[`search tests searchAvailabilityForItinerary - bookable - static with inventory 1`] = `
 Object {
   "bookable": true,
   "rates": Array [
@@ -3289,6 +3297,7 @@ Object {
       "rateId": "$NZD48493f27a57b8c65,4,DOUB,C5 B1INF SKB DOUB BRKF",
     },
   ],
+  "type": "inventory",
 }
 `;
 
@@ -3296,84 +3305,6 @@ exports[`search tests searchItineraries 1`] = `
 Object {
   "bookings": Array [
     Object {
-      "AccountingDetails": Object {
-        "AmountDue": 0,
-        "CreditsTotal": 0,
-        "FutureBilling": 187795,
-        "InvoicedTotal": 0,
-        "ReceivedTotal": 0,
-      },
-      "AgentRef": "2356674/1",
-      "BookingId": 316559,
-      "BookingStatus": "Quotation",
-      "BookingType": "F",
-      "BookingUpdateCount": 2,
-      "CanAddServices": "Y",
-      "CanCancel": "Y",
-      "Consult": "",
-      "Currency": "GBP",
-      "Dialogue": "",
-      "Email": "",
-      "EnteredDate": "2024-09-12",
-      "IsInternetBooking": "Y",
-      "Name": "2356674/1 Sean Conta",
-      "QB": "Q",
-      "ReadOnly": "N",
-      "Ref": "ALFI393706",
-      "Remarks": "",
-      "Services": Array [
-        Object {
-          "CanAccept": "N",
-          "CanUpdate": "N",
-          "CancelDeleteStatus": "D",
-          "Comment": "Deluxe King Room",
-          "CostedInBooking": "Y",
-          "Date": "2025-08-13",
-          "Description": "Bed and Full Buffet Breakfast",
-          "LinePrice": 187795,
-          "LocationCode": "LON",
-          "Opt": "LONHOSANLONBFBDLX",
-          "OptionNumber": 77490,
-          "Remarks": "Passenger Notes: NA.
-          Service Notes: NA.",
-          "RoomConfigs": Object {
-            "RoomConfig": Object {
-              "Adults": 1,
-              "Children": 0,
-              "Infants": 0,
-              "PaxList": Object {
-                "PaxDetails": Object {
-                  "Forename": "Sean",
-                  "PaxType": "A",
-                  "PersonId": 628199,
-                  "Surname": "Conta",
-                  "Title": "Mr",
-                },
-              },
-              "RoomType": "DB",
-            },
-          },
-          "SCU": "night",
-          "SCUqty": 4,
-          "SequenceNumber": 10,
-          "ServiceExtras": Object {
-            "ServiceExtra": Object {
-              "ChargeBasis": "Room",
-              "Description": "Extra Bed",
-              "IsCompulsory": "N",
-              "IsPricePerPerson": "N",
-              "Quantity": 1,
-              "SequenceNumber": 1,
-            },
-          },
-          "ServiceLineId": 745684,
-          "ServiceLineUpdateCount": 1,
-          "SupplierName": "Sanderson",
-          "paxList": Array [],
-        },
-      ],
-      "TotalPrice": 187795,
-      "TravelDate": "2025-08-13",
       "agentRef": "2356674/1",
       "bookingId": "316559",
       "bookingStatus": "Quotation",

package/index.js

@@ -525,10 +525,14 @@ class BuyerPlugin {
       chargeUnitQuantity,
     },
   }) {
-    const model = {
+    /*
+    Need to S check and A check separately
+    because if A check is onRuest, AS will still result in empty response
+    */
+    const getModel = checkType => ({
       OptionInfoRequest: {
         Opt: optionId,
-        Info: 'S',
+        Info: checkType,
         DateFrom: startDate,
         SCUqty: (() => {
           const num = parseInt(chargeUnitQuantity, 10);
@@ -539,12 +543,15 @@ class BuyerPlugin {
         AgentID: hostConnectAgentID,
         Password: hostConnectAgentPassword,
       },
-    };
-    const replyObj = await this.callTourplan({
-      model,
-      endpoint: hostConnectEndpoint,
-      axios,
-      xmlOptions: hostConnectXmlOptions,
+    });
+    const [SCheck, ACheck] = await Promise.map(['S', 'A'], async checkType => {
+      const replyObj = await this.callTourplan({
+        model: getModel(checkType),
+        endpoint: hostConnectEndpoint,
+        axios,
+        xmlOptions: hostConnectXmlOptions,
+      });
+      return R.path(['OptionInfoReply', 'Option'], replyObj);
     });
     /*
       If not rates, optionInfoReply is null, meaning it's not bookable
@@ -589,11 +596,55 @@ class BuyerPlugin {
         }
       }
     */
-    const optionInfoReply = R.path(['OptionInfoReply'], replyObj);
-    let OptStayResults = R.pathOr([], ['Option', 'OptStayResults'], optionInfoReply);
+    const SCheckPass = Boolean(SCheck);
+    const ACheckPass = (() => {
+      /*
+        FROM TP DOCS:
+        Each integer in the list gives the availability for one of the days in the range requested,
+        from the start date through to the end date. The integer values are to be interpreted as
+        follows:
+        Greater than 0 means that inventory is available, with the integer specifying the
+        number of units available. For options with a service type of Y , the inventory is in
+        units of rooms. For other service types, the inventory is in units of pax.
+        -1 Not available.
+        -2 Available on free sell.
+        -3 Available on request.
+        Note: A return value of 0 or something less than -3 is impossible.
+      */
+      const optAvail = parseInt(R.pathOr('-4', ['OptAvail'], ACheck), 10);
+      if (optAvail === -1) {
+        return {
+          available: false,
+        };
+      }
+      if (optAvail === -2) {
+        return {
+          available: true,
+          type: 'free sell',
+        };
+      }
+      if (optAvail === -3) {
+        return {
+          available: true,
+          type: 'on request',
+        };
+      }
+      if (optAvail > 0) {
+        return {
+          available: true,
+          type: 'inventory',
+          quantity: optAvail,
+        };
+      }
+      return {
+        available: false,
+      };
+    })();
+    let OptStayResults = R.pathOr([], ['OptStayResults'], SCheck);
     if (!Array.isArray(OptStayResults)) OptStayResults = [OptStayResults];
     return {
-      bookable: Boolean(optionInfoReply),
+      bookable: Boolean(SCheckPass || ACheckPass.available),
+      type: ACheckPass.type,
       rates: OptStayResults.map(rate => {
         let externalRateText = R.pathOr('', ['ExternalRateDetails', 'ExtOptionDescr'], rate);
         const extRatePlanDescr = R.pathOr('', ['ExternalRateDetails', 'ExtRatePlanDescr'], rate);
@@ -606,166 +657,6 @@ class BuyerPlugin {
         };
       }),
     };
-    // THE BELOW CODE is for A check, might still need it on user's future request
-    // const optAvail = parseInt(R.pathOr('-4', ['OptionInfoReply', 'Option', 'OptAvail'], replyObj), 10);
-    // /*
-    // FROM TP DOCS:
-    // Each integer in the list gives the availability for one of the days in the range requested,
-    // from the start date through to the end date. The integer values are to be interpreted as
-    // follows:
-    // Greater than 0 means that inventory is available, with the integer specifying the
-    // number of units available. For options with a service type of Y , the inventory is in
-    // units of rooms. For other service types, the inventory is in units of pax.
-    // -1 Not available.
-    // -2 Available on free sell.
-    // -3 Available on request.
-    // Note: A return value of 0 or something less than -3 is impossible.
-    // */
-    // if (optAvail === -1) {
-    //   return {
-    //     available: false,
-    //   };
-    // }
-    // if (optAvail === -2) {
-    //   return {
-    //     available: true,
-    //     type: 'free sell',
-    //   };
-    // }
-    // if (optAvail === -3) {
-    //   return {
-    //     available: true,
-    //     type: 'on request',
-    //   };
-    // }
-    // if (optAvail > 0) {
-    //   return {
-    //     available: true,
-    //     type: 'inventory',
-    //     quantity: optAvail,
-    //   };
-    // }
-    // return {
-    //   available: false,
-    // };
-  }
-
-
-  // TODO: safe to deprecate 7-14 days after release date
-  async searchQuote({
-    axios,
-    token: {
-      hostConnectEndpoint,
-      hostConnectAgentID,
-      hostConnectAgentPassword,
-    },
-    payload: {
-      quoteName,
-      rateId,
-      quoteId,
-      // existingQuoteId,
-      // existingLineId,
-      optionId,
-      startDate,
-      reference,
-      /*
-      paxConfigs: [{ roomType: 'DB', adults: 2 }, { roomType: 'TW', children: 2 }]
-      */
-      paxConfigs,
-      /*
-        The number of second charge units required (second charge units are discussed
-        in the OptionInfo section). Should only be specified for options that have SCUs.
-        Defaults to 1.
-      */
-      chargeUnitQuanity,
-      extras,
-      puInfo,
-      doInfo,
-      notes,
-      QB,
-      directHeaderPayload,
-      directLinePayload,
-      customFieldValues = [],
-    },
-  }) {
-    const cfvPerService = customFieldValues.filter(f => f.isPerService && f.value)
-      .reduce((acc, f) => {
-        if (f.type === 'extended-option') {
-          acc[f.id] = f.value.value || f.value;
-        } else {
-          acc[f.id] = f.value;
-        }
-        return acc;
-      }, {});
-    const model = {
-      AddServiceRequest: {
-        AgentID: hostConnectAgentID,
-        Password: hostConnectAgentPassword,
-        ...(quoteId ? {
-          ExistingBookingInfo: { BookingId: quoteId },
-        } : {
-          NewBookingInfo: {
-            Name: this.escapeInvalidXmlChars(quoteName),
-            QB: QB || 'Q',
-            ...(directHeaderPayload || {}),
-          },
-        }),
-        ...(puInfo && (puInfo.time || puInfo.location || puInfo.flightDetails) ? {
-          ...(puInfo.time && puInfo.time.replace(/\D/g, '') ? {
-            puTime: puInfo.time.replace(/\D/g, ''),
-          } : {}),
-          puRemark: this.escapeInvalidXmlChars(`${puInfo.location ? `Location: ${puInfo.location || 'NA'},` : ''}
-          ${puInfo.flightDetails ? `Flight: ${puInfo.flightDetails || 'NA'},` : ''}
-          `),
-        } : {}),
-        ...(doInfo && (doInfo.time || doInfo.location || doInfo.flightDetails) ? {
-          // only get numbers from doInfo.time
-          ...(doInfo.time && doInfo.time.replace(/\D/g, '') ? {
-            doTime: doInfo.time.replace(/\D/g, ''),
-          } : {}),
-          doRemark: this.escapeInvalidXmlChars(`${doInfo.location ? `Location: ${doInfo.location || 'NA'},` : ''}
-          ${doInfo.flightDetails ? `Flight: ${doInfo.flightDetails || 'NA'},` : ''}
-          `),
-        } : {}),
-        ...(extras && extras.filter(e => e.selectedExtra && e.selectedExtra.id).length ? {
-          ExtraQuantities: {
-            ExtraQuantityItem: extras.filter(e => e.selectedExtra && e.selectedExtra.id).map(e => ({
-              SequenceNumber: e.selectedExtra.id,
-              ExtraQuantity: e.quantity,
-            })),
-          },
-        } : {}),
-        Remarks: this.escapeInvalidXmlChars(notes).slice(0, 220),
-        Opt: optionId,
-        DateFrom: startDate,
-        RateId: rateId || 'Default',
-        SCUqty: (() => {
-          const num = parseInt(chargeUnitQuanity, 10);
-          if (isNaN(num) || num < 1) return 1;
-          return num;
-        })(),
-        AgentRef: reference,
-        RoomConfigs: this.getRoomConfigs(paxConfigs),
-        ...(directLinePayload || {}),
-        ...(cfvPerService || {}),
-      },
-    };
-    const replyObj = await this.callTourplan({
-      model,
-      endpoint: hostConnectEndpoint,
-      axios,
-      xmlOptions: hostConnectXmlOptions,
-    });
-    return {
-      message: R.path(['AddServiceReply', 'Status'], replyObj)
-        === 'NO' ? 'Service cannot be added to quote for the requested date/stay. (e.g. no rates, block out period, on request, minimum stay etc.)' : '',
-      quote: {
-        id: R.path(['AddServiceReply', 'BookingId'], replyObj) || quoteId,
-        reference: R.path(['AddServiceReply', 'Ref'], replyObj),
-        linePrice: R.path(['AddServiceReply', 'Services', 'Service', 'LinePrice'], replyObj),
-        lineId: R.path(['AddServiceReply', 'ServiceLineId'], replyObj),
-      },
-    };
   }
 
   async addServiceToItinerary({
@@ -999,47 +890,27 @@ class BuyerPlugin {
     const replyObjs = await Promise.all(allSearches);
     const bookingHeaders = R.flatten(replyObjs.map(o => R.pathOr([], ['ListBookingsReply', 'BookingHeaders', 'BookingHeader'], o)));
     const bookings = await Promise.map(bookingHeaders, async bookingHeader => {
-      const getBookingPayload = getPayload('GetBookingRequest', {
-        BookingId: R.prop('BookingId', bookingHeader),
-        ReturnAccountInfo: 'Y',
-        ReturnRoomConfigs: 'Y',
-      });
-      const bookingReply = await this.callTourplan(getBookingPayload);
-      const booking = R.path(['GetBookingReply'], bookingReply);
-      const newBooking = await translateItineraryBooking({
-        rootValue: booking,
-        typeDefs: itineraryBookingTypeDefs,
-        query: itineraryBookingQuery,
-      });
-      // TODO: safe to deprecate 7-14 days after release date
-      let Services = R.pathOr([], ['Services', 'Service'], booking);
-      if (!Array.isArray(Services)) Services = [Services];
-      Services = Services.map(s => {
-        let actualRoomConfigs = s.RoomConfigs.RoomConfig;
-        if (!Array.isArray(actualRoomConfigs)) actualRoomConfigs = [actualRoomConfigs];
-        const paxList = actualRoomConfigs.reduce((acc, roomConfig) => {
-          const paxDetails = R.pathOr([], ['PaxList', 'PaxDetails'], roomConfig);
-          if (!Array.isArray(paxDetails)) return acc;
-          return [...acc, ...paxDetails];
-        }, [])
-          .map(p => ({
-            personId: R.path(['PersonId'], p),
-            firstName: R.path(['Forename'], p),
-            lastName: R.path(['Surname'], p),
-          }));
-        return {
-          ...s,
-          paxList,
-        };
-      });
-      return {
-        ...newBooking,
-        ...booking,
-        Services,
-      };
+      try {
+        const getBookingPayload = getPayload('GetBookingRequest', {
+          BookingId: R.prop('BookingId', bookingHeader),
+          ReturnAccountInfo: 'Y',
+          ReturnRoomConfigs: 'Y',
+        });
+        const bookingReply = await this.callTourplan(getBookingPayload);
+        const booking = R.path(['GetBookingReply'], bookingReply);
+        const newBooking = await translateItineraryBooking({
+          rootValue: booking,
+          typeDefs: itineraryBookingTypeDefs,
+          query: itineraryBookingQuery,
+        });
+        return newBooking;
+      } catch (err) {
+        console.log('error in searchBooking', err);
+        return null;
+      }
     }, { concurrency: 10 });
     return {
-      bookings,
+      bookings: bookings.filter(b => b),
     };
   }
 }

package/index.test.js

@@ -52,7 +52,7 @@ describe('search tests', () => {
   };
   const dateFormat = 'DD/MM/YYYY';
   describe('tooling', () => {
-    describe.skip('validateToken', () => {
+    describe('validateToken', () => {
       it('valid token', async () => {
         axios.mockImplementation(getFixture);
         const retVal = await app.validateToken({
@@ -65,12 +65,12 @@ describe('search tests', () => {
         axios.mockImplementation(getFixture);
         const retVal = await app.validateToken({
           axios,
-          token: { ...token, username: 'somerandom' },
+          token: { ...token, username: 'somerandom', hostConnectAgentPassword: 'somerandom' },
         });
         expect(retVal).toBeFalsy();
       });
     });
-    describe.skip('template tests', () => {
+    describe('template tests', () => {
       let template;
       it('get the template', async () => {
         template = await app.tokenTemplate();
@@ -96,7 +96,7 @@ describe('search tests', () => {
       });
     });
   });
-  it.skip('read allotment empty', async () => {
+  it('read allotment empty', async () => {
     const request = axios.mockImplementation(getFixture);
     const retVal = await app.queryAllotment({
       axios,
@@ -119,7 +119,7 @@ describe('search tests', () => {
     expect(sentPayload.Date_From[0]).toBe('2022-08-01');
     expect(sentPayload.Date_To[0]).toBe('2022-08-15');
   });
-  it.skip('read allotment not empty', async () => {
+  it('read allotment not empty', async () => {
     const request = axios.mockImplementation(getFixture);
     const retVal = await app.queryAllotment({
       axios,
@@ -155,7 +155,7 @@ describe('search tests', () => {
     expect(sentPayload.Date_From[0]).toBe('2021-09-02');
     expect(sentPayload.Date_To[0]).toBe('2021-10-02');
   });
-  it.skip('read allotment that applies to more products', async () => {
+  it('read allotment that applies to more products', async () => {
     const request = axios.mockImplementation(getFixture);
     const retVal = await app.queryAllotment({
       axios,
@@ -218,7 +218,7 @@ describe('search tests', () => {
     expect(retVal.bookable).toBeFalsy();
     expect(retVal.rates.length).toBe(0);
   });
-  it('searchAvailabilityForItinerary - bookable', async () => {
+  it('searchAvailabilityForItinerary - bookable - static with inventory', async () => {
     axios.mockImplementation(getFixture);
     const retVal = await app.searchAvailabilityForItinerary({
       axios,
@@ -233,6 +233,23 @@ describe('search tests', () => {
     expect(retVal).toMatchSnapshot();
     expect(retVal.bookable).toBeTruthy();
     expect(retVal.rates.length).toBeGreaterThan(0);
+    expect(retVal.type).toBe('inventory');
+  });
+  it('searchAvailabilityForItinerary - bookable - on request', async () => {
+    axios.mockImplementation(getFixture);
+    const retVal = await app.searchAvailabilityForItinerary({
+      axios,
+      token,
+      payload: {
+        optionId: 'FWMACINVCASFBSB',
+        startDate: '2025-04-01',
+        chargeUnitQuantity: 1,
+        paxConfigs: [{ roomType: 'DB', adults: 1 }],
+      },
+    });
+    expect(retVal).toMatchSnapshot();
+    expect(retVal.bookable).toBeTruthy();
+    expect(retVal.type).toBe('on request');
   });
   it('searchItineraries', async () => {
     axios.mockImplementation(getFixture);

package/package.json

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