ti2-ventrata 1.0.19 → 1.0.21

package/index.js

@@ -15,13 +15,6 @@ if (process.env.debug) {
   curlirize(axiosRaw);
 }
 
-const axios = async (...args) => axiosRaw(...args)
-  .catch(err => {
-    const errMsg = R.path(['response', 'data', 'errorMessage'], err);
-    console.log('error in ti2-ventrata', args[0], errMsg);
-    if (errMsg) throw new Error(errMsg);
-    throw err;
-  });
 const isNilOrEmpty = R.either(R.isNil, R.isEmpty);
 
 const getHeaders = ({
@@ -29,14 +22,16 @@ const getHeaders = ({
   acceptLanguage,
   octoEnv,
   resellerId,
+  requestId,
 }) => ({
   Authorization: `Bearer ${apiKey}`,
   ...octoEnv ? { 'Octo-Env': octoEnv } : {},
   ...acceptLanguage ? { 'Accept-Language': acceptLanguage } : {},
   'Content-Type': 'application/json',
   ...resellerId ? { Referer: resellerId } : {},
-  // 'Octo-Capabilities': 'octo/pricing,octo/pickups',
-  'Octo-Capabilities': 'octo/pricing',
+  'Octo-Capabilities': 'octo/pricing,octo/pickups',
+  ...requestId ? { requestId } : {},
+  // 'Octo-Capabilities': 'octo/pricing',
 });
 
 class Plugin {
@@ -44,6 +39,27 @@ class Plugin {
     Object.entries(params).forEach(([attr, value]) => {
       this[attr] = value;
     });
+    if (this.events) {
+      axiosRaw.interceptors.request.use(request => {
+        this.events.emit(`${this.name}.axios.request`, JSON.parse(JSON.stringify(request)));
+        return request;
+      });
+      axiosRaw.interceptors.response.use(response => {
+        this.events.emit(`${this.name}.axios.response`, JSON.parse(JSON.stringify(response)));
+        return response;
+      });
+    }
+    const pluginObj = this;
+    this.axios = async (...args) => axiosRaw(...args).catch(err => {
+      const errMsg = R.path(['response', 'data', 'errorMessage'], err);
+      console.log('error in ti2-ventrata', args[0], errMsg);
+      if (pluginObj.events) {
+        pluginObj.events.emit(`${this.name}.axios.error`, { request: args[0], err, errMsg });
+      }
+      if (errMsg) throw new Error(errMsg);
+      throw err;
+    });
+
     this.tokenTemplate = () => ({
       apiKey: {
         type: 'text',
@@ -85,6 +101,7 @@ class Plugin {
       acceptLanguage,
       resellerId,
     },
+    requestId,
   }) {
     const url = `${endpoint || this.endpoint}/whoami?token=${apiKey}`;
     const headers = getHeaders({
@@ -93,9 +110,10 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     try {
-      const connectionId = R.path(['data', 'connection', 'id'], await axios({
+      const connectionId = R.path(['data', 'connection', 'id'], await this.axios({
         method: 'get',
         url,
         headers,
@@ -119,6 +137,7 @@ class Plugin {
       productTypeDefs,
       productQuery,
     },
+    requestId,
   }) {
     let url = `${endpoint || this.endpoint}/products`;
     if (!isNilOrEmpty(payload)) {
@@ -132,8 +151,9 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
-    let results = R.pathOr([], ['data'], await axios({
+    let results = R.pathOr([], ['data'], await this.axios({
       method: 'get',
       url,
       headers,
@@ -202,6 +222,7 @@ class Plugin {
       availTypeDefs,
       availQuery,
     },
+    requestId,
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
     assert(
@@ -222,6 +243,7 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const url = `${endpoint || this.endpoint}/availability`;
     const availability = (
@@ -234,7 +256,7 @@ class Plugin {
           units: units[ix].map(u => ({ id: u.unitId, quantity: u.quantity })),
         };
         if (currency) data.currency = currency;
-        const result = R.path(['data'], await axios({
+        const result = R.path(['data'], await this.axios({
           method: 'post',
           url,
           data,
@@ -278,6 +300,7 @@ class Plugin {
       availTypeDefs,
       availQuery,
     },
+    requestId,
   }) {
     assert(this.jwtKey, 'JWT secret should be set');
     assert(
@@ -298,6 +321,7 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const url = `${endpoint || this.endpoint}/availability/calendar`;
     const availability = (
@@ -311,7 +335,7 @@ class Plugin {
           units: units[ix].map(u => ({ id: u.unitId, quantity: u.quantity })),
         };
         if (currency) data.currency = currency;
-        const result = await axios({
+        const result = await this.axios({
           method: 'post',
           url,
           data,
@@ -342,11 +366,13 @@ class Plugin {
       notes,
       reference,
       settlementMethod,
+      pickupPoint,
     },
     typeDefsAndQueries: {
       bookingTypeDefs,
       bookingQuery,
     },
+    requestId,
   }) {
     assert(availabilityKey, 'an availability code is required !');
     assert(R.path(['name'], holder), 'first name is required');
@@ -357,15 +383,17 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const dataForCreateBooking = await jwt.verify(availabilityKey, this.jwtKey);
-    let booking = R.path(['data'], await axios({
+    let booking = R.path(['data'], await this.axios({
       method: rebookingId ? 'patch' : 'post',
       url: `${endpoint || this.endpoint}/bookings${rebookingId ? `/${rebookingId}` : ''}`,
       data: {
         settlementMethod,
         ...dataForCreateBooking,
         notes,
+        ...(pickupPoint ? { pickupRequested: true, pickupPointId: pickupPoint } : {}),
       },
       headers,
     }));
@@ -383,7 +411,7 @@ class Plugin {
         resellerReference: reference,
         settlementMethod,
       };
-      booking = R.path(['data'], await axios({
+      booking = R.path(['data'], await this.axios({
         method: 'post',
         url: `${endpoint || this.endpoint}/bookings/${booking.uuid}/confirm`,
         data: dataForConfirmBooking,
@@ -416,6 +444,7 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
+    requestId,
   }) {
     assert(!isNilOrEmpty(bookingId) || !isNilOrEmpty(id), 'Invalid booking id');
     const headers = getHeaders({
@@ -424,9 +453,10 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const url = `${endpoint || this.endpoint}/bookings/${bookingId || id}`;
-    const booking = R.path(['data'], await axios({
+    const booking = R.path(['data'], await this.axios({
       method: 'delete',
       url,
       data: { reason },
@@ -461,6 +491,7 @@ class Plugin {
       bookingTypeDefs,
       bookingQuery,
     },
+    requestId,
   }) {
     assert(
       !isNilOrEmpty(bookingId)
@@ -477,10 +508,11 @@ class Plugin {
       octoEnv,
       acceptLanguage,
       resellerId,
+      requestId,
     });
     const searchByUrl = async url => {
       try {
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,
@@ -500,7 +532,7 @@ class Plugin {
       }
       if (!isNilOrEmpty(resellerReference)) {
         url = `${endpoint || this.endpoint}/bookings?resellerReference=${resellerReference}`;
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,
@@ -508,7 +540,7 @@ class Plugin {
       }
       if (!isNilOrEmpty(supplierBookingId)) {
         url = `${endpoint || this.endpoint}/bookings?supplierReference=${supplierBookingId}`;
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,
@@ -518,7 +550,7 @@ class Plugin {
         const localDateStart = moment(travelDateStart, dateFormat).format();
         const localDateEnd = moment(travelDateEnd, dateFormat).format();
         url = `${endpoint || this.endpoint}/bookings?localDateStart=${encodeURIComponent(localDateStart)}&localDateEnd=${encodeURIComponent(localDateEnd)}`;
-        return R.path(['data'], await axios({
+        return R.path(['data'], await this.axios({
           method: 'get',
           url,
           headers,

package/package.json

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

package/resolvers/availability.js

@@ -30,8 +30,8 @@ const resolvers = {
     vacancies: R.prop('vacancies'),
     available: root => root.status !== 'SOLD_OUT',
     // get the starting price
-    pricing: R.prop('pricingFrom'),
-    unitPricing: R.prop('unitPricingFrom'),
+    pricing: root => R.prop('pricingFrom', root) || R.prop('pricing', root),
+    unitPricing: root => R.prop('unitPricingFrom', root) || R.prop('unitPricing', root),
     pickupAvailable: R.prop('pickupAvailable'),
     pickupRequired: R.prop('pickupRequired'),
     pickupPoints: root => R.pathOr([], ['pickupPoints'], root)

package/resolvers/booking.js

@@ -11,7 +11,7 @@ const resolvers = {
   Query: {
     id: R.path(['id']),
     orderId: R.path(['orderReference']),
-    bookingId: R.path(['supplierReference']),
+    bookingId: R.path(['id']),
     supplierBookingId: R.path(['supplierReference']),
     status: e => capitalize(R.path(['status'], e)),
     productId: R.path(['product', 'id']),