ti2-tourplan 1.0.70 → 1.0.72

package/index.js

@@ -87,24 +87,23 @@ class BuyerPlugin {
       data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
       let replyObj;
       let errorStr;
-      // can't use proxy because of the static IP thing, darn
-      // if (this.xmlProxyUrl) {
-      //   // use pyfilematch xmlproxy
-      //   try {
-      //     replyObj = R.path(['data'], await axios({
-      //       method: 'post',
-      //       url: `${this.xmlProxyUrl}/xmlproxy`,
-      //       data: {
-      //         url: endpoint,
-      //         data,
-      //         headers: getHeaders({ length: `${data.length}` }),
-      //       },
-      //     }));
-      //   } catch (err) {
-      //     console.log('error in calling pyfilematch xmlproxy', err);
-      //     errorStr = `error in calling pyfilematch xmlproxy: ${err}`;
-      //   }
-      // }
+      if (this.xmlProxyUrl) {
+        // use pyfilematch xmlproxy to avoid passing large payloads back and forth
+        try {
+          replyObj = R.path(['data'], await axios({
+            method: 'post',
+            url: `${this.xmlProxyUrl}/xmlproxy`,
+            data: {
+              url: endpoint,
+              data,
+              headers: getHeaders({ length: `${data.length}` }),
+            },
+          }));
+        } catch (err) {
+          console.log('error in calling pyfilematch xmlproxy', err);
+          errorStr = `error in calling pyfilematch xmlproxy: ${err}`;
+        }
+      }
       if (!replyObj) {
         // in case of error /xmlproxy, fallback to call tourplan directly
         // and then use pyfilematch xml2json to parse the xml
@@ -463,7 +462,7 @@ class BuyerPlugin {
     let serviceCodes = R.pathOr([], ['GetServicesReply', 'TPLServices', 'TPLService'], getServicesReply);
     if (!Array.isArray(serviceCodes)) serviceCodes = [serviceCodes];
     serviceCodes = serviceCodes.map(s => s.Code);
-    let products = [];
+    let options = [];
     await Promise.each(serviceCodes, async serviceCode => {
       const getOptionsModel = {
         OptionInfoRequest: {
@@ -482,36 +481,33 @@ class BuyerPlugin {
         axios,
         xmlOptions: hostConnectXmlOptions,
       });
-      const arrayOfOptionsGroupedBySupplierId = R.call(R.compose(
-        R.values,
-        R.groupBy(R.path(['OptGeneral', 'SupplierId'])),
-        root => {
-          let 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)) options = [options];
-          console.log(`got ${options.length} options for serviceCode ${serviceCode}`);
-          return options;
-        },
-      ), getOptionsReply);
-      const productsForServiceCode = await Promise.map(
-        arrayOfOptionsGroupedBySupplierId,
-        optionsGroupedBySupplierId => translateTPOption({
-          rootValue: {
-            optionsGroupedBySupplierId,
-          },
-          typeDefs: itineraryProductTypeDefs,
-          query: itineraryProductQuery,
-        }),
-        {
-          concurrency: 10,
-        },
-      );
-      products = products.concat(productsForServiceCode);
+      let thisOptions = R.pathOr([], ['OptionInfoReply', 'Option'], getOptionsReply);
+      // due to the new parser, single option will be returned as an object
+      // instead of an array
+      if (!Array.isArray(thisOptions)) thisOptions = [thisOptions];
+      console.log(`got ${thisOptions.length} options for serviceCode ${serviceCode}`);
+      options = options.concat(thisOptions);
     });
-    if (!(products && products.length)) {
+    if (!(options && options.length)) {
       throw new Error('No products found');
     }
+    const arrayOfOptionsGroupedBySupplierId = R.call(R.compose(
+      R.values,
+      R.groupBy(R.path(['OptGeneral', 'SupplierId'])),
+    ), options);
+    const products = await Promise.map(
+      arrayOfOptionsGroupedBySupplierId,
+      optionsGroupedBySupplierId => translateTPOption({
+        rootValue: {
+          optionsGroupedBySupplierId,
+        },
+        typeDefs: itineraryProductTypeDefs,
+        query: itineraryProductQuery,
+      }),
+      {
+        concurrency: 10,
+      },
+    );
     return {
       products,
       productFields: [],

package/package.json

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