From 6fc49de14b062121e79a2b50a03d32c4f7778bd5 Mon Sep 17 00:00:00 2001 From: antonio Date: Tue, 12 Nov 2019 14:59:18 +0000 Subject: [PATCH 1/2] chore: release version 0.1.39 [skip ci] --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00fa1b5ae..1368ad9a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "chinchay", - "version": "0.1.38", + "version": "0.1.39", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e184ab78c..4b4f9ac61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chinchay", - "version": "0.1.38", + "version": "0.1.39", "description": "Building MVC files for express and knex.", "main": "index.js", "scripts": { From 5aa788e44c9c44fe96687d3984478d0980fb7560 Mon Sep 17 00:00:00 2001 From: antonio Date: Tue, 26 Nov 2019 19:15:45 -0300 Subject: [PATCH 2/2] send error as fullMessage --- models/table.js | 6 +++--- test/models/table/count/count.js | 10 +++++----- test/models/table/find/find2.js | 18 +++++++++--------- test/models/table/find/findById.js | 4 ++-- test/models/table/find/findIdIn.js | 4 ++-- test/models/table/find/findIn.js | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/models/table.js b/models/table.js index cb16069a8..8a90d0da1 100644 --- a/models/table.js +++ b/models/table.js @@ -225,7 +225,7 @@ class Table { whereQuery.id = id; return new Promise((resolve, reject) => { this.find(whereQuery, columns, options).then((entries) => { - if (entries.length === 0) return reject(Table.makeError('unexistantID')); + if (entries.length === 0) return reject(Table.makeError({ routine: 'unexistantID' })); return resolve(entries[0]); }).catch((err) => { reject(err); @@ -643,7 +643,7 @@ class Table { query.then((results) => { return resolve(results); }).catch((err) => { - reject(Table.makeError(err.routine)); + reject(Table.makeError(err)); }); }); } @@ -675,7 +675,7 @@ class Table { static makeError(err) { const keys400 = Object.keys(ERROR_400); - if (keys400.indexOf(err) > -1) { + if (keys400.indexOf(err.routine) > -1) { return Message.new(400, ERROR_400[err], err); } return Message.new(500, 'Internal error', err); diff --git a/test/models/table/count/count.js b/test/models/table/count/count.js index e96bbf743..bbb6c6068 100644 --- a/test/models/table/count/count.js +++ b/test/models/table/count/count.js @@ -48,7 +48,7 @@ describe('Malicious happy path', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); @@ -112,7 +112,7 @@ describe('with advance settings: group by', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); @@ -155,7 +155,7 @@ describe('with advance settings: order by', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'check_ungrouped_columns_walker'); + assert.equal(err.fullMessage.routine, 'check_ungrouped_columns_walker'); done(); }); }); @@ -200,7 +200,7 @@ describe('with advance settings: start_date and end_date', () => { // eslint-dis done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'DateTimeParseError'); + assert.equal(err.fullMessage.routine, 'DateTimeParseError'); done(); }); }); @@ -225,7 +225,7 @@ describe('with advance settings: countDistinct', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); diff --git a/test/models/table/find/find2.js b/test/models/table/find/find2.js index 061c8c7a8..61e5eafa7 100644 --- a/test/models/table/find/find2.js +++ b/test/models/table/find/find2.js @@ -71,7 +71,7 @@ describe('Malicious happy path', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); @@ -81,7 +81,7 @@ describe('Malicious happy path', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); @@ -111,7 +111,7 @@ describe('with advance settings: group by', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'check_ungrouped_columns_walker'); + assert.equal(err.fullMessage.routine, 'check_ungrouped_columns_walker'); done(); }); }); @@ -123,7 +123,7 @@ describe('with advance settings: group by', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); @@ -150,7 +150,7 @@ describe('with advance settings: order by', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'errorMissingColumn'); + assert.equal(err.fullMessage.routine, 'errorMissingColumn'); done(); }); }); @@ -238,7 +238,7 @@ describe('with advance settings: start_date and end_date', () => { // eslint-dis done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'DateTimeParseError'); + assert.equal(err.fullMessage.routine, 'DateTimeParseError'); done(); }); }); @@ -272,7 +272,7 @@ describe('with advance settings: offset', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'recompute_limits'); + assert.equal(err.fullMessage.routine, 'recompute_limits'); done(); }); }); @@ -291,7 +291,7 @@ describe('with advance settings: offset', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'recompute_limits'); + assert.equal(err.fullMessage.routine, 'recompute_limits'); done(); }); }); @@ -358,7 +358,7 @@ describe('with advance settings: raw select', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'scanner_yyerror'); + assert.equal(err.fullMessage.routine, 'scanner_yyerror'); done(); }); }); diff --git a/test/models/table/find/findById.js b/test/models/table/find/findById.js index 12ae3ddde..669cccea3 100644 --- a/test/models/table/find/findById.js +++ b/test/models/table/find/findById.js @@ -24,7 +24,7 @@ describe('TABLE GATEWAY: FIND BY ID', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'unexistantID'); + assert.equal(err.fullMessage.routine, 'unexistantID'); done(); }); }); @@ -34,7 +34,7 @@ describe('TABLE GATEWAY: FIND BY ID', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'pg_atoi'); + assert.equal(err.fullMessage.routine, 'pg_atoi'); done(); }); }); diff --git a/test/models/table/find/findIdIn.js b/test/models/table/find/findIdIn.js index 5d47db2c5..ea4710b57 100644 --- a/test/models/table/find/findIdIn.js +++ b/test/models/table/find/findIdIn.js @@ -45,7 +45,7 @@ describe('TABLE GATEWAY: FIND ID IN', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'pg_atoi'); + assert.equal(err.fullMessage.routine, 'pg_atoi'); done(); }); }); @@ -55,7 +55,7 @@ describe('TABLE GATEWAY: FIND ID IN', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'pg_atoi'); + assert.equal(err.fullMessage.routine, 'pg_atoi'); done(); }); }); diff --git a/test/models/table/find/findIn.js b/test/models/table/find/findIn.js index ea9c645fa..753658391 100644 --- a/test/models/table/find/findIn.js +++ b/test/models/table/find/findIn.js @@ -45,7 +45,7 @@ describe('TABLE GATEWAY: FIND ID IN', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'pg_atoi'); + assert.equal(err.fullMessage.routine, 'pg_atoi'); done(); }); }); @@ -55,7 +55,7 @@ describe('TABLE GATEWAY: FIND ID IN', () => { // eslint-disable-line done('SHOULD NOT GET HERE'); }).catch((err) => { assert.equal(err.code, 400); - assert.equal(err.fullMessage, 'pg_atoi'); + assert.equal(err.fullMessage.routine, 'pg_atoi'); done(); }); });