ti2-ventrata 1.0.7 → 1.0.10

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'])),
 };
 
@@ -53,10 +55,11 @@ const rateMap = {
 };
 
 const availabilityMap = {
-  dateTimeStart: R.path(['localDateTimeStart']),
-  dateTimeEnd: R.path(['localDateTimeEnd']),
+  dateTimeStart: root => R.path(['localDateTimeStart'], root) || R.path(['localDate'], root),
+  dateTimeEnd: root => R.path(['localDateTimeEnd']) || R.path(['localDate'], root),
   allDay: R.path(['allDay']),
-  pricing: R.path(['pricing']),
+  pricing: root => R.path(['pricing'], root) || R.path(['pricingFrom'], root),
+  unitPricing: root => R.path(['unitPricing'], root) || R.path(['unitPricingFrom'], root),
   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']),
@@ -281,6 +290,7 @@ class Plugin {
       startDate,
       endDate,
       dateFormat,
+      currency,
     },
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
@@ -323,6 +333,7 @@ class Plugin {
           optionId: optionIds[rateIx],
           localDateStart,
           localDateEnd,
+          currency,
           units: Object.entries(qtys).map(([id, quantity]) => ({
             id, quantity,
           })),
@@ -342,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),
@@ -367,7 +379,8 @@ class Plugin {
       optionIds,
       occupancies,
       startDate,
-      // endDate,
+      endDate,
+      currency,
       dateFormat,
     },
   }) {
@@ -385,7 +398,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,
@@ -403,7 +416,7 @@ class Plugin {
       acceptLanguage,
     });
     const url = `${endpoint || this.endpoint}/availability/calendar`;
-    const availability = (
+    let availability = (
       await Promise.map(rates, async (rate, rateIx) => {
         const qtys = R.countBy(x => x)(rate);
         const data = {
@@ -411,6 +424,7 @@ class Plugin {
           optionId: optionIds[rateIx],
           localDateStart,
           localDateEnd,
+          currency,
           units: Object.entries(qtys).map(([id, quantity]) => ({
             id, quantity,
           })),
@@ -423,6 +437,11 @@ class Plugin {
         });
       }, { concurrency: CONCURRENCY })
     ).map(({ data }) => data);
+    availability = availability.map(
+      (avails, availsIx) => (avails.map(
+        avail => doMap(avail, availabilityMap),
+      )),
+    );
     return { availability };
   }
 
@@ -440,38 +459,43 @@ class Plugin {
       holder,
     },
   }) {
-    assert(availabilityKey, 'an availability code is required !');
-    assert(R.path(['name'], holder), 'a holder\' first name is required');
-    assert(R.path(['surname'], holder), 'a holder\' surname is required');
-    assert(R.path(['emailAddress'], holder), 'a holder\' email address is required');
-    const headers = getHeaders({
-      apiKey,
-      endpoint,
-      octoEnv,
-      acceptLanguage,
-    });
-    let url = `${endpoint || this.endpoint}/bookings`;
-    let data = await jwt.verify(availabilityKey, this.jwtKey);
-    let booking = R.path(['data'], await axios({
-      method: 'post',
-      url,
-      data: { ...data, notes },
-      headers,
-    }));
-    url = `${endpoint || this.endpoint}/bookings/${booking.uuid}/confirm`;
-    const contact = doMap(holder, contactMap);
-    data = {
-      notes,
-      contact,
-      resellerReference: reference,
-    };
-    booking = R.path(['data'], await axios({
-      method: 'post',
-      url,
-      data,
-      headers,
-    }));
-    return ({ booking: doMap(booking, bookingMap) });
+    try {
+      assert(availabilityKey, 'an availability code is required !');
+      assert(R.path(['name'], holder), 'a holder\' first name is required');
+      assert(R.path(['surname'], holder), 'a holder\' surname is required');
+      assert(R.path(['emailAddress'], holder), 'a holder\' email address is required');
+      const headers = getHeaders({
+        apiKey,
+        endpoint,
+        octoEnv,
+        acceptLanguage,
+      });
+      let url = `${endpoint || this.endpoint}/bookings`;
+      let data = await jwt.verify(availabilityKey, this.jwtKey);
+      let booking = R.path(['data'], await axios({
+        method: 'post',
+        url,
+        data: { ...data, notes },
+        headers,
+      }));
+      url = `${endpoint || this.endpoint}/bookings/${booking.uuid}/confirm`;
+      const contact = doMap(holder, contactMap);
+      data = {
+        notes,
+        contact,
+        resellerReference: reference,
+      };
+      booking = R.path(['data'], await axios({
+        method: 'post',
+        url,
+        data,
+        headers,
+      }));
+      return ({ booking: doMap(booking, bookingMap) });
+    } catch (err) {
+      console.log('createBooking-ventrata', err);
+      throw Error(err);
+    }
   }
 
   async cancelBooking({

package/package.json

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