@autofleet/node-common 1.1.11 → 1.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -23,6 +23,7 @@
   "homepage": "https://gitlab.com/AutoFleet/node-common#README",
   "dependencies": {
     "axios": "^0.18.0",
+    "express": "^4.16.2",
     "axios-retry": "^3.1.0",
     "dotenv": "^5.0.1",
     "jest": "^22.4.3",

package/router/index.js

@@ -0,0 +1,41 @@
+const { Router } = require('express');
+const logger = require('../logger')();
+
+const METHODS = [
+  'all',
+  'get',
+  'post',
+  'put',
+  'delete',
+  'patch',
+  'options',
+  'head',
+];
+
+const AfEntryPoint = func => async (req, res, next) => {
+  try {
+    await func(req, res, next);
+  } catch (e) {
+    logger.error(e.message);
+    res.status(e.statusCode || 500).json({ error: e.message, status: 'ERROR' });
+  }
+};
+
+const AfRouter = (options) => {
+  const myRouter = Router({ mergeParams: true, ...options });
+  METHODS.map((method) => {
+    const internalMethod = myRouter[method].bind(myRouter);
+    myRouter[method] = (...args) => {
+      internalMethod(...args.map((arg, index) => {
+        if (index === 0) {
+          return arg;
+        }
+        return AfEntryPoint(arg);
+      }));
+    };
+    return true;
+  });
+  return myRouter;
+};
+
+module.exports = AfRouter;

package/settings/index.js

@@ -23,7 +23,7 @@ module.exports = class SettingsManager {
   }
 
   async get(key, defaultValue, labels = []) {
-    if (!defaultValue) {
+    if (typeof defaultValue === 'undefined') {
       throw new Error('Can\'t get a key without defaultValue');
     }
 

package/settings/index.test.js

@@ -18,6 +18,22 @@ describe('Settings', () => {
       .rejects.toEqual(new Error('Can\'t get a key without defaultValue'));
   });
 
+  it('Can get 0 as default value', async () => {
+    const settings = new Settings({
+      serviceUrl: `http://${serviceUrl}/`,
+    });
+
+    expect(await settings.get('key1', 0)).toBe(0);
+  });
+
+  it('Can get false as default value', async () => {
+    const settings = new Settings({
+      serviceUrl: `http://${serviceUrl}/`,
+    });
+
+    expect(await settings.get('key1', false)).toBe(false);
+  });
+
   it('Uses env.SETTING_MS_SERVICE_HOST as serivce host if no one defind', async () => {
     const m = mockSetting('key1', 'value1');
     process.env.SETTING_MS_SERVICE_HOST = serviceUrl;