ti2-tourplan 1.0.60 → 1.0.62

package/__snapshots__/index.test.js.snap

@@ -3305,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

@@ -597,54 +597,54 @@ class BuyerPlugin {
       }
     */
     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,
-      };
-    })();
+    // 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(SCheckPass || ACheckPass.available),
-      type: ACheckPass.type,
+      bookable: Boolean(SCheckPass),
+      type: 'inventory',
       rates: OptStayResults.map(rate => {
         let externalRateText = R.pathOr('', ['ExternalRateDetails', 'ExtOptionDescr'], rate);
         const extRatePlanDescr = R.pathOr('', ['ExternalRateDetails', 'ExtRatePlanDescr'], rate);
@@ -659,124 +659,6 @@ class BuyerPlugin {
     };
   }
 
-
-  // 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({
     axios,
     token: {
@@ -1008,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

@@ -235,7 +235,7 @@ describe('search tests', () => {
     expect(retVal.rates.length).toBeGreaterThan(0);
     expect(retVal.type).toBe('inventory');
   });
-  it('searchAvailabilityForItinerary - bookable - on request', async () => {
+  it.skip('searchAvailabilityForItinerary - bookable - on request', async () => {
     axios.mockImplementation(getFixture);
     const retVal = await app.searchAvailabilityForItinerary({
       axios,

package/package.json

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