ti2 1.0.78 → 1.0.80

package/cache.js

@@ -9,6 +9,7 @@ const save = async ({
   pluginName,
   key: keyParam,
   value,
+  skipTTL,
   ttl = defaultTTL,
 }) => {
   const key = `${pluginName}:${(() => {
@@ -18,7 +19,9 @@ const save = async ({
     return keyParam;
   })()}`;
   await cache.set(key, JSON.stringify(value));
-  await cache.expire(key, ttl);
+  if (!skipTTL) {
+    await cache.expire(key, ttl);
+  }
 };
 
 const get = async ({

package/controllers/bookings.js

@@ -37,6 +37,7 @@ const bookingsSearch = plugins => async (req, res, next) => {
     });
     assert(userAppKeys, 'could not find the app key');
     const token = await userAppKeys.token;
+    assert(app.searchHotelBooking || app.searchBooking, `searchHotelBooking or searchBooking is not available for ${appKey}`);
     const search = (app.searchHotelBooking || app.searchBooking).bind(app);
     const results = await search({
       axios,

package/controllers/user.js

@@ -6,9 +6,12 @@ const { UserAppKey } = require('../models');
 const userAppList = async (req, res, next) => {
   const { params: { userId } } = req;
   try {
-    const userAppKeys = (await UserAppKey.findAll({ where: { userId } }))
-      .map(userAppKey => userAppKey.dataValues);
-    return res.json({ userAppKeys: userAppKeys.map(userAppKey => omit(['appKey', 'id'], userAppKey)) });
+    const userAppKeys = await UserAppKey.findAll({
+      where: { userId },
+      raw: true,
+      attributes: ['integrationId', 'userId', 'hint', 'createdAt', 'updatedAt'],
+    })
+    return res.json({ userAppKeys });
   } catch (err) {
     return next(err);
   }

package/index.js

@@ -23,8 +23,6 @@ const cacheSettings = {
     'bookingsProductSearch',
     'getCreateBookingFields',
   ],
-  ventrata: [],
-  fareharbor: [],
 };
 const ti2Events = new EventEmitter({ captureRejections: true, wildcard: true });
 ti2Events.on('event error', console.error);
@@ -265,9 +263,10 @@ module.exports = async ({
         const currentPlugin = req.pathParams
           ? plugins.find(p => p.name === req.pathParams.appKey)
           : null;
+        const pluginCacheSettings = R.pathOr({}, ['cacheSettings'], currentPlugin);
         const cachingOperations = [
           ...cacheSettings['*'],
-          ...(currentPlugin ? R.pathOr([], [currentPlugin.name], cacheSettings) : []),
+          ...(currentPlugin ? R.keys(pluginCacheSettings) : []),
         ];
         const body = req.customBody;
         if (cachingOperations.indexOf(body.operationId) > -1) {
@@ -288,6 +287,7 @@ module.exports = async ({
                 pluginName: req.pathParams.appKey,
                 key: cacheKey,
                 value: newData,
+                skipTTL: R.path([body.operationId, 'skipTTL'], pluginCacheSettings),
                 ttl: 60 * 60 * 24, // one day
               });
             }

package/package.json

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