ti2 1.0.48 → 1.0.50

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/controllers/allotment.js

@@ -27,6 +27,7 @@ const queryAllotment = plugins => async (req, res, next) => {
     const results = await app.queryAllotment({
       token,
       payload: query,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {

package/controllers/app.js

@@ -190,6 +190,7 @@ const validateAppToken = plugins => async (req, res, next) => {
     assert(app.validateToken, `could not find the validateToken method for ${appKey}`);
     const valid = await app.validateToken({
       token,
+      requestId: req.requestId,
     });
     return res.json({ valid });
   } catch (err) {

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) => {
@@ -38,6 +41,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
       token,
       payload: body,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -66,6 +70,7 @@ const bookingsCancel = plugins => async (req, res, next) => {
       token,
       payload: body,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -78,6 +83,7 @@ const $bookingsProductSearch = plugins => async ({
   userId,
   hint,
   payload,
+  requestId,
 }) => {
   const app = plugins.find(({ name }) => name === appKey);
   // const app = load(appKey);
@@ -94,6 +100,7 @@ const $bookingsProductSearch = plugins => async ({
     token,
     payload,
     typeDefsAndQueries,
+    requestId,
   });
   return results;
 };
@@ -102,9 +109,10 @@ const bookingsProductSearch = plugins => async (req, res, next) => {
   const {
     params,
     body: payload,
+    requestId,
   } = req;
   try {
-    return res.json(await $bookingsProductSearch(plugins)({ ...params, payload }));
+    return res.json(await $bookingsProductSearch(plugins)({ ...params, payload, requestId }));
   } catch (err) {
     return next(err);
   }
@@ -131,6 +139,7 @@ const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
       token,
       payload,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -143,6 +152,7 @@ const $bookingsAvailabilityCalendar = plugins => async ({
   userId,
   hint,
   payload,
+  requestId,
 }) => {
   const app = plugins.find(({ name }) => name === appKey);
   // const app = load(appKey);
@@ -159,6 +169,7 @@ const $bookingsAvailabilityCalendar = plugins => async ({
     token,
     payload,
     typeDefsAndQueries,
+    requestId,
   });
 };
 
@@ -166,9 +177,14 @@ const bookingsAvailabilityCalendar = plugins => async (req, res, next) => {
   const {
     params,
     body: payload,
+    requestId,
   } = req;
   try {
-    return res.json(await $bookingsAvailabilityCalendar(plugins)({ ...params, payload }));
+    return res.json(await $bookingsAvailabilityCalendar(plugins)({
+      ...params,
+      payload,
+      requestId,
+    }));
   } catch (err) {
     return next(err);
   }
@@ -196,6 +212,7 @@ const searchQuote = plugins => async (req, res, next) => {
       token,
       payload,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -225,6 +242,7 @@ const createBooking = plugins => async (req, res, next) => {
       token,
       payload,
       typeDefsAndQueries,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -253,6 +271,7 @@ const getAffiliateAgents = plugins => async (req, res, next) => {
     const results = await app.getAffiliateAgents({
       token,
       payload,
+      requestId: req.requestId,
     });
     return res.json(results);
   } catch (err) {
@@ -281,6 +300,36 @@ const getAffiliateDesks = plugins => async (req, res, next) => {
     const results = await app.getAffiliateDesks({
       token,
       payload,
+      requestId: req.requestId,
+    });
+    return res.json(results);
+  } catch (err) {
+    return next(err);
+  }
+};
+
+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) {
@@ -300,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

@@ -9,6 +9,10 @@ const bb = require('bluebird');
 const { Op } = require('sequelize');
 const R = require('ramda');
 const { v4: uuidv4 } = require('uuid');
+const EventEmitter = require('eventemitter2');
+
+const ti2Events = new EventEmitter({ captureRejections: true, wildcard: true });
+ti2Events.on('event error', console.error);
 
 const schema = yaml.load(fs.readFileSync(`${__dirname}/api.yml`));
 
@@ -49,7 +53,7 @@ module.exports = async ({
       const nuName = attr.replace(/_/g, '-').replace(`ti2-${pluginName}-`, '');
       params[nuName] = value;
     });
-    const pluginInstance = await new Plugin({ name: pluginName, ...params });
+    const pluginInstance = await new Plugin({ name: pluginName, events: ti2Events, ...params });
     return pluginInstance;
   });
   if (worker) {
@@ -128,55 +132,42 @@ module.exports = async ({
       notFound: (req, res) => res.sendStatus(404),
       notImplemented: (req, res) => res.sendStatus(501),
     });
-    const onRequestStartPlugins = plugins.filter(currentPlugin => (api.getAllFuncs(currentPlugin).indexOf('onRequestStart') > -1));
-    const onRequestEndPlugins = plugins.filter(currentPlugin => (api.getAllFuncs(currentPlugin).indexOf('onRequestEnd') > -1));
+    const eventHandlerPlugins = plugins.filter(currentPlugin => (api.getAllFuncs(currentPlugin).indexOf('eventHandler') > -1));
+    eventHandlerPlugins.forEach(plugin => {
+      plugin.eventHandler(ti2Events);
+    });
 
-    if (onRequestStartPlugins.length > 0) {
-      app.use((req, res, next) => {
-        const startHrTime = process.hrtime();
-        const requestId = uuidv4();
-        const body = {
-          requestId,
-          date: Math.floor(Date.now() / 1e3),
-          url: req.url,
-          // body: req.body,
-          params: req.pathParams,
-          query: req.query,
-          appRecord: req.appRecord,
-          method: req.method,
-          operationId: R.path(['openapi', 'operation', 'operationId'], req),
-          client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
-        };
-        bb.each(onRequestStartPlugins, async startPlugin => {
-          try {
-            await startPlugin.onRequestStart(body);
-          } catch (err) {
-            console.log(`unable to log to ${startPlugin.name}`, err);
-          }
-        }).then();
-        if (onRequestEndPlugins.length > 0) {
-          res.on('finish', () => {
-            const elapsedHrTime = process.hrtime(startHrTime);
-            const responseTimeInMs = parseInt(
-              elapsedHrTime[0] * 1e3 + elapsedHrTime[1] / 1e6,
-              10,
-            );
-            bb.each(onRequestEndPlugins, async endPlugin => {
-              try {
-                await endPlugin.onRequestEnd({
-                  ...body,
-                  responseTimeInMs,
-                  responseStatusCode: res.statusCode,
-                });
-              } catch (err) {
-                console.log(`unable to log to ${endPlugin.name}`, err);
-              }
-            }).then();
-          });
-        }
-        next();
+    app.use((req, res, next) => {
+      const startHrTime = process.hrtime();
+      const requestId = uuidv4();
+      const body = {
+        requestId,
+        date: Math.floor(Date.now() / 1e3),
+        url: req.url,
+        body: req.body,
+        params: req.pathParams,
+        query: req.query,
+        appRecord: req.appRecord,
+        method: req.method,
+        operationId: R.path(['openapi', 'operation', 'operationId'], req),
+        client: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
+      };
+      ti2Events.emit('request.start', body);
+      req.requestId = requestId;
+      res.on('finish', () => {
+        const elapsedHrTime = process.hrtime(startHrTime);
+        const responseTimeInMs = parseInt(
+          elapsedHrTime[0] * 1e3 + elapsedHrTime[1] / 1e6,
+          10,
+        );
+        ti2Events.emit('request.end', {
+          ...body,
+          responseTimeInMs,
+          responseStatusCode: res.statusCode,
+        });
       });
-    }
+      next();
+    });
 
     connect(app);
     app.use(middleware.mock());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {
@@ -28,6 +28,7 @@
     "bluebird": "^3.7.2",
     "bull": "^4.8.2",
     "commander": "^9.2.0",
+    "eventemitter2": "^6.4.9",
     "express": "^4.17.2",
     "ioredis": "^5.0.4",
     "js-yaml": "^4.1.0",