ti2-ventrata 1.0.22 → 1.0.24

package/index.js

@@ -9,6 +9,7 @@ const wildcardMatch = require('./utils/wildcardMatch');
 const { translateProduct } = require('./resolvers/product');
 const { translateAvailability } = require('./resolvers/availability');
 const { translateBooking } = require('./resolvers/booking');
+const { translatePickupPoint } = require('./resolvers/pickup-point');
 
 const CONCURRENCY = 3; // is this ok ?
 if (process.env.debug) {
@@ -29,11 +30,18 @@ const getHeaders = ({
   ...acceptLanguage ? { 'Accept-Language': acceptLanguage } : {},
   'Content-Type': 'application/json',
   ...resellerId ? { Referer: resellerId } : {},
-  'Octo-Capabilities': 'octo/pricing,octo/pickups',
+  'Octo-Capabilities': 'octo/pricing,octo/pickups,octo/cart',
   ...requestId ? { requestId } : {},
   // 'Octo-Capabilities': 'octo/pricing',
 });
 
+const axiosSafeRequest = R.pick(['headers', 'method', 'url', 'data']);
+const axiosSafeResponse = response => {
+  const retVal = R.pick(['data', 'status', 'statusText', 'headers', 'request'], response);
+  retVal.request = axiosSafeRequest(retVal.request);
+  return retVal;
+};
+
 class Plugin {
   constructor(params) { // we get the env variables from here
     Object.entries(params).forEach(([attr, value]) => {
@@ -41,27 +49,25 @@ class Plugin {
     });
     if (this.events) {
       axiosRaw.interceptors.request.use(request => {
-        this.events.emit(`${this.name}.axios.request`, JSON.parse(JSON.stringify(request)));
+        this.events.emit(`${this.name}.axios.request`, axiosSafeRequest(request));
         return request;
       });
       axiosRaw.interceptors.response.use(response => {
-        this.events.emit(`${this.name}.axios.response`, JSON.parse(JSON.stringify(response)));
+        this.events.emit(`${this.name}.axios.response`, axiosSafeResponse(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 ${this.name}`, args[0], errMsg || err);
+      const errMsg = R.omit(['config'], err.toJSON());
+      console.log(`error in ${this.name}`, args[0], errMsg);
       if (pluginObj.events) {
         pluginObj.events.emit(`${this.name}.axios.error`, {
           request: args[0],
-          err: JSON.parse(JSON.stringify(err)),
-          errMsg,
+          err: errMsg,
         });
       }
-      if (errMsg) throw new Error(errMsg);
-      throw err;
+      throw R.pathOr(err, ['response', 'data', 'errorMessage'], err);
     });
 
     this.tokenTemplate = () => ({
@@ -570,32 +576,47 @@ class Plugin {
       })),
     });
   }
-}
 
-const pickUnit = (units, paxs) => {
-  const evalOne = (unit, pax) => {
-    if (pax.age < R.path(['restrictions', 'minAge'], unit)) {
-      return false;
-    }
-    if (pax.age > R.path(['restrictions', 'maxAge'], unit)) {
-      return false;
-    }
-    return true;
-  };
-  if (paxs.length > 1) { // find group units
-    const group = units.filter(({ restrictions }) => Boolean(restrictions)).find(unit => {
-      if (
-        R.path(['restrictions', 'paxCount'], unit) === paxs.length
-        && paxs.every(pax => evalOne(unit, pax))
-      ) return true;
-      return false;
+  async getPickupPoints({
+    token: {
+      apiKey,
+      endpoint,
+      octoEnv,
+      acceptLanguage,
+      resellerId,
+    },
+    typeDefsAndQueries: {
+      pickupTypeDefs,
+      pickupQuery,
+    },
+  }) {
+    const url = `${endpoint || this.endpoint}/products`;
+    const headers = getHeaders({
+      apiKey,
+      endpoint,
+      octoEnv,
+      acceptLanguage,
+      resellerId,
     });
-    if (group) return [group];
+    const products = R.pathOr([], ['data'], await axios({
+      method: 'get',
+      url,
+      headers,
+    }));
+    const pickupPoints = R.call(R.compose(
+      R.uniqBy(R.prop('id')),
+      R.chain(R.propOr([], 'pickupPoints')),
+      R.filter(o => o.pickupPoints && o.pickupPoints.length),
+      R.chain(R.propOr([], 'options')),
+    ), products);
+    return {
+      pickupPoints: await Promise.map(pickupPoints, async pickup => translatePickupPoint({
+        rootValue: pickup,
+        typeDefs: pickupTypeDefs,
+        query: pickupQuery,
+      })),
+    };
   }
-  return paxs.map(pax => units
-    .filter(unit => R.path(['restrictions', 'paxCount'], unit) === 1)
-    .find(unit => evalOne(unit, pax))); // individual units
-};
+}
 
 module.exports = Plugin;
-module.exports.pickUnit = pickUnit;

package/index.test.js

@@ -43,31 +43,6 @@ describe('search tests', () => {
     // nada
   });
   describe('utilities', () => {
-    describe('pickUnit', () => {
-      it('adult', () => {
-        const result = Plugin.pickUnit(fixtureUnits, [{ age: 40 }]);
-        expect(result.length).toBe(1);
-        expect(result[0]).toContainObject([{ id: 'adult' }]);
-      });
-      it('child', () => {
-        const result = Plugin.pickUnit(fixtureUnits, [{ age: 10 }]);
-        expect(result.length).toBe(1);
-        expect(result[0]).toContainObject([{ id: 'child' }]);
-      });
-      it('senior', () => {
-        const result = Plugin.pickUnit(fixtureUnits, [{ age: 70 }]);
-        expect(result.length).toBe(1);
-        expect(result[0]).toContainObject([{ id: 'senior' }]);
-      });
-      it('family', () => {
-        const result = Plugin.pickUnit(fixtureUnits, [
-          { age: 70 }, { age: 32 }, { age: 32 }, { age: 14 },
-        ]);
-        expect(result.length).toBe(1);
-        expect(result[0]).toContainObject([{ id: 'family' }]);
-      });
-      it.todo('family + one');
-    });
     describe('validateToken', () => {
       it('valid token', async () => {
         const retVal = await app.validateToken({

package/package.json

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

package/resolvers/booking.js

@@ -10,9 +10,10 @@ const capitalize = sParam => {
 const resolvers = {
   Query: {
     id: R.path(['id']),
-    orderId: R.path(['orderReference']),
     bookingId: R.path(['id']),
+    orderId: R.path(['orderReference']),
     supplierBookingId: R.path(['supplierReference']),
+    resellerReference: R.propOr('', 'resellerReference'),
     status: e => capitalize(R.path(['status'], e)),
     productId: R.path(['product', 'id']),
     productName: root => R.path(['product', 'title'], root) || R.path(['product', 'internalName'], root),
@@ -44,7 +45,6 @@ const resolvers = {
     },
     optionId: R.path(['option', 'id']),
     optionName: root => R.path(['option', 'title'], root) || R.path(['option', 'internalName'], root),
-    resellerReference: R.propOr('', 'resellerReference'),
     publicUrl: () => null,
     privateUrl: () => null,
     pickupRequested: R.prop('pickupRequested'),

package/resolvers/pickup-point.js

@@ -0,0 +1,28 @@
+const { makeExecutableSchema } = require('@graphql-tools/schema');
+const R = require('ramda');
+const { graphql } = require('graphql');
+
+const resolvers = {
+  Query: {
+    id: R.path(['id']),
+    name: R.path(['name']),
+  },
+};
+
+const translatePickupPoint = async ({ rootValue, typeDefs, query }) => {
+  const schema = makeExecutableSchema({
+    typeDefs,
+    resolvers,
+  });
+  const retVal = await graphql({
+    schema,
+    rootValue,
+    source: query,
+  });
+  if (retVal.errors) throw new Error(retVal.errors);
+  return retVal.data;
+};
+
+module.exports = {
+  translatePickupPoint,
+};