ti2-ventrata 1.0.10 → 1.0.12

package/index.js

@@ -1,4 +1,5 @@
 const axios = require('axios');
+const curlirize = require('axios-curlirize');
 const R = require('ramda');
 const Promise = require('bluebird');
 const assert = require('assert');
@@ -7,6 +8,9 @@ const jwt = require('jsonwebtoken');
 const wildcardMatch = require('./utils/wildcardMatch');
 
 const CONCURRENCY = 3; // is this ok ?
+if (process.env.debug) {
+  curlirize(axios);
+}
 
 const isNilOrEmpty = R.either(R.isNil, R.isEmpty);
 const isNilOrEmptyArray = el => {
@@ -54,12 +58,26 @@ const rateMap = {
   pricing: R.path(['pricingFrom']),
 };
 
+const unitPricingMap = {
+  unitId: R.prop('unitId'),
+  original: R.prop('original'),
+  retail: R.prop('retail'),
+  net: R.prop('net'),
+  currencyPrecision: R.prop('currencyPrecision'),
+};
+
 const availabilityMap = {
   dateTimeStart: root => R.path(['localDateTimeStart'], root) || R.path(['localDate'], root),
-  dateTimeEnd: root => R.path(['localDateTimeEnd']) || R.path(['localDate'], root),
+  dateTimeEnd: root => R.path(['localDateTimeEnd'], root) || R.path(['localDate'], root),
   allDay: R.path(['allDay']),
   pricing: root => R.path(['pricing'], root) || R.path(['pricingFrom'], root),
-  unitPricing: root => R.path(['unitPricing'], root) || R.path(['unitPricingFrom'], root),
+  unitPricing: root => {
+    let before = [];
+    if (R.path(['unitPricing'], root)) before = R.path(['unitPricing'], root);
+    else before = R.path(['unitPricingFrom'], root) || [];
+    return before.map(item => doMap(item, unitPricingMap));
+  },
+  vacancies: R.prop('vacancies'),
   offer: avail => (avail.offerCode ? doMap(avail, {
     offerId: R.path(['offerCode']),
     title: R.pathOr(undefined, ['offerTitle']),
@@ -109,7 +127,7 @@ const unitItemMap = {
   unitItemId: R.path(['uuid']),
   unitId: R.path(['unitId']),
   unitName: R.path(['unit', 'title']),
-  supplierId: R.path(['supplierReference']),
+  supplierBookingId: R.path(['supplierReference']),
   status: e => capitalize(R.path(['status'], e)),
   contact: R.path(['contact']),
   pricing: R.path(['pricing']),
@@ -131,7 +149,7 @@ const bookingMap = {
   id: R.path(['id']),
   orderId: R.path(['orderReference']),
   bookingId: R.path(['supplierReference']),
-  supplierId: R.path(['supplierReference']),
+  supplierBookingId: R.path(['supplierReference']),
   status: e => capitalize(R.path(['status'], e)),
   productId: R.path(['product', 'id']),
   productName: R.path(['product', 'title']),
@@ -171,11 +189,17 @@ const contactMap = {
   country: R.path(['country']),
 };
 
-const getHeaders = ({ apiKey, acceptLanguage, octoEnv }) => ({
+const getHeaders = ({
+  apiKey,
+  acceptLanguage,
+  octoEnv,
+  referrer,
+}) => ({
   Authorization: `Bearer ${apiKey}`,
   'Octo-Env': octoEnv,
   ...acceptLanguage ? { 'Accept-Language': acceptLanguage } : {},
   'Content-Type': 'application/json',
+  ...referrer ? { Referer: referrer } : {},
 });
 
 class Plugin {
@@ -454,48 +478,51 @@ class Plugin {
     },
     payload: {
       availabilityKey,
+      holder,
       notes,
       reference,
-      holder,
+      referrer,
+      settlementMethod,
     },
   }) {
-    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 = {
+    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,
+      referrer,
+    });
+    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: {
+        settlementMethod,
+        ...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);
-    }
+      },
+      headers,
+    }));
+    url = `${endpoint || this.endpoint}/bookings/${booking.uuid}/confirm`;
+    const contact = doMap(holder, contactMap);
+    data = {
+      contact,
+      notes,
+      resellerReference: reference,
+      settlementMethod,
+    };
+    booking = R.path(['data'], await axios({
+      method: 'post',
+      url,
+      data,
+      headers,
+    }));
+    return ({ booking: doMap(booking, bookingMap) });
   }
 
   async cancelBooking({
@@ -538,7 +565,7 @@ class Plugin {
     payload: {
       bookingId,
       resellerReference,
-      supplierId,
+      supplierBookingId,
       travelDateStart,
       travelDateEnd,
       dateFormat,
@@ -547,7 +574,7 @@ class Plugin {
     assert(
       !isNilOrEmpty(bookingId)
       || !isNilOrEmpty(resellerReference)
-      || !isNilOrEmpty(supplierId)
+      || !isNilOrEmpty(supplierBookingId)
       || !(
         isNilOrEmpty(travelDateStart) && isNilOrEmpty(travelDateEnd) && isNilOrEmpty(dateFormat)
       ),
@@ -587,8 +614,8 @@ class Plugin {
           headers,
         }));
       }
-      if (!isNilOrEmpty(supplierId)) {
-        url = `${endpoint || this.endpoint}/bookings?supplierReference=${supplierId}`;
+      if (!isNilOrEmpty(supplierBookingId)) {
+        url = `${endpoint || this.endpoint}/bookings?supplierReference=${supplierBookingId}`;
         return R.path(['data'], await axios({
           method: 'get',
           url,

package/index.test.js

@@ -175,6 +175,7 @@ describe('search tests', () => {
         payload: {
           availabilityKey,
           notes: faker.lorem.paragraph(),
+          settlementMethod: 'DEFERRED',
           holder: {
             name: fullName[0],
             surname: fullName[1],
@@ -190,7 +191,7 @@ describe('search tests', () => {
       ({ booking } = retVal);
       expect(booking).toBeTruthy();
       expect(R.path(['id'], booking)).toBeTruthy();
-      expect(R.path(['supplierId'], booking)).toBeTruthy();
+      expect(R.path(['supplierBookingId'], booking)).toBeTruthy();
       expect(R.path(['cancellable'], booking)).toBeTruthy();
       // console.log({ booking });
     });
@@ -231,11 +232,11 @@ describe('search tests', () => {
       ({ bookings } = retVal);
       expect(R.path([0, 'id'], bookings)).toBeTruthy();
     });
-    it('it should be able to search bookings by supplierId', async () => {
+    it('it should be able to search bookings by supplierBookingId', async () => {
       const retVal = await app.searchBooking({
         token,
         payload: {
-          bookingId: booking.supplierId,
+          bookingId: booking.supplierBookingId,
         },
       });
       expect(Array.isArray(retVal.bookings)).toBeTruthy();
@@ -255,5 +256,32 @@ describe('search tests', () => {
       ({ bookings } = retVal);
       expect(R.path([0, 'id'], bookings)).toBeTruthy();
     });
+    it('should be able to create a booking for a referrer', async () => {
+      const fullName = faker.name.findName().split(' ');
+      const retVal = await app.createBooking({
+        token,
+        payload: {
+          availabilityKey,
+          notes: faker.lorem.paragraph(),
+          holder: {
+            name: fullName[0],
+            surname: fullName[1],
+            phoneNumber: faker.phone.phoneNumber(),
+            emailAddress: `salvador+tests_${faker.lorem.slug()}@tourconnect.com`,
+            country: faker.address.countryCode(),
+            locales: ['en-US', 'en', 'es'],
+          },
+          reference,
+          referrer: 'referrerforapitest',
+          settlementMethod: 'DEFERRED',
+        },
+      });
+      expect(retVal.booking).toBeTruthy();
+      ({ booking } = retVal);
+      expect(booking).toBeTruthy();
+      expect(R.path(['id'], booking)).toBeTruthy();
+      expect(R.path(['supplierBookingId'], booking)).toBeTruthy();
+      expect(R.path(['cancellable'], booking)).toBeTruthy();
+    });
   });
 });

package/jestEnvironment.js

@@ -0,0 +1,81 @@
+const NodeEnvironment = require('jest-environment-node');
+const chalk = require('chalk');
+
+const { debug } = process.env;
+
+class NodeEnvironmentFailFast extends NodeEnvironment {
+  constructor(config, context) {
+    super(config, context);
+    this.failedDescribeMap = {};
+    this.registeredEventHandler = [];
+    this.lastParent = undefined;
+  }
+
+  async setup() {
+    await super.setup();
+    this.global.testEnvironment = this;
+  }
+
+  registerTestEventHandler(registeredEventHandler) {
+    this.registeredEventHandler.push(registeredEventHandler);
+  }
+
+  async executeTestEventHandlers(event, state) {
+    for (const handler of this.registeredEventHandler) {
+      await handler(event, state);
+    }
+  }
+
+  async handleTestEvent(event, state) {
+    await this.executeTestEventHandlers(event, state);
+
+    switch (event.name) {
+      case 'hook_failure': {
+        const describeBlockName = event.hook.parent.name;
+        this.failedDescribeMap[describeBlockName] = true;
+        // hook errors are not displayed if tests are skipped, so display them manually
+        console.error(`ERROR: ${describeBlockName} > ${event.hook.type}\n\n`, event.error, '\n');
+        break;
+      }
+      case 'test_fn_success': {
+        if (debug) {
+          if (this.lastParent !== event.test.parent.name) {
+            console.log(`${event.test.parent.name}\n  ${chalk.green('\u2713')} ${event.test.name}`);
+          } else {
+            console.log(`  ${chalk.green('\u2713')} ${event.test.name}`);
+          }
+          this.lastParent = event.test.parent.name;
+        }
+        break;
+      }
+      case 'test_fn_failure': {
+        this.failedDescribeMap[event.test.parent.name] = true;
+        if (debug) {
+          if (this.lastParent !== event.test.parent.name) {
+            console.log(`${event.test.parent.name}\n  ${chalk.red('\u2715')} ${event.test.name}`);
+          } else {
+            console.log(`  ${chalk.red('\u2715')} ${event.test.name}`);
+          }
+          this.lastParent = event.test.parent.name;
+          console.error(event.error.message);
+        }
+        break;
+      }
+      case 'test_start': {
+        if (this.failedDescribeMap[event.test.parent.name]) {
+          event.test.mode = 'skip';
+        }
+        break;
+      }
+    }
+
+    if (super.handleTestEvent) {
+      super.handleTestEvent(event, state);
+    }
+  }
+
+  async teardown() {
+    await super.teardown();
+  }
+}
+module.exports = NodeEnvironmentFailFast;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-ventrata",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Ventrata's TI2 Plugin",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/TourConnect/ti2-ventrata#readme",
   "jest": {
-    "testEnvironment": "node",
+    "testEnvironment": "<rootDir>/jestEnvironment.js",
     "coveragePathIgnorePatterns": [
       "/node_modules/"
     ],
@@ -28,18 +28,22 @@
   },
   "dependencies": {
     "axios": "^0.24.0",
+    "axios-curlirize": "^1.3.7",
     "bluebird": "^3.7.2",
     "jsonwebtoken": "^8.5.1",
     "moment": "^2.29.1",
     "ramda": "^0.27.1"
   },
   "devDependencies": {
+    "chalk": "^4.1.2",
     "eslint": "^8.4.1",
     "eslint-config-airbnb": "^19.0.2",
     "eslint-plugin-import": "^2.25.4",
     "faker": "^5.5.3",
     "jest": "^27.4.5",
     "jest-cli": "^27.4.7",
-    "jest-diff": "^27.4.2"
+    "jest-diff": "^27.4.2",
+    "jest-environment-node": "27.4",
+    "jest-util": "27.4"
   }
 }