ti2-ventrata 1.0.5 → 1.0.8

package/index.js

@@ -37,6 +37,8 @@ const doMapCurry = mapObj => item => doMap(item, mapObj);
 const productMapIn = {
   productId: R.path(['id']),
   productName: R.path(['title']),
+  availableCurrencies: R.path(['availableCurrencies']),
+  defaultCurrency: R.path(['defaultCurrency']),
   options: e => R.pathOr(undefined, ['options'], e).map(option => doMap(option, optionMapIn, ['id', 'title'])),
 };
 
@@ -57,6 +59,7 @@ const availabilityMap = {
   dateTimeEnd: R.path(['localDateTimeEnd']),
   allDay: R.path(['allDay']),
   pricing: R.path(['pricing']),
+  unitPricing: R.path(['unitPricing']),
   offer: avail => (avail.offerCode ? doMap(avail, {
     offerId: R.path(['offerCode']),
     title: R.pathOr(undefined, ['offerTitle']),
@@ -81,8 +84,9 @@ const capitalize = sParam => {
 const unitMap = {
   unitId: R.path(['id']),
   unitName: R.path(['title']),
+  subtitle: R.path(['subtitle']),
   restrictions: R.path(['restrictions']),
-  pricing: R.path(['pricing']),
+  pricing: root => R.path(['pricing'], root) || R.path(['pricingFrom'], root),
 };
 
 const itineraryMap = {
@@ -103,11 +107,13 @@ const itineraryMap = {
 
 const unitItemMap = {
   unitItemId: R.path(['uuid']),
+  unitId: R.path(['unitId']),
+  unitName: R.path(['unit', 'title']),
   supplierId: R.path(['supplierReference']),
   status: e => capitalize(R.path(['status'], e)),
   contact: R.path(['contact']),
   pricing: R.path(['pricing']),
-  unit: unit => doMap(unit, unitMap),
+  unit: root => doMap(root.unit, unitMap),
 };
 
 const contactMapOut = {
@@ -123,11 +129,14 @@ const contactMapOut = {
 
 const bookingMap = {
   id: R.path(['id']),
+  orderId: R.path(['orderReference']),
+  bookingId: R.path(['supplierReference']),
   supplierId: R.path(['supplierReference']),
   status: e => capitalize(R.path(['status'], e)),
   productId: R.path(['product', 'id']),
   productName: R.path(['product', 'title']),
   optionId: R.path(['option', 'id']),
+  optionName: R.path(['option', 'title']),
   itinerary: ({ option: { itinerary } = {} }) =>
     (isNilOrEmptyArray(itinerary) ? undefined : itinerary.map(doMapCurry(itineraryMap))),
   duration: booking => doMap(booking, {
@@ -141,7 +150,7 @@ const bookingMap = {
   start: R.path(['availability', 'localDateTimeStart']),
   end: R.path(['availability', 'localDateTimeEnd']),
   allDay: R.path(['availability', 'allDay']),
-  bookingDate: R.path(['hotel', 'utcCreatedAt']),
+  bookingDate: R.path(['utcCreatedAt']),
   holder: booking => doMap(R.path(['contact'], booking), contactMapOut),
   telephone: R.pathOr(undefined, ['contact', 'phoneNumber']),
   notes: R.pathOr(undefined, ['notes']),
@@ -210,7 +219,10 @@ class Plugin {
       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;
+            },
           ),
         );
       }
@@ -276,8 +288,9 @@ class Plugin {
       optionIds,
       occupancies,
       startDate,
-      // endDate,
+      endDate,
       dateFormat,
+      currency,
     },
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
@@ -294,7 +307,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,
@@ -320,6 +333,7 @@ class Plugin {
           optionId: optionIds[rateIx],
           localDateStart,
           localDateEnd,
+          currency,
           units: Object.entries(qtys).map(([id, quantity]) => ({
             id, quantity,
           })),
@@ -339,6 +353,7 @@ class Plugin {
             productId: productIds[availsIx],
             optionId: optionIds[availsIx],
             availabilityId: avail.id,
+            currency,
             unitItems: rates[availsIx].map(rate => ({ unitId: rate })),
           }), this.jwtKey),
           ...doMap(avail, availabilityMap),

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.5",
+  "version": "1.0.8",
   "description": "Ventrata's TI2 Plugin",
   "main": "index.js",
   "scripts": {