ti2-tourplan 1.0.28 → 1.0.30

package/index.js

@@ -364,7 +364,14 @@ class Plugin {
       xmlOptions: hostConnectXmlOptions,
     };
     // use cache if we are getting the full list
-    const replyObj = await this.callTourplan(payload);
+    const replyObj = optionId
+      ? await this.callTourplan(payload)
+      : await this.cache.getOrExec({
+        fnParams: [model],
+        fn: () => this.callTourplan(payload),
+        ttl: 60 * 60 * 24, // 24 hours
+        forceRefresh: Boolean(forceRefresh),
+      });
     let products = [];
     if (replyObj === 'useFixture') {
       products = require('./__fixtures__/fullacoptionlist.json');
@@ -396,74 +403,86 @@ class Plugin {
         },
       ), replyObj);
     }
-    const productFields = [{
-      id: 'productId',
-      title: 'Supplier',
-      type: 'extended-option',
-      requiredForAvailability: true,
-      requiredForBooking: true,
-      // options: products.map(p => ({
-      //   value: p.productId,
-      //   label: p.productName,
-      // })),
-    }, {
-      id: 'optionId',
-      title: 'Service',
-      type: 'extended-option',
-      requiredForAvailability: true,
-      requiredForBooking: true,
-      filterableBy: 'productId',
-      // options: R.chain(p => p.options.map(o => ({
-      //   label: o.optionName,
-      //   value: o.optionId,
-      //   productId: p.productId,
-      //   productName: p.productName,
-      // })), products),
-    }, {
-      id: 'startDate',
-      title: 'Date',
-      type: 'date',
-      requiredForAvailability: true,
-      requiredForBooking: true,
-    }, {
-      id: 'paxConfigs',
-      title: 'Pax',
-      type: 'list_of_fields',
-      requiredForAvailability: true,
-      requiredForBooking: true,
-      fields: [{
-        id: 'adults',
-        title: 'Adults',
-        type: 'count',
-      }, {
-        id: 'children',
-        title: 'Children',
-        type: 'count',
-      }, {
-        id: 'infants',
-        title: 'Infants',
-        type: 'count',
-      }, {
-        id: 'roomType',
-        title: 'Room Type',
-        type: 'extended-option',
-        options: [{ value: 'SG', label: 'Single' }, { value: 'DB', label: 'Double' }, { value: 'TW', label: 'Twin' }, { value: 'QD', label: 'Quad' }],
-      }],
-      requiredForCalendar: true,
-    }, {
-      id: 'chargeUnitQuanity', // secondary charge unit (SCU) quantity
-      description: 'number of nights or days or hours depending on charge unit',
-      title: 'Nights/Days',
-      type: 'count',
-    }];
     return {
       products,
-      productFields,
+      productFields: [],
       ...configuration,
     };
   }
 
 
+  async searchAvailability({
+    axios,
+    token: {
+      hostConnectEndpoint,
+      hostConnectAgentID,
+      hostConnectAgentPassword,
+    },
+    payload: {
+      optionId,
+      startDate,
+      reference,
+      /*
+      paxConfigs: [{ roomType: 'DB', adults: 2 }, { roomType: 'TW', children: 2 }]
+      */
+      paxConfigs,
+      // passengers,
+      /*
+        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,
+    },
+  }) {
+    const model = {
+      OptionInfoRequest: {
+        Opt: optionId,
+        Info: 'A',
+        DateFrom: startDate,
+        DateTo: startDate,
+        RoomConfigs: paxConfigs.map(obj => {
+          const RoomConfig = {
+            Adults: obj.adults || 0,
+            Children: obj.children || 0,
+            Infants: obj.infants || 0,
+          };
+          const RoomType = ({
+            Single: 'SG',
+            Double: 'DB',
+            Twin: 'TW',
+            Triple: 'TR',
+            Quad: 'QU',
+          })[obj.roomType];
+          if (RoomType) RoomConfig.RoomType = RoomType;
+          return { RoomConfig };
+        }),
+        AgentID: hostConnectAgentID,
+        Password: hostConnectAgentPassword,
+      },
+    };
+    const replyObj = await this.callTourplan({
+      model,
+      endpoint: hostConnectEndpoint,
+      axios,
+      xmlOptions: hostConnectXmlOptions,
+    });
+    const optAvail = R.path(['OptionInfoReply', 'Option', 'OptAvail'], replyObj);
+    /*
+    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.
+    */
+  }
+
   async searchQuote({
     axios,
     token: {
@@ -473,6 +492,7 @@ class Plugin {
     },
     payload: {
       quoteName,
+      rateId,
       quoteId,
       // existingQuoteId,
       // existingLineId,
@@ -483,13 +503,15 @@ class Plugin {
       paxConfigs: [{ roomType: 'DB', adults: 2 }, { roomType: 'TW', children: 2 }]
       */
       paxConfigs,
-      // passengers,
       /*
         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,
     },
   }) {
     const model = {
@@ -501,25 +523,72 @@ class Plugin {
         } : {
           NewBookingInfo: { Name: quoteName, QB: 'Q' },
         }),
+        ...(rateId ? {
+          RateId: rateId,
+        } : {}),
+        ...(puInfo ? {
+          puTime: puInfo.time,
+          puRemark: `Time: ${puInfo.time || 'NA'},
+          Location: ${puInfo.location || 'NA'},
+          Flight: ${puInfo.flightDetails || 'NA'},
+          `,
+        } : {}),
+        ...(doInfo ? {
+          doTime: doInfo.time,
+          doRemark: `Time: ${doInfo.time || 'NA'},
+          Location: ${doInfo.location || 'NA'},
+          Flight: ${doInfo.flightDetails || 'NA'},
+          `,
+        } : {}),
+        ...(extras && extras.length ? {
+          Remarks: extras.map((e, i) => `Extra ${i + 1}: ${e.name} x ${e.quantity}`).join(`\n`),
+        } : {}),
         Opt: optionId,
         DateFrom: startDate,
         RateId: 'Default',
         SCUqty: chargeUnitQuanity || 1,
         AgentRef: reference,
-        RoomConfigs: paxConfigs.map(obj => {
-          const RoomConfig = {
-            Adults: obj.adults || 0,
-            Children: obj.children || 0,
-            Infants: obj.infants || 0,
-          };
+        RoomConfigs: paxConfigs.map(({ roomType, passengers }) => {
+          const RoomConfig = passengers.reduce((acc, p) => {
+            if (p.passengerType === 'Adult') {
+              acc.Adults += 1;
+            }
+            if (p.passengerType === 'Child') {
+              acc.Children += 1;
+            }
+            if (p.passengerType === 'Infant') {
+              acc.Infants += 1;
+            }
+            return acc;
+          }, {
+            Adults: 0,
+            Children: 0,
+            Infants: 0,
+          });
           const RoomType = ({
             Single: 'SG',
             Double: 'DB',
             Twin: 'TW',
             Triple: 'TR',
             Quad: 'QU',
-          })[obj.roomType];
+          })[roomType];
           if (RoomType) RoomConfig.RoomType = RoomType;
+          if (passengers && passengers.length) {
+            RoomConfig.PaxList = passengers.map(p => ({
+              PaxDetails: {
+                Forename: p.firstName,
+                Surname: p.lastName,
+                PaxType: {
+                  Adult: 'A',
+                  Child: 'C',
+                  Infant: 'I',
+                }[p.passengerType],
+                Age: p.age,
+                DateOfBirth: p.dob,
+                Title: p.salutation,
+              },
+            }));
+          }
           return { RoomConfig };
         }),
       },

package/package.json

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

package/resolvers/product.js

@@ -49,6 +49,38 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
         }`,
         // Guides, Accommodation, Transfers, Entrance Fees, Meals, Other
         serviceType: R.path(['OptGeneral', 'ButtonName'], option),
+        restrictions: {
+          MPFCU: R.path(['OptGeneral', 'MPFCU'], option),
+          roomTypeRequired: ['Y', 'P'].includes(R.path(['OptGeneral', 'SType'], option)),
+          Adult: {
+            allowed: R.path(['OptGeneral', 'AdultsAllowed'], option) === 'Y',
+            minAge: R.path(['OptGeneral', 'Adult_From'], option),
+            maxAge: R.path(['OptGeneral', 'Adult_To'], option),
+          },
+          Child: {
+            allowed: R.path(['OptGeneral', 'ChildrenAllowed'], option) === 'Y',
+            minAge: R.path(['OptGeneral', 'Child_From'], option),
+            maxAge: R.path(['OptGeneral', 'Child_To'], option),
+          },
+          Infant: {
+            allowed: R.path(['OptGeneral', 'InfantsAllowed'], option) === 'Y',
+            minAge: R.path(['OptGeneral', 'Infant_From'], option),
+            maxAge: R.path(['OptGeneral', 'Infant_To'], option),
+          },
+          ...['Single', 'Twin', 'Double', 'Quad'].reduce((acc, roomType) => {
+            const unitAvail = R.path(['OptGeneral', `${roomType}_Avail`], option);
+            const unitMax = R.path(['OptGeneral', `${roomType}_Max`], option);
+            const unitAdMax = R.path(['OptGeneral', `${roomType}_Ad_Max`], option);
+            return {
+              ...acc,
+              [roomType]: {
+                allowed: unitAvail === 'Y',
+                maxPax: unitMax,
+                maxAdults: unitAdMax,
+              },
+            };
+          }, {}),
+        },
       };
       /*
       SType: One character that specifies the service type of the
@@ -68,7 +100,6 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
             unitName: 'Adults',
             pricing: [],
             restrictions: {
-              paxCount: R.path(['OptGeneral', 'MPFCU'], option),
               minAge: R.path(['OptGeneral', 'Adult_From'], option),
               maxAge: R.path(['OptGeneral', 'Adult_To'], option),
             },
@@ -90,14 +121,14 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
             },
           } : null].filter(Boolean);
         }
-        if (R.path(['OptGeneral', 'SType'], option) === 'Y') {
-          return [['SG', 'Single'], ['TW', 'Twin'], ['DB', 'Double'], ['QD', 'Quad']]
-            .filter(([_, unitName]) => R.path(['OptGeneral', `${unitName}_Avail`], option) === 'Y')
+        if (R.path(['OptGeneral', 'SType'], option) === 'Y' || R.path(['OptGeneral', 'SType'], option) === 'P') {
+          return ['Single', 'Twin', 'Double', 'Quad']
             .map(([unitId, unitName]) => ({
               unitId,
               unitName,
               pricing: [],
               restrictions: {
+                allowed: R.path(['OptGeneral', `${unitName}_Avail`], option) === 'Y',
                 paxCount: R.path(['OptGeneral', `${unitName}_Max`], option)
                 || R.path(['OptGeneral', `${unitName}_Ad_Max`], option),
               },