ti2-tourplan 1.0.39 → 1.0.41

package/index.js

@@ -104,6 +104,11 @@ class Plugin {
         regExp: /.+/,
       },
     });
+    this.cacheSettings = {
+      bookingsProductSearch: {
+        skipTTL: true,
+      },
+    };
     this.callTourplan = async ({
       model,
       endpoint,
@@ -437,14 +442,7 @@ class Plugin {
       xmlOptions: hostConnectXmlOptions,
     };
     // use cache if we are getting the full list
-    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),
-      });
+    const replyObj = await this.callTourplan(payload);
     let products = [];
     if (replyObj === 'useFixture') {
       products = require('./__fixtures__/fullacoptionlist.json');
@@ -748,6 +746,7 @@ class Plugin {
       purchaseDateStart,
       purchaseDateEnd,
       bookingId,
+      name,
     },
   }) {
     const getPayload = (RequestType, RequestInput) => ({
@@ -766,11 +765,18 @@ class Plugin {
       EnteredDateFrom: purchaseDateStart || moment().subtract(6, 'month').format('YYYY-MM-DD'),
       EnteredDateTo: purchaseDateEnd || moment().format('YYYY-MM-DD'),
     });
-    const allSearches = bookingId
-      ? ['BookingId', 'Ref', 'AgentRef'].map(async key => {
+    let searchCriterias = [];
+    if (bookingId) {
+      searchCriterias = ['BookingId', 'Ref', 'AgentRef'].map(key => ({ [key]: bookingId }));
+    }
+    if (name) {
+      searchCriterias.push({ NameContains: name });
+    }
+    const allSearches = searchCriterias.length
+      ? searchCriterias.map(async keyObj => {
         let reply;
         try {
-          reply = await this.callTourplan(getPayload('ListBookingsRequest', { [key]: bookingId }));
+          reply = await this.callTourplan(getPayload('ListBookingsRequest', keyObj));
         } catch (err) {
           if (err.includes && err.includes('Request failed with status code')) {
             throw Error(err);

package/package.json

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

package/resolvers/product.js

@@ -123,7 +123,6 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
           } : null].filter(Boolean);
         }
         if (R.path(['OptGeneral', 'SType'], option) === 'Y' || R.path(['OptGeneral', 'SType'], option) === 'P') {
-          console.log('hit here')
           return ['Single', 'Twin', 'Double', 'Quad']
             .map((unitId) => ({
               unitId,