ti2 1.0.49 → 1.0.51

package/api.yml

@@ -208,6 +208,13 @@ components:
           type: string
         name:
           type: string
+    pickuppoint:
+      type: object
+      properties:
+        id:
+          type: string
+        name:
+          type: string
     bookingSearchQuery:
       type: object
       additionalProperties: true
@@ -1170,6 +1177,81 @@ paths:
                     type: array
                     items:
                       $ref: '#/components/schemas/agent'
+  /{appKey}/{userId}/pickup-points:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all pickup points for this supplier
+      operationId: getPickupPoints
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the pickup points from (defaults to first token found)
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: pickup points
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  pickupPoints:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/pickuppoint'
+  /{appKey}/{userId}/{hint}/pickup-points:
+    get:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Gets all pickup points for this supplier
+      operationId: getPickupPoints
+      parameters:
+        - name: appKey
+          in: path
+          description: name of the app to get the pickup points from (defaults to first token found) using the hint
+          required: true
+          example: 'fareharbor'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+        - name: hint
+          in: path
+          description: a specific token hint to be used
+          required: true
+          example: 'fareharbor-helloworld'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: pickup points
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  pickupPoints:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/pickuppoint'
   /bookings/{appKey}/{userId}/search:
     post:
       security:

package/cache.js

@@ -3,7 +3,6 @@ const hash = require('object-hash');
 
 const REDIS_URL = process.env.REDIS_URL || 'redis://redis:6379';
 const cache = new Redis(`${REDIS_URL}/2`);
-
 const defaultTTL = 60 * 60; // 1 hour
 
 const save = async ({
@@ -57,10 +56,11 @@ const getOrExec = async ({
 
 const drop = async ({
   pluginName,
+  key: keyParam,
   fn,
   fnParams,
 }) => {
-  let key = hash({ fn, fnParams });
+  let key = keyParam || hash({ fn, fnParams });
   key = `${pluginName}:${key}`;
   await cache.del(key);
 };
@@ -70,4 +70,5 @@ module.exports = {
   save,
   getOrExec,
   drop,
+  get,
 };

package/controllers/bookings.js

@@ -5,6 +5,7 @@ const { typeDefs: productTypeDefs, query: productQuery } = require('./graphql-sc
 const { typeDefs: availTypeDefs, query: availQuery } = require('./graphql-schemas/availability');
 const { typeDefs: bookingTypeDefs, query: bookingQuery } = require('./graphql-schemas/booking');
 const { typeDefs: rateTypeDefs, query: rateQuery } = require('./graphql-schemas/rate');
+const { typeDefs: pickupTypeDefs, query: pickupQuery } = require('./graphql-schemas/pickup-point');
 
 const typeDefsAndQueries = {
   productTypeDefs,
@@ -15,6 +16,8 @@ const typeDefsAndQueries = {
   bookingQuery,
   rateTypeDefs,
   rateQuery,
+  pickupTypeDefs,
+  pickupQuery,
 };
 
 const bookingsSearch = plugins => async (req, res, next) => {
@@ -305,6 +308,35 @@ const getAffiliateDesks = plugins => async (req, res, next) => {
   }
 };
 
+const getPickupPoints = plugins => async (req, res, next) => {
+  const {
+    params: { appKey, userId, hint },
+    body: payload,
+  } = req;
+  try {
+    const app = plugins.find(({ name }) => name === appKey);
+    // const app = load(appKey);
+    const userAppKeys = (await UserAppKey.findOne({
+      where: {
+        userId,
+        integrationId: appKey,
+        ...(hint ? { hint } : {}),
+      },
+    }));
+    assert(userAppKeys, 'could not find the app key');
+    const token = await userAppKeys.token;
+    assert(app.getPickupPoints, `getPickupPoints is not available for ${appKey}`);
+    const results = await app.getPickupPoints({
+      token,
+      payload,
+      typeDefsAndQueries,
+    });
+    return res.json(results);
+  } catch (err) {
+    return next(err);
+  }
+};
+
 module.exports = plugins => ({
   bookingsSearch: bookingsSearch(plugins),
   bookingsCancel: bookingsCancel(plugins),
@@ -317,4 +349,5 @@ module.exports = plugins => ({
   createBooking: createBooking(plugins),
   getAffiliateAgents: getAffiliateAgents(plugins),
   getAffiliateDesks: getAffiliateDesks(plugins),
+  getPickupPoints: getPickupPoints(plugins),
 });

package/controllers/graphql-schemas/pickup-point.js

@@ -0,0 +1,16 @@
+const typeDefs = `
+  type Query {
+    id: ID
+    name: String
+  }
+`;
+
+const query = `{
+  id
+  name
+}`;
+
+module.exports = {
+  typeDefs,
+  query,
+};

package/index.js

@@ -3,6 +3,7 @@ const createMiddleware = require('swagger-express-middleware');
 const { connector } = require('swagger-routes-express');
 const swaggerUi = require('swagger-ui-express');
 const yaml = require('js-yaml');
+const hash = require('object-hash');
 const fs = require('fs');
 const { pickBy } = require('ramda');
 const bb = require('bluebird');
@@ -11,6 +12,17 @@ const R = require('ramda');
 const { v4: uuidv4 } = require('uuid');
 const EventEmitter = require('eventemitter2');
 
+const cacheSettings = {
+  '*': [
+    'tokenTemplate',
+    'getAffiliateAgents',
+    'getAffiliateDesks',
+    'getPickupPoints',
+    'bookingsProductSearch',
+  ],
+  ventrata: [],
+  fareharbor: [],
+};
 const ti2Events = new EventEmitter({ captureRejections: true, wildcard: true });
 ti2Events.on('event error', console.error);
 
@@ -136,11 +148,9 @@ module.exports = async ({
     eventHandlerPlugins.forEach(plugin => {
       plugin.eventHandler(ti2Events);
     });
-
-    app.use((req, res, next) => {
-      const startHrTime = process.hrtime();
+    const composeBodyFromReq = req => {
       const requestId = uuidv4();
-      const body = {
+      return {
         requestId,
         date: Math.floor(Date.now() / 1e3),
         url: req.url,
@@ -152,16 +162,21 @@ module.exports = async ({
         operationId: R.path(['openapi', 'operation', 'operationId'], req),
         client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
       };
+    };
+    app.use(async (req, res, next) => {
+      const startHrTime = process.hrtime();
+      const body = composeBodyFromReq(req);
+      req.customBody = body;
       ti2Events.emit('request.start', body);
-      req.requestId = requestId;
-      res.on('finish', () => {
+      req.requestId = body.requestId;
+      res.on('finish', async () => {
         const elapsedHrTime = process.hrtime(startHrTime);
         const responseTimeInMs = parseInt(
           elapsedHrTime[0] * 1e3 + elapsedHrTime[1] / 1e6,
           10,
         );
         ti2Events.emit('request.end', {
-          ...body,
+          ...req.customBody,
           responseTimeInMs,
           responseStatusCode: res.statusCode,
         });
@@ -169,6 +184,46 @@ module.exports = async ({
       next();
     });
 
+    app.use(async (req, res, next) => {
+      try {
+        const currentPlugin = plugins.find(p => p.name === req.pathParams.appKey);
+        const cachingOperations = [
+          ...cacheSettings['*'],
+          ...(currentPlugin ? R.pathOr([], [currentPlugin.name], cacheSettings) : []),
+        ];
+        const body = req.customBody;
+        if (cachingOperations.indexOf(body.operationId) > -1) {
+          const cacheKey = hash(R.omit(['requestId', 'date'], body));
+
+          const foundCache = await cache.get({
+            pluginName: body.params.appKey,
+            key: cacheKey,
+          });
+          if (foundCache) {
+            // console.log('foundCache', cacheKey);
+            req.customBody.usedCache = cacheKey;
+            res.json(foundCache);
+          }
+          const realSend = res.json;
+          res.json = newData => { // new res.json
+            cache.save({
+              pluginName: req.pathParams.appKey,
+              key: cacheKey,
+              value: newData,
+              ttl: 60 * 60 * 24, // one day
+            });
+            // console.log('newData', cacheKey);
+            if (!res.headersSent) {
+              // console.log('send new data', cacheKey);
+              return realSend.apply(res, [newData]);
+            }
+          };
+        }
+        return next();
+      } catch (err) {
+        return next(err);
+      }
+    });
     connect(app);
     app.use(middleware.mock());
     // global error Handling
@@ -179,10 +234,11 @@ module.exports = async ({
       if (process.env.CONSOLE_ERRORS || process.env.JEST_WORKER_ID) {
         console.error(R.path(['response', 'data'], err), err);
       }
+      console.log('hit hre');
       return res.status((() => {
         if (!isNumber(err.status)) return 500;
         return Number(err.status);
-      })()).json({
+      })()).send({
         message: R.path(['response', 'data', 'errorMessage'], err) || err.message || 'Internal Error',
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {