Fix for debug info error returning
This commit is contained in:
parent
1e0808f839
commit
ddfe1bc226
@ -67,9 +67,9 @@ class Vin01Provider {
|
|||||||
vehicle.vin1 = Utils.cyrillicToLatin(vin);
|
vehicle.vin1 = Utils.cyrillicToLatin(vin);
|
||||||
vehicle.debugInfo = {
|
vehicle.debugInfo = {
|
||||||
vin01vin: { fields: 0, error: null },
|
vin01vin: { fields: 0, error: null },
|
||||||
vin01history: { fields: 0, error: history.reason },
|
vin01history: { fields: 0, error: history.reason.message },
|
||||||
vin01base: { fields: 0, error: base.reason }
|
vin01base: { fields: 0, error: base.reason.message }
|
||||||
}
|
};
|
||||||
return vehicle;
|
return vehicle;
|
||||||
} else if(base.status == 'rejected') {
|
} else if(base.status == 'rejected') {
|
||||||
console.log('vin01 found history');
|
console.log('vin01 found history');
|
||||||
@ -77,7 +77,7 @@ class Vin01Provider {
|
|||||||
vehicle.number = number;
|
vehicle.number = number;
|
||||||
Object.assign(vehicle.debugInfo, {
|
Object.assign(vehicle.debugInfo, {
|
||||||
vin01vin: { fields: 0, error: null },
|
vin01vin: { fields: 0, error: null },
|
||||||
vin01base: { fields: 0, error: base.reason }
|
vin01base: { fields: 0, error: base.reason.message }
|
||||||
});
|
});
|
||||||
return vehicle;
|
return vehicle;
|
||||||
} else if(history.status == 'rejected') {
|
} else if(history.status == 'rejected') {
|
||||||
@ -86,7 +86,7 @@ class Vin01Provider {
|
|||||||
vehicle.number = number;
|
vehicle.number = number;
|
||||||
Object.assign(vehicle.debugInfo, {
|
Object.assign(vehicle.debugInfo, {
|
||||||
vin01vin: { fields: 0, error: null },
|
vin01vin: { fields: 0, error: null },
|
||||||
vin01history: { fields: 0, error: history.reason }
|
vin01history: { fields: 0, error: history.reason.message }
|
||||||
});
|
});
|
||||||
return vehicle;
|
return vehicle;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
8
index.js
8
index.js
@ -12,10 +12,18 @@ const fs = require('fs');
|
|||||||
const compression = require('compression');
|
const compression = require('compression');
|
||||||
const dotenv = require('dotenv');
|
const dotenv = require('dotenv');
|
||||||
const dotenvExpand = require('dotenv-expand');
|
const dotenvExpand = require('dotenv-expand');
|
||||||
|
const responseTime = require('response-time');
|
||||||
|
|
||||||
let dotenvConf = dotenv.config();
|
let dotenvConf = dotenv.config();
|
||||||
dotenvExpand(dotenvConf);
|
dotenvExpand(dotenvConf);
|
||||||
|
|
||||||
|
app.use(responseTime(function (req, res, time) {
|
||||||
|
var stat = (req.method + req.url).toLowerCase()
|
||||||
|
.replace(/[:.]/g, '')
|
||||||
|
.replace(/\//g, '_');
|
||||||
|
console.log(`${stat} - ${time}`);
|
||||||
|
}));
|
||||||
|
|
||||||
app.use(compression());
|
app.use(compression());
|
||||||
app.use(bodyParser.json());
|
app.use(bodyParser.json());
|
||||||
app.use(expressMongoDb(process.env.MONGO_CONNECTION_STRING));
|
app.use(expressMongoDb(process.env.MONGO_CONNECTION_STRING));
|
||||||
|
|||||||
22
package-lock.json
generated
22
package-lock.json
generated
@ -22,6 +22,7 @@
|
|||||||
"node-fetch": "^2.6.1",
|
"node-fetch": "^2.6.1",
|
||||||
"node-html-parser": "^2.0.0",
|
"node-html-parser": "^2.0.0",
|
||||||
"pubnub": "^4.29.6",
|
"pubnub": "^4.29.6",
|
||||||
|
"response-time": "^2.3.2",
|
||||||
"utf8": "^3.0.0",
|
"utf8": "^3.0.0",
|
||||||
"uuid": "^8.3.0"
|
"uuid": "^8.3.0"
|
||||||
},
|
},
|
||||||
@ -2106,6 +2107,18 @@
|
|||||||
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
|
||||||
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
|
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
|
||||||
},
|
},
|
||||||
|
"node_modules/response-time": {
|
||||||
|
"version": "2.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz",
|
||||||
|
"integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=",
|
||||||
|
"dependencies": {
|
||||||
|
"depd": "~1.1.0",
|
||||||
|
"on-headers": "~1.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/rimraf": {
|
"node_modules/rimraf": {
|
||||||
"version": "2.6.3",
|
"version": "2.6.3",
|
||||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
|
||||||
@ -4650,6 +4663,15 @@
|
|||||||
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
|
||||||
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
|
"integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
|
||||||
},
|
},
|
||||||
|
"response-time": {
|
||||||
|
"version": "2.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz",
|
||||||
|
"integrity": "sha1-/6cbq5UtYvfB1Jt0NDVfvGjf/Fo=",
|
||||||
|
"requires": {
|
||||||
|
"depd": "~1.1.0",
|
||||||
|
"on-headers": "~1.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"rimraf": {
|
"rimraf": {
|
||||||
"version": "2.6.3",
|
"version": "2.6.3",
|
||||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
|
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
|
||||||
|
|||||||
@ -24,6 +24,7 @@
|
|||||||
"node-fetch": "^2.6.1",
|
"node-fetch": "^2.6.1",
|
||||||
"node-html-parser": "^2.0.0",
|
"node-html-parser": "^2.0.0",
|
||||||
"pubnub": "^4.29.6",
|
"pubnub": "^4.29.6",
|
||||||
|
"response-time": "^2.3.2",
|
||||||
"utf8": "^3.0.0",
|
"utf8": "^3.0.0",
|
||||||
"uuid": "^8.3.0"
|
"uuid": "^8.3.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -49,7 +49,7 @@ router.post('/check', async (req, res) => {
|
|||||||
|
|
||||||
let vehicle = null;
|
let vehicle = null;
|
||||||
if(autocod.status == 'rejected' && vin01.status == 'rejected') {
|
if(autocod.status == 'rejected' && vin01.status == 'rejected') {
|
||||||
throw Error(autocod.reason);
|
throw autocod.reason;
|
||||||
} else if(vin01.status == 'rejected') {
|
} else if(vin01.status == 'rejected') {
|
||||||
vehicle = autocod.value;
|
vehicle = autocod.value;
|
||||||
Object.assign(vehicle.debugInfo, vin01.reason.debugInfo);
|
Object.assign(vehicle.debugInfo, vin01.reason.debugInfo);
|
||||||
@ -57,7 +57,7 @@ router.post('/check', async (req, res) => {
|
|||||||
vehicle = vin01.value;
|
vehicle = vin01.value;
|
||||||
Object.assign(vehicle.debugInfo, autocod.reason.debugInfo);
|
Object.assign(vehicle.debugInfo, autocod.reason.debugInfo);
|
||||||
if(!vehicle.brand.name.normalized) {
|
if(!vehicle.brand.name.normalized) {
|
||||||
throw Error(autocod.reason);
|
throw autocod.reason;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
vehicle = autocod.value;
|
vehicle = autocod.value;
|
||||||
@ -99,7 +99,7 @@ router.post('/check', async (req, res) => {
|
|||||||
router.get('/', async (req, res) => {
|
router.get('/', async (req, res) => {
|
||||||
const { email } = req.user;
|
const { email } = req.user;
|
||||||
const { pageToken } = req.query;
|
const { pageToken } = req.query;
|
||||||
const pageSize = 50;
|
const pageSize = 10;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let finalQuery = Utils.makeVehiclesSearchQuery(req.query, email);
|
let finalQuery = Utils.makeVehiclesSearchQuery(req.query, email);
|
||||||
@ -119,6 +119,9 @@ router.get('/', async (req, res) => {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('====== Query ======');
|
||||||
|
console.log(finalQuery);
|
||||||
|
|
||||||
let vehicles = await collection.find(finalQuery).sort({ updatedDate: -1 }).limit(pageSize).toArray();
|
let vehicles = await collection.find(finalQuery).sort({ updatedDate: -1 }).limit(pageSize).toArray();
|
||||||
if(vehicles.length == pageSize) {
|
if(vehicles.length == pageSize) {
|
||||||
response.pageToken = vehicles[vehicles.length - 1]._id;
|
response.pageToken = vehicles[vehicles.length - 1]._id;
|
||||||
|
|||||||
1
utils.js
1
utils.js
@ -28,7 +28,6 @@ class Utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let findQueryFiltered = Object.fromEntries(Object.entries(findQuery).filter(([,val]) => val ));
|
let findQueryFiltered = Object.fromEntries(Object.entries(findQuery).filter(([,val]) => val ));
|
||||||
console.dir(findQueryFiltered);
|
|
||||||
return { ...findQueryFiltered, ...numberQuery };
|
return { ...findQueryFiltered, ...numberQuery };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user