ti2-tourplan 1.0.65 → 1.0.67

package/__fixtures__/GetServicesRequest_a1d6da590c93bb39ee48ad95e3204590c25b4bc4.txt

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Reply SYSTEM "http://localhost:8080/iCom_Test/hostConnect_4_06_009.dtd">
+<Reply>
+    <GetServicesReply>
+        <TPLServices>
+            <TPLService>
+                <Code>AC</Code>
+                <Name>Activity</Name>
+            </TPLService>
+        </TPLServices>
+    </GetServicesReply>
+</Reply>

package/index.js

@@ -248,6 +248,12 @@ class BuyerPlugin {
         .replace(BAD_XML_CHARS, '')
     };
 
+    this.cacheSettings = {
+      bookingsProductSearch: {
+        // ttl: 60 * 60 * 24, // 1 day
+      },
+    };
+
     // this.errorPathsAxiosErrors = () => ([ // axios triggered errors
     //   ['response', 'data', 'error'],
     // ]);
@@ -296,7 +302,7 @@ class BuyerPlugin {
       assert(R.path(['AuthenticationReply'], replyObj) === '');
       return true;
     } catch (err) {
-      console.log(err)
+      console.log(err.message);
       return false;
     }
   }
@@ -434,74 +440,75 @@ class BuyerPlugin {
       lastUpdatedFrom,
     },
   }) {
-    const model = {
-      OptionInfoRequest: {
-        Opt: optionId || '?????????????????',
-        Info: 'G',
+    /*
+      Pseudo
+      1. getServiceCodes -> [AC, BD]
+      2. for each serviceCode getoptions
+      3. convert them to ti2 products structure
+      4. merge all products from all serviceCodes
+    */
+    // getServices
+    const getServicesModel = {
+      GetServicesRequest: {
         AgentID: hostConnectAgentID,
         Password: hostConnectAgentPassword,
-        ...(lastUpdatedFrom ? {
-          LastUpdateFrom: lastUpdatedFrom,
-        } : {}),
       },
     };
-    const payload = {
-      model,
+    const getServicesReply = await this.callTourplan({
+      model: getServicesModel,
       endpoint: hostConnectEndpoint,
       axios,
       xmlOptions: hostConnectXmlOptions,
-    };
-    // use cache if we are getting the full list
-    // 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({
-        // goway and pdnz uses the same AgentID and Password for agents
-        // but their endpoint is different
-        // so they had been overwritting each other's cache
-        fnParams: [model, hostConnectEndpoint],
-        fn: () => this.callTourplan(payload),
-        ttl: 60 * 60 * 2, // 2 hours
-        forceRefresh: Boolean(forceRefresh),
+    });
+    let serviceCodes = R.pathOr([], ['GetServicesReply', 'TPLServices', 'TPLService'], getServicesReply);
+    if (!Array.isArray(serviceCodes)) serviceCodes = [serviceCodes];
+    serviceCodes = serviceCodes.map(s => s.Code);
+    let products = [];
+    await Promise.each(serviceCodes, async serviceCode => {
+      const getOptionsModel = {
+        OptionInfoRequest: {
+          Opt: `???${serviceCode}????????????`,
+          Info: 'G',
+          AgentID: hostConnectAgentID,
+          Password: hostConnectAgentPassword,
+          ...(lastUpdatedFrom ? {
+            LastUpdateFrom: lastUpdatedFrom,
+          } : {}),
+        },
+      };
+      const getOptionsReply = await this.callTourplan({
+        model: getOptionsModel,
+        endpoint: hostConnectEndpoint,
+        axios,
+        xmlOptions: hostConnectXmlOptions,
       });
-    const arrayOfOptionsGroupedBySupplierId = R.call(R.compose(
-      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);
-    const products = await Promise.map(
-      arrayOfOptionsGroupedBySupplierId,
-      optionsGroupedBySupplierId => translateTPOption({
-        rootValue: {
-          optionsGroupedBySupplierId,
+      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;
         },
-        typeDefs: itineraryProductTypeDefs,
-        query: itineraryProductQuery,
-      }),
-      {
-        concurrency: 10,
-      },
-    );
+      ), getOptionsReply);
+      const productsForServiceCode = await Promise.map(
+        arrayOfOptionsGroupedBySupplierId,
+        optionsGroupedBySupplierId => translateTPOption({
+          rootValue: {
+            optionsGroupedBySupplierId,
+          },
+          typeDefs: itineraryProductTypeDefs,
+          query: itineraryProductQuery,
+        }),
+        {
+          concurrency: 10,
+        },
+      );
+      products = products.concat(productsForServiceCode);
+    });
     if (!(products && products.length)) {
       throw new Error('No products found');
     }
@@ -917,7 +924,7 @@ class BuyerPlugin {
         });
         return newBooking;
       } catch (err) {
-        console.log('error in searchBooking', err);
+        console.log('error in searchBooking', err.message);
         return null;
       }
     }, { concurrency: 10 });

package/index.test.js

@@ -23,8 +23,12 @@ jest.mock('axios');
 const actualAxios = jest.requireActual('axios');
 
 const getFixture = async requestObject => {
+  // Extract request name using regex
+  const requestName = requestObject.data && typeof requestObject.data === 'string' && R.pathOr('UnknownRequest', [1], requestObject.data.match(/<(\w+Request)>/))
+    ? R.pathOr('UnknownRequest', [1], requestObject.data.match(/<(\w+Request)>/))
+    : 'UnknownRequest';
   const requestHash = hash(requestObject);
-  const file = path.resolve(__dirname, `./__fixtures__/${requestHash}.txt`);
+  const file = path.resolve(__dirname, `./__fixtures__/${requestName}_${requestHash}.txt`);
   try {
     const fixture = (
       await readFile(file)
@@ -235,6 +239,7 @@ describe('search tests', () => {
     expect(retVal.rates.length).toBeGreaterThan(0);
     expect(retVal.type).toBe('inventory');
   });
+  // Skip this test because we aren't using A check anymore
   it.skip('searchAvailabilityForItinerary - bookable - on request', async () => {
     axios.mockImplementation(getFixture);
     const retVal = await app.searchAvailabilityForItinerary({

package/package.json

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