ti2 1.0.121 → 1.0.123

package/controllers/__tests__/product-search-ttr.js

@@ -0,0 +1,39 @@
+const bookings = require('../bookings');
+
+describe('resolveProductSearchTtrSeconds', () => {
+  const oneDay = bookings.oneDayProductSearchTtrSeconds;
+  const weekly = bookings.defaultProductSearchTtrSeconds;
+
+  it('uses a seven-day default when no TTR is configured', () => {
+    expect(bookings.resolveProductSearchTtrSeconds({}, {})).toBe(weekly);
+    expect(weekly).toBe(oneDay * 7);
+  });
+
+  it('keeps an explicit one-day token TTR', () => {
+    expect(bookings.resolveProductSearchTtrSeconds({
+      ttlForProducts: oneDay,
+    }, {})).toBe(oneDay);
+    expect(bookings.resolveProductSearchTtrSeconds({
+      ttlForProducts: String(oneDay),
+    }, {})).toBe(String(oneDay));
+  });
+
+  it('keeps an explicit non-legacy TTR, including short test values', () => {
+    expect(bookings.resolveProductSearchTtrSeconds({
+      ttlForProducts: 2,
+    }, {})).toBe(2);
+    expect(bookings.resolveProductSearchTtrSeconds({
+      ttlForProducts: oneDay * 2,
+    }, {})).toBe(oneDay * 2);
+  });
+
+  it('keeps an explicit one-day plugin cacheSettings TTR', () => {
+    expect(bookings.resolveProductSearchTtrSeconds({}, {
+      cacheSettings: {
+        bookingsProductSearch: {
+          ttr: oneDay,
+        },
+      },
+    })).toBe(oneDay);
+  });
+});

package/controllers/__tests__/user.js

@@ -40,6 +40,9 @@ describe('user', () => {
       plugins,
     } = await testUtils({
       plugins: [appName],
+      pluginCapabilities: {
+        [appName]: { weeklyProductCatalogSync: true },
+      },
     }));
     await db.models.UserAppKey.destroy({ where: { userId } });
     // create an App
@@ -353,10 +356,11 @@ describe('user', () => {
     expect(returnValue.success).toBe(true);
   });
   it('should be able to get all the methods for an app', async () => {
-    const { methods } = await doApiGet({
+    const { capabilities, methods } = await doApiGet({
       url: `/app/${appName}/methods`,
       token: userKey,
     });
+    expect(capabilities).toEqual({ weeklyProductCatalogSync: true });
     expect(methods).toEqual(
       expect.arrayContaining([
         'validateToken', 'getProduct',

package/controllers/app.js

@@ -50,7 +50,6 @@ const tokenTemplate = async (req, res, next) => {
   try {
     const thePlugin = req.app.plugins.find(({ name }) => name === pluginName);
     assert(thePlugin);
-    let template = thePlugin.tokenTemplate();
     const safeRegExp = el => {
       if (!el || !(el.regExp instanceof RegExp)) {
         return el;
@@ -64,24 +63,28 @@ const tokenTemplate = async (req, res, next) => {
         },
       };
     };
-    template = R.map(safeRegExp, template);
-    return res.json({
-      template: {
-        ...template,
-        // ttlProducts and doNotCallPluginForProducts are being used at ti2 level
-        // hence we should just by default allow them for all ti2 plugins
-        ttlForProducts: {
-          type: 'number',
-          regExp: /.+/,
-          default: 60 * 60 * 24, // 1 day
-        },
-        doNotCallPluginForProducts: {
-          type: 'boolean',
-          regExp: /.+/,
-          default: false,
-        },
+    const template = R.map(safeRegExp, {
+      ...thePlugin.tokenTemplate(),
+      // ttlProducts and doNotCallPluginForProducts are being used at ti2 level
+      // hence we should just by default allow them for all ti2 plugins
+      ttlForProducts: {
+        type: 'number',
+        regExp: /.+/,
+        default: 60 * 60 * 24 * 7, // 7 days; weekly full product catalog refresh
+      },
+      doNotCallPluginForProducts: {
+        type: 'boolean',
+        regExp: /.+/,
+        default: false,
+      },
+      productSearchOmitServiceCodes: {
+        type: 'text',
+        regExp: /^[\sA-Za-z0-9,]*$/,
+        default: '',
+        description: 'Service codes that every product search for this integration must omit',
       },
     });
+    return res.json({ template });
   } catch (err) {
     return next(err);
   }