ti2 1.0.72 → 1.0.74

package/api.yml

@@ -284,6 +284,27 @@ components:
           type: object
           allOf:     # Combines the BasicErrorModel and the inline model
             - $ref: '#/components/schemas/bookingDetail'
+    packageSearchQuery:
+      type: object
+      additionalProperties: true
+      description: Additional properties may be included
+      properties:
+        packageName:
+          type: string
+          required: false
+          description: Package Name wildcard match
+          example: '*bus*'
+    bookingsPackageSearchReturn:
+      type: object
+      additionalProperties: true
+      description: Additional properties may be included
+      properties:
+        packages:
+          type: array
+          required: false
+          description: Package Search Results
+          items: 
+            type: object
     bookingsProductQuery:
       type: object
       additionalProperties: true
@@ -1481,6 +1502,85 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/cancellationReturn'
+  /packages/{appKey}/{userId}/search:
+    post:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Package Search
+      operationId: getProductPackages
+      parameters:
+        - name: appKey
+          in: path
+          description: app to search the booking packages, defaults to first token
+          required: true
+          example: 'travelgate-hotelx'
+          schema:
+            type: string
+        - name: userId
+          in: path
+          description: the user/company that the appKey belongs to
+          required: true
+          schema:
+            type: string
+      requestBody:
+        description: Search query
+        required:  true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/packageSearchQuery'
+      responses:
+        '200':
+          description: search results
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/bookingsPackageSearchReturn'
+  /packages/{appKey}/{userId}/{hint}/search:
+    post:
+      security:
+        - bearerAuth: ['admin', 'user']
+      tags:
+        - bookings
+      summary: Package Search using for an specific hint
+      operationId: getProductPackages
+      parameters:
+        - name: appKey
+          in: path
+          description: app to search the booking packages, defaults to first token
+          required: true
+          example: 'travelgate-hotelx'
+          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: 'travelgate-australia'
+          schema:
+            type: string
+      requestBody:
+        description: Search query
+        required:  true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/packageSearchQuery'
+      responses:
+        '200':
+          description: search results
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/bookingsPackageSearchReturn'
   /products/{appKey}/{userId}/search:
     post:
       security:

package/controllers/bookings.js

@@ -107,6 +107,7 @@ const $bookingsProductSearch = plugins => async ({
     payload,
     typeDefsAndQueries,
     requestId,
+    userId,
   });
   return results;
 };
@@ -130,6 +131,38 @@ const bookingsProductSearch = plugins => async (req, res, next) => {
   }
 };
 
+const getProductPackages = plugins => async (req, res, next) => {
+  const {
+    axios,
+    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');
+    assert(app.getProductPackages, `getProductPackages is not available for ${appKey}`);
+    const token = await userAppKeys.token;
+    const results = await app.getProductPackages({
+      axios,
+      token,
+      payload,
+      typeDefsAndQueries,
+      requestId: req.requestId,
+    });
+    return res.json(results);
+  } catch (err) {
+    return next(err);
+  }
+};
+
 const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
   const {
     axios,
@@ -403,6 +436,7 @@ module.exports = plugins => ({
   bookingsCancel: bookingsCancel(plugins),
   $bookingsProductSearch,
   bookingsProductSearch: bookingsProductSearch(plugins),
+  getProductPackages: getProductPackages(plugins),
   bookingsAvailabilitySearch: bookingsAvailabilitySearch(plugins),
   $bookingsAvailabilityCalendar,
   bookingsAvailabilityCalendar: bookingsAvailabilityCalendar(plugins),

package/index.js

@@ -262,7 +262,9 @@ module.exports = async ({
 
     app.use(async (req, res, next) => {
       try {
-        const currentPlugin = plugins.find(p => p.name === req.pathParams.appKey);
+        const currentPlugin = req.pathParams
+          ? plugins.find(p => p.name === req.pathParams.appKey)
+          : null;
         const cachingOperations = [
           ...cacheSettings['*'],
           ...(currentPlugin ? R.pathOr([], [currentPlugin.name], cacheSettings) : []),

package/models/userappkey.js

@@ -50,6 +50,8 @@ const UserAppKey = db.define('UserAppKey', {
   token: {
     type: Sequelize.VIRTUAL,
     async get() {
+      if (!this.getDataValue('appKey')) return {};
+      if (!decrypt(this.getDataValue('appKey'))) return {};
       const sqldb = require('./index');
       const userIntegrationSettings = await sqldb.UserIntegrationSettings.findOne({
         where: { userId: this.getDataValue('userId'), integrationId: this.getDataValue('integrationId') },

package/package.json

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