ti2-tourplan 1.0.41 → 1.0.43

package/index.js

@@ -142,12 +142,14 @@ class Plugin {
       if (!replyObj) {
         // in case of error /xmlproxy, fallback to call tourplan directly
         // and then use pyfilematch xml2json to parse the xml
-        const reply = R.path(['data'], await axios({
+        const axiospayload = {
           method: 'post',
           url: endpoint,
           data,
           headers: getHeaders({ length: data.length }),
-        }));
+        };
+        // console.log(axiospayload)
+        const reply = R.path(['data'], await axios(axiospayload));
         if (this.xmlProxyUrl) {
           try {
             // using raw axios to avoid logging the large xml request
@@ -170,13 +172,14 @@ class Plugin {
       }
       const requestType = R.keys(model)[0];
       if (!replyObj) throw new Error(`${requestType} failed: ${errorStr || 'no reply object'}`);
-      const error = replyObj.error || R.path(['Reply', 'ErrorReply', 'Error'], replyObj);
+      let error = replyObj.error || R.path(['Reply', 'ErrorReply', 'Error'], replyObj);
       if (error) {
-        if (error.indexOf('2050 SCN Request denied for TEST connecting from') > -1
-          && requestType === 'OptionInfoRequest'
-          && endpoint.indexOf('actour') > -1
-        ) {
-          return 'useFixture';
+        if (error.includes('DateFrom in the past')) {
+          error = '1002 - Date is in the past';
+        } else if (error.includes('1052 SCN')) {
+          error = '1052 - OptionId not found(Check if it is Internet Enabled)';
+        } else if (error.includes('SCN Server overloaded')) {
+          error = "2051 - The Tourplan server is unavailable. Please wait a minute and try again. If you keep getting this error, please contact your team's Tourplan administrator or Tourplan support."
         }
         throw new Error(`${requestType} failed: ${error}`);
       }
@@ -212,15 +215,15 @@ class Plugin {
         if (passengers && passengers.length && !noPaxList) {
           RoomConfig.PaxList = passengers.map(p => {
             const PaxDetails = {
-              Forename: p.firstName,
-              Surname: p.lastName,
+              Forename: this.escapeInvalidXmlChars(p.firstName),
+              Surname: this.escapeInvalidXmlChars(p.lastName),
               PaxType: {
                 Adult: 'A',
                 Child: 'C',
                 Infant: 'I',
               }[p.passengerType] || 'A',
             };
-            if (p.salutation) PaxDetails.Title = p.salutation;
+            if (p.salutation) PaxDetails.Title = this.escapeInvalidXmlChars(p.salutation);
             if (p.dob) PaxDetails.DateOfBirth = p.dob;
             if (!R.isNil(p.age) && !isNaN(p.age)) {
               if (!(p.passengerType === 'Adult' && p.age === 0)) {
@@ -236,7 +239,10 @@ class Plugin {
       });
     this.escapeInvalidXmlChars = str => {
       if (!str) return '';
-      return str.replace(/[^\x00-\x7F]+/g, '')
+      const convertAccentedChars = s => {
+        return s.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+      }
+      return convertAccentedChars(str)
         .replace(/’/g, "'")
         .replace(/‘/g, "'")
         .replace(/“/g, '"')
@@ -442,50 +448,57 @@ class Plugin {
       xmlOptions: hostConnectXmlOptions,
     };
     // use cache if we are getting the full list
-    const replyObj = await this.callTourplan(payload);
-    let products = [];
-    if (replyObj === 'useFixture') {
-      products = require('./__fixtures__/fullacoptionlist.json');
-    } else {
-      products = R.call(R.compose(
-        R.map(optionsGroupedBySupplierId => {
-          const OptGeneral = R.pathOr({}, [0, 'OptGeneral'], optionsGroupedBySupplierId);
-          const supplierData = {
-            supplierId: R.path(['SupplierId'], OptGeneral),
-            supplierName: R.path(['SupplierName'], OptGeneral),
-            supplierAddress: `${R.pathOr('', ['Address1'], OptGeneral)}, ${R.pathOr('', ['Address2'], OptGeneral)},  ${R.pathOr('', ['Address3'], OptGeneral)}, ${R.pathOr('', ['Address4'], OptGeneral)}, ${R.pathOr('', ['Address5'], OptGeneral)}`,
-            serviceTypes: R.uniq(optionsGroupedBySupplierId.map(R.path(['OptGeneral', 'ButtonName']))),
-          };
-          return translateTPOption({
-            supplierData,
-            optionsGroupedBySupplierId,
-            typeDefs: productTypeDefs,
-            query: productQuery,
-          });
-        }),
-        R.values,
-        R.groupBy(R.path(['OptGeneral', 'SupplierId'])),
-        root => {
-          if (!searchInput) return root;
-          const getFullSearchStr = o => {
-            const fullPptionName = `${R.path(['OptGeneral', 'Description'], o) || ''}-${R.path(['OptGeneral', 'Comment'], o) || ''}`;
-            return `${R.path(['OptGeneral', 'SupplierName'], o) || ''} ${fullPptionName} ${R.path(['Opt'], o)} ${R.path(['OptGeneral', 'SupplierId'], o) || ''}`;
-          };
-          const inputValueLower = searchInput.trim().toLowerCase();
-          const parts = inputValueLower.split(' ').filter(Boolean); // Filter out any empty strings just in case
-          return root.filter(option => {
-            const fullSearchStr = getFullSearchStr(option).toLowerCase();
-            return parts.every(part => fullSearchStr.includes(part));
-          });
-        },
-        root => {
-          const options = R.pathOr([], ['OptionInfoReply', 'Option'], root);
-          // due to the new parser, single option will be returned as an object
-          // instead of an array
-          if (Array.isArray(options)) return options;
-          return [options];
-        },
-      ), replyObj);
+    // for example: for searchInput (backend search), we shouldn't get the full list from 
+    // tourplan each time user search
+    const replyObj = optionId
+      ? await this.callTourplan(payload)
+      : await this.cache.getOrExec({
+        fnParams: [model],
+        fn: () => this.callTourplan(payload),
+        ttl: 60 * 60 * 2, // 2 hours
+        forceRefresh: Boolean(forceRefresh),
+      });
+    const products = R.call(R.compose(
+      R.map(optionsGroupedBySupplierId => {
+        const OptGeneral = R.pathOr({}, [0, 'OptGeneral'], optionsGroupedBySupplierId);
+        const supplierData = {
+          supplierId: R.path(['SupplierId'], OptGeneral),
+          supplierName: R.path(['SupplierName'], OptGeneral),
+          supplierAddress: `${R.pathOr('', ['Address1'], OptGeneral)}, ${R.pathOr('', ['Address2'], OptGeneral)},  ${R.pathOr('', ['Address3'], OptGeneral)}, ${R.pathOr('', ['Address4'], OptGeneral)}, ${R.pathOr('', ['Address5'], OptGeneral)}`,
+          serviceTypes: R.uniq(optionsGroupedBySupplierId.map(R.path(['OptGeneral', 'ButtonName']))),
+        };
+        return translateTPOption({
+          supplierData,
+          optionsGroupedBySupplierId,
+          typeDefs: productTypeDefs,
+          query: productQuery,
+        });
+      }),
+      R.values,
+      R.groupBy(R.path(['OptGeneral', 'SupplierId'])),
+      root => {
+        if (!searchInput) return root;
+        const getFullSearchStr = o => {
+          const fullPptionName = `${R.path(['OptGeneral', 'Description'], o) || ''}-${R.path(['OptGeneral', 'Comment'], o) || ''}`;
+          return `${R.path(['OptGeneral', 'SupplierName'], o) || ''} ${fullPptionName} ${R.path(['Opt'], o)} ${R.path(['OptGeneral', 'SupplierId'], o) || ''}`;
+        };
+        const inputValueLower = searchInput.trim().toLowerCase();
+        const parts = inputValueLower.split(' ').filter(Boolean); // Filter out any empty strings just in case
+        return root.filter(option => {
+          const fullSearchStr = getFullSearchStr(option).toLowerCase();
+          return parts.every(part => fullSearchStr.includes(part));
+        });
+      },
+      root => {
+        const options = R.pathOr([], ['OptionInfoReply', 'Option'], root);
+        // due to the new parser, single option will be returned as an object
+        // instead of an array
+        if (Array.isArray(options)) return options;
+        return [options];
+      },
+    ), replyObj);
+    if (!(products && products.length)) {
+      throw new Error('No products found');
     }
     return {
       products,
@@ -673,8 +686,7 @@ class Plugin {
           ...(puInfo.time && puInfo.time.replace(/\D/g, '') ? {
             puTime: puInfo.time.replace(/\D/g, ''),
           } : {}),
-          puRemark: this.escapeInvalidXmlChars(`${puInfo.time ? `Time: ${puInfo.time || 'NA'},` : ''}
-          ${puInfo.location ? `Location: ${puInfo.location || 'NA'},` : ''}
+          puRemark: this.escapeInvalidXmlChars(`${puInfo.location ? `Location: ${puInfo.location || 'NA'},` : ''}
           ${puInfo.flightDetails ? `Flight: ${puInfo.flightDetails || 'NA'},` : ''}
           `),
         } : {}),
@@ -683,12 +695,11 @@ class Plugin {
           ...(doInfo.time && doInfo.time.replace(/\D/g, '') ? {
             doTime: doInfo.time.replace(/\D/g, ''),
           } : {}),
-          doRemark: this.escapeInvalidXmlChars(`${doInfo.time ? `Time: ${doInfo.time || 'NA'},` : ''}
-          ${doInfo.location ? `Location: ${doInfo.location || 'NA'},` : ''}
+          doRemark: this.escapeInvalidXmlChars(`${doInfo.location ? `Location: ${doInfo.location || 'NA'},` : ''}
           ${doInfo.flightDetails ? `Flight: ${doInfo.flightDetails || 'NA'},` : ''}
           `),
         } : {}),
-        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 240),
+        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 220),
         Opt: optionId,
         DateFrom: startDate,
         RateId: 'Default',
@@ -767,10 +778,10 @@ class Plugin {
     });
     let searchCriterias = [];
     if (bookingId) {
-      searchCriterias = ['BookingId', 'Ref', 'AgentRef'].map(key => ({ [key]: bookingId }));
+      searchCriterias = ['BookingId', 'Ref', 'AgentRef'].map(key => ({ [key]: this.escapeInvalidXmlChars(bookingId) }));
     }
     if (name) {
-      searchCriterias.push({ NameContains: name });
+      searchCriterias.push({ NameContains: this.escapeInvalidXmlChars(name) });
     }
     const allSearches = searchCriterias.length
       ? searchCriterias.map(async keyObj => {

package/package.json

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