ti2 1.0.19 → 1.0.22

package/cache.js

@@ -0,0 +1,62 @@
+const Redis = require('ioredis');
+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 ({
+  pluginName,
+  key: keyParam,
+  value,
+  ttl = defaultTTL,
+}) => {
+  const key = `${pluginName}:${keyParam}`;
+  const keyType = typeof value === 'string';
+  await cache.set(key, JSON.stringify({
+    keyType,
+    value: keyType === 'string' ? value : JSON.stringify(value),
+  }));
+  await cache.expire(key, ttl);
+};
+
+const get = async ({
+  pluginName,
+  key: keyParam,
+}) => {
+  const key = `${pluginName}:${keyParam}`;
+  const storeVal = await cache.get(key);
+  if (!storeVal) return storeVal;
+  const { keyType, value } = JSON.parse(storeVal);
+  if (keyType === 'string') {
+    return value;
+  }
+  return JSON.parse(value);
+};
+
+const getOrExec = async ({
+  pluginName,
+  key: keyParam,
+  ttl,
+  fn,
+  fnParams,
+}) => {
+  const key = keyParam || hash({ fn, fnParams });
+  let value = await get({ pluginName, key });
+  if (value !== null) return value;
+  value = await fn(...fnParams);
+  await save({
+    pluginName,
+    key,
+    value,
+    ttl,
+  });
+  return value;
+};
+
+module.exports = {
+  cache,
+  save,
+  getOrExec,
+};

package/cli.js

@@ -21,6 +21,7 @@ program.command('dbapp')
   )
   .action(async (integration, action) => {
     await migrateApp({ integrationId: integration, action });
+    process.exit(0);
   });
 
 program.command('db')
@@ -31,6 +32,7 @@ program.command('db')
   )
   .action(async action => {
     await migrate({ action });
+    process.exit(0);
   });
 
 program.parse();

package/closeAll.js

@@ -1,6 +1,8 @@
 const { redisResults, queue } = require('./worker/queue');
+const { cache } = require('./cache');
 
 module.exports = async () => {
   await queue.close();
   await redisResults.quit();
+  await cache.quit();
 };

package/controllers/bookings.js

@@ -56,28 +56,37 @@ const bookingsCancel = plugins => async (req, res, next) => {
   }
 };
 
+const $bookingsProductSearch = plugins => async ({
+  appKey,
+  userId,
+  hint,
+  payload,
+}) => {
+  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 = userAppKeys.appKey;
+  const results = await app.searchProducts({
+    token,
+    payload,
+  });
+  return results;
+};
+
 const bookingsProductSearch = plugins => async (req, res, next) => {
   const {
-    params: { appKey, userId, hint },
+    params,
     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 = userAppKeys.appKey;
-    const results = await app.searchProducts({
-      token,
-      payload,
-    });
-    return res.json(results);
+    return res.json(await $bookingsProductSearch(plugins)({ ...params, payload }));
   } catch (err) {
     return next(err);
   }
@@ -110,28 +119,36 @@ const bookingsAvailabilitySearch = plugins => async (req, res, next) => {
   }
 };
 
+const $bookingsAvailabilityCalendar = plugins => async ({
+  appKey,
+  userId,
+  hint,
+  payload,
+}) => {
+  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 = userAppKeys.appKey;
+  return app.availabilityCalendar({
+    token,
+    payload,
+  });
+};
+
 const bookingsAvailabilityCalendar = plugins => async (req, res, next) => {
   const {
-    params: { appKey, userId, hint },
+    params,
     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 = userAppKeys.appKey;
-    const results = await app.availabilityCalendar({
-      token,
-      payload,
-    });
-    return res.json(results);
+    return res.json(await $bookingsAvailabilityCalendar(plugins)({ ...params, payload }));
   } catch (err) {
     return next(err);
   }
@@ -196,8 +213,10 @@ const createBooking = plugins => async (req, res, next) => {
 module.exports = plugins => ({
   bookingsSearch: bookingsSearch(plugins),
   bookingsCancel: bookingsCancel(plugins),
+  $bookingsProductSearch,
   bookingsProductSearch: bookingsProductSearch(plugins),
   bookingsAvailabilitySearch: bookingsAvailabilitySearch(plugins),
+  $bookingsAvailabilityCalendar,
   bookingsAvailabilityCalendar: bookingsAvailabilityCalendar(plugins),
   searchQuote: searchQuote(plugins),
   createBooking: createBooking(plugins),

package/index.js

@@ -18,6 +18,11 @@ const appController = require('./controllers/app');
 const userController = require('./controllers/user');
 const bookingsController = require('./controllers/bookings');
 const { Integration } = require('./models');
+const cache = require('./cache');
+
+// src : https://github.com/ramda/ramda/issues/3137#issuecomment-1016012904
+const rebuild = fn => obj =>
+  Object.fromEntries(Object.entries(obj).flatMap(([k, v]) => fn(k, v)));
 
 module.exports = async ({
   apiDocs = true,
@@ -76,11 +81,37 @@ module.exports = async ({
     ...appController,
     ...userController(plugins),
     ...bookingsController(plugins),
+    cache: R.omit(['cache'], cache),
   }; // mehthods that should map to the yaml api spec
   app.plugins = plugins;
-  createMiddleware(schema, app, (_err, middleware) => {
+  // add the plugin schema to the schema
+  const appControllers = {};
+  const allSchema = plugins.filter(e => e.schema).reduce((prev, { schema: currSchema, name }) => {
+    appControllers[name] = R.uniq(R.pluck(['operationId'])(R.flatten(Object.values(currSchema.paths || {}).map(Object.values))));
+    const newSchema = R.modifyPath(
+      ['paths'],
+      rebuild(
+        (attr, val) => {
+          const newVal = {};
+          Object.entries(val).forEach(([pathAttr, pathValue]) => {
+            newVal[pathAttr] = R.modifyPath(['operationId'], operationName => `${name}_${operationName}`, pathValue);
+          });
+          return [[`/apps/${name}${attr}`, newVal]];
+        },
+      ),
+      currSchema,
+    );
+    return R.mergeDeepLeft(prev, newSchema);
+  }, schema);
+  Object.entries(appControllers).forEach(([name, actions]) => {
+    actions.forEach(action => {
+      const thePlugin = plugins.find(({ name: pluginName }) => pluginName === name);
+      api[`${name}_${action}`] = thePlugin[action]({ plugins, api });
+    });
+  });
+  createMiddleware(allSchema, app, (_err, middleware) => {
     if (apiDocs) {
-      app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(schema));
+      app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(allSchema));
     }
     app.use(
       middleware.metadata(),
@@ -88,7 +119,7 @@ module.exports = async ({
       middleware.parseRequest(),
       // middleware.validateRequest(),
     );
-    const connect = connector(api, schema, {
+    const connect = connector(api, allSchema, {
       security: auth,
     });
     if (elasticLogsClient) { // API request logs are saved on elastic

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2",
-  "version": "1.0.19",
+  "version": "1.0.22",
   "description": "Tourist Industry Exchange (TI2)",
   "main": "index.js",
   "scripts": {
@@ -34,6 +34,7 @@
     "jsonwebtoken": "^8.5.1",
     "jwt-promise": "^1.0.0",
     "mysql2": "^2.3.3",
+    "object-hash": "^3.0.0",
     "ramda": "^0.28.0",
     "seque": "^1.2.1",
     "sequelize": "^6.13.0",

package/worker/index.js

@@ -1,6 +1,5 @@
 const throng = require('throng');
 require('util').inspect.defaultOptions.depth = null;
-const fakePlugin = require('../test/plugin');
 
 const { queue, saveResult } = require('./queue');
 
@@ -35,6 +34,7 @@ const worker = ({ plugins: pluginsParam }) => (id, disconnect) => {
     console.log(`job ${jobId} > running ${pluginName}:${method} for ${userId}`);
     const plugins = await (async () => {
       if (inTesting) {
+        const fakePlugin = require('../test/plugin');
         return [...pluginsParam, await new fakePlugin({ name: pluginName })];
       }
       return pluginsParam;