@autofleet/node-common 1.3.1 → 1.3.3

package/logger/index.js

@@ -1,7 +1,4 @@
 const winston = require('winston');
-const { LoggingWinston } = require('@google-cloud/logging-winston');
-
-const loggingWinston = new LoggingWinston();
 
 const { createLogger } = winston;
 require('dotenv').config();
@@ -57,10 +54,6 @@ const getFormat = () => {
 const createLoggerInstance = (level, exceptionHandlers) => {
   const transports = [new winston.transports.Console()];
 
-  if (process.env.AF_SERVICE_NAME) {
-    transports.push(loggingWinston);
-  }
-
   const logger = createLogger({
     level,
     format: getFormat(),
@@ -84,7 +77,6 @@ const createLoggerInstance = (level, exceptionHandlers) => {
       },
     });
   };
-
   if (env.NODE_ENV !== 'production') {
     logger.httpMorganInfo = undefined;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/Autofleet/node-common",
   "dependencies": {
-    "@google-cloud/logging-winston": "^2.0.1",
+    "@google-cloud/logging-winston": "^0.10.2",
     "@google-cloud/pubsub": "^0.20.1",
     "axios": "^0.18.0",
     "axios-retry": "^3.1.0",
@@ -38,7 +38,7 @@
     "qs": "^6.5.2",
     "timekeeper": "^2.1.2",
     "weak": "^1.0.1",
-    "winston": "^3.2.1",
+    "winston": "^3.0.0",
     "ws": "^5.2.1"
   },
   "devDependencies": {

package/router/index.js

@@ -17,17 +17,11 @@ const AfEntryPoint = func => async (req, res, next) => {
   try {
     await func(req, res, next);
   } catch (e) {
-    if(e.array) {
-      logger.error('Validation error', e.array())
-      res.status(422);
-      res.json({
-        validationErrors: e.array(),
-      })
-      next();
-    } else {
-      logger.error(e)
-      next(e);
+    logger.error(e.message);
+    if (e.statusCode && e.statusCode < 500) {
+      return res.status(400).json({ error: e.message, status: 'ERROR' });
     }
+    next(e);
   }
 };
 

package/settings/map.js

@@ -86,6 +86,13 @@ module.exports = {
     defaultValue: 15000,
     context: 'matching',
   },
+  VAAS_PLACEMENT_STRATEGY_NAME: {
+    name: 'VaaS Placement Strategy',
+    description: 'VaaS Placement Strategy Name',
+    type: 'string',
+    string: 'min-fleet-cost',
+    context: 'placement',
+  },
   MATCHING_MINIMUM_PAID_RATIO: {
     name: 'Matching min paid/unpaid air distance',
     description: 'The ratio between paid to unpaid air distance - pre filter',
@@ -395,4 +402,11 @@ module.exports = {
     defaultValue: 'GBP',
     context: 'ride',
   },
+  BUFFER: {
+    name: 'Buffer around a polygon of a route',
+    description: 'The buffer around a polygon of a route to calculate tiled from',
+    type: 'number',
+    defaultValue: 1,
+    context: 'matching',
+  },
 };