Skip to content

Commit

Permalink
Merge 5aa788e into 8d5621a
Browse files Browse the repository at this point in the history
  • Loading branch information
@afontainec
afontainec committed Nov 26, 2019
2 parents 8d5621a + 5aa788e commit 78c740d
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions models/table.js
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -643,7 +643,7 @@ class Table {
query.then((results) => {
return resolve(results);
}).catch((err) => {
reject(Table.makeError(err.routine));
reject(Table.makeError(err));
});
});
}
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
@@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions test/models/table/count/count.js
View file
Expand Up @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down
18 changes: 9 additions & 9 deletions test/models/table/find/find2.js
View file
Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down Expand Up @@ -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();
});
});
Expand Down
4 changes: 2 additions & 2 deletions test/models/table/find/findById.js
View file
Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down
4 changes: 2 additions & 2 deletions test/models/table/find/findIdIn.js
View file
Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down
4 changes: 2 additions & 2 deletions test/models/table/find/findIn.js
View file
Expand Up @@ -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();
});
});
Expand All @@ -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();
});
});
Expand Down

0 comments on commit 78c740d

Please sign in to comment.