ti2-ventrata 1.0.4 → 1.0.7

package/index.js

@@ -14,15 +14,22 @@ const isNilOrEmptyArray = el => {
   return R.isNil(el) || R.isEmpty(el);
 };
 
-const doMap = (obj, map) => {
+const doMap = (obj, map, omitParam = []) => {
   const retVal = {};
+  const omit = [
+    ...omitParam,
+    ...Object.keys(map),
+  ];
   Object.entries(map).forEach(([attribute, fn]) => {
     const newVal = fn(obj);
     if (newVal !== undefined) {
       retVal[attribute] = newVal;
     }
   });
-  return retVal;
+  return {
+    ...retVal,
+    ...R.omit(omit, obj),
+  };
 };
 
 const doMapCurry = mapObj => item => doMap(item, mapObj);
@@ -30,10 +37,13 @@ const doMapCurry = mapObj => item => doMap(item, mapObj);
 const productMapIn = {
   productId: R.path(['id']),
   productName: R.path(['title']),
-  options: e => e.options.map(option => ({
-    optionId: R.path(['id'], option),
-    optionName: R.path(['title'], option),
-  })),
+  options: e => R.pathOr(undefined, ['options'], e).map(option => doMap(option, optionMapIn, ['id', 'title'])),
+};
+
+const optionMapIn = {
+  optionId: R.path(['id']),
+  optionName: R.path(['title']),
+  units: option => R.pathOr(undefined, ['units'], option).map(unit => doMap(unit, unitMap)),
 };
 
 const rateMap = {
@@ -68,12 +78,6 @@ const capitalize = sParam => {
   return s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
 };
 
-// const optionMap = {
-//   optionId: R.path(['id']),
-//   optionName: R.path(['title']),
-//   units: option => R.pathOr(undefined, ['units'], option).map(unit => doMap(unit, unitMap)),
-// };
-
 const unitMap = {
   unitId: R.path(['id']),
   unitName: R.path(['title']),
@@ -199,14 +203,17 @@ class Plugin {
       headers,
     }));
     if (!Array.isArray(results)) results = [results];
-    let products = results.map(e => doMap(e, productMapIn));
+    let products = results.map(e => doMap(e, productMapIn, ['id', 'title']));
     // dynamic extra filtering
     if (!isNilOrEmpty(payload)) {
       const extraFilters = R.omit(['productId'], payload);
       if (Object.keys(extraFilters).length > 0) {
         products = products.filter(
           product => Object.entries(extraFilters).every(
-            ([key, value]) => wildcardMatch(value, product[key]),
+            ([key, value]) => {
+              if (typeof value === 'string') return wildcardMatch(value, product[key]);
+              return true;
+            },
           ),
         );
       }
@@ -272,7 +279,7 @@ class Plugin {
       optionIds,
       occupancies,
       startDate,
-      // endDate,
+      endDate,
       dateFormat,
     },
   }) {
@@ -290,7 +297,7 @@ class Plugin {
     assert(optionIds.every(Boolean), 'some invalid optionId(s)');
     assert(occupancies.every(Boolean), 'some invalid occupacies(s)');
     const localDateStart = moment(startDate, dateFormat).format('YYYY-MM-DD');
-    const localDateEnd = moment(startDate, dateFormat).format('YYYY-MM-DD');
+    const localDateEnd = moment(endDate, dateFormat).format('YYYY-MM-DD');
     // obtain the rates
     const { quote } = await this.searchQuote({
       token,

package/index.test.js

@@ -10,13 +10,13 @@ const app = new Plugin({
   jwtKey: process.env.ti2_ventrata_jwtKey,
 });
 
-const rnd = (arr) => arr[Math.floor(Math.random() * arr.length)];
+const rnd = arr => arr[Math.floor(Math.random() * arr.length)];
 
 describe('search tests', () => {
   let products;
   let testProduct = {
     productName: 'Pub Crawl Tour',
-  }
+  };
   const token = {
     apiKey: process.env.ti2_ventrata_apiKey,
     endpoint: process.env.ti2_ventrata_endpoint,
@@ -74,7 +74,7 @@ describe('search tests', () => {
         token,
         payload: {
           productId: testProduct.productId,
-        }
+        },
       });
       expect(Array.isArray(retVal.products)).toBeTruthy();
       expect(retVal.products).toHaveLength(1);
@@ -181,7 +181,7 @@ describe('search tests', () => {
             phoneNumber: faker.phone.phoneNumber(),
             emailAddress: `salvador+tests_${faker.lorem.slug()}@tourconnect.com`,
             country: faker.address.countryCode(),
-            locales:  ['en-US', 'en', 'es'],
+            locales: ['en-US', 'en', 'es'],
           },
           reference,
         },
@@ -189,9 +189,9 @@ describe('search tests', () => {
       expect(retVal.booking).toBeTruthy();
       ({ booking } = retVal);
       expect(booking).toBeTruthy();
-      expect(R.path(['id'], booking)).toBeTruthy()
-      expect(R.path(['supplierId'], booking)).toBeTruthy()
-      expect(R.path(['cancellable'], booking)).toBeTruthy()
+      expect(R.path(['id'], booking)).toBeTruthy();
+      expect(R.path(['supplierId'], booking)).toBeTruthy();
+      expect(R.path(['cancellable'], booking)).toBeTruthy();
       // console.log({ booking });
     });
     it('should be able to cancel the booking', async () => {
@@ -200,13 +200,13 @@ describe('search tests', () => {
         payload: {
           bookingId: booking.id,
           reason: faker.lorem.paragraph(),
-        }
+        },
       });
-      ({ cancellation } = retVal);
+      const { cancellation } = retVal;
       expect(cancellation).toBeTruthy();
       expect(cancellation).toBeTruthy();
-      expect(R.path(['id'], cancellation)).toBeTruthy()
-      expect(R.path(['cancellable'], cancellation)).toBeFalsy()
+      expect(R.path(['id'], cancellation)).toBeTruthy();
+      expect(R.path(['cancellable'], cancellation)).toBeFalsy();
     });
     let bookings = [];
     it('it should be able to search bookings by id', async () => {
@@ -214,33 +214,33 @@ describe('search tests', () => {
         token,
         payload: {
           bookingId: booking.id,
-        }
+        },
       });
       expect(Array.isArray(retVal.bookings)).toBeTruthy();
       ({ bookings } = retVal);
-      expect(R.path([0, 'id'], bookings)).toBeTruthy()
+      expect(R.path([0, 'id'], bookings)).toBeTruthy();
     });
     it('it should be able to search bookings by reference', async () => {
       const retVal = await app.searchBooking({
         token,
         payload: {
           bookingId: reference,
-        }
+        },
       });
       expect(Array.isArray(retVal.bookings)).toBeTruthy();
       ({ bookings } = retVal);
-      expect(R.path([0, 'id'], bookings)).toBeTruthy()
+      expect(R.path([0, 'id'], bookings)).toBeTruthy();
     });
     it('it should be able to search bookings by supplierId', async () => {
       const retVal = await app.searchBooking({
         token,
         payload: {
           bookingId: booking.supplierId,
-        }
+        },
       });
       expect(Array.isArray(retVal.bookings)).toBeTruthy();
       ({ bookings } = retVal);
-      expect(R.path([0, 'id'], bookings)).toBeTruthy()
+      expect(R.path([0, 'id'], bookings)).toBeTruthy();
     });
     it('it should be able to search bookings by travelDate', async () => {
       const retVal = await app.searchBooking({
@@ -249,11 +249,11 @@ describe('search tests', () => {
           travelDateStart: moment().add(6, 'M').format(dateFormat),
           travelDateEnd: moment().add(6, 'M').add(2, 'd').format(dateFormat),
           dateFormat,
-        }
+        },
       });
       expect(Array.isArray(retVal.bookings)).toBeTruthy();
       ({ bookings } = retVal);
-      expect(R.path([0, 'id'], bookings)).toBeTruthy()
+      expect(R.path([0, 'id'], bookings)).toBeTruthy();
     });
- });
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-ventrata",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Ventrata's TI2 Plugin",
   "main": "index.js",
   "scripts": {