Skip to content

Commit

Permalink
delete unnecessary try catchs
Browse files Browse the repository at this point in the history
  • Loading branch information
calandrajose committed Oct 7, 2021
1 parent e095dde commit d23d172
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 24 deletions.
12 changes: 3 additions & 9 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,15 @@
const logger = require('./lib/colorful-lllog')();

const MongodbIndexCreator = require('./lib/mongodb-index-creator');
const MongodbIndexCreatorError = require('./lib/mongodb-index-creator-error');

(async () => {

const mongodbIndexCreator = new MongodbIndexCreator();

try {
await mongodbIndexCreator.execute();

await mongodbIndexCreator.execute();
logger.info('Operation completed successfully.');

logger.info('Operation completed successfully.');
process.exit(0);

process.exit(0);

} catch(err) {
throw new MongodbIndexCreatorError(err.message, err.code);
}
})();
11 changes: 8 additions & 3 deletions lib/helpers/validate-indexes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
'use strict';

const { struct } = require('superstruct');
const MongodbIndexCreatorError = require('../mongodb-index-creator-error');


const indexStruct = struct({
name: 'string',
Expand All @@ -20,8 +22,10 @@ module.exports = model => {
if(typeof model.constructor.indexes === 'undefined')
return;

if(!Array.isArray(model.constructor.indexes))
throw new Error(`Invalid indexes for collection ${model.constructor.table}: indexes must be an array of objects`);
if(!Array.isArray(model.constructor.indexes)) {
throw new MongodbIndexCreatorError(`Invalid indexes for collection ${model.constructor.table}: indexes must be an array of objects`,
MongodbIndexCreatorError.codes.INVALID_INDEXES);
}


try {
Expand All @@ -30,6 +34,7 @@ module.exports = model => {
.map(index => indexStruct(index));

} catch(err) {
throw new Error(`Invalid indexes for collection ${model.constructor.table}: ${err.message}`);
throw new MongodbIndexCreatorError(`Invalid indexes for collection ${model.constructor.table}: ${err.message}`,
MongodbIndexCreatorError.codes.INVALID_INDEXES);
}
};
3 changes: 2 additions & 1 deletion lib/mongodb-index-creator-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ module.exports = class MongodbIndexCreatorError extends Error {

static get codes() {
return {
CREATE_INDEX_ERROR: 1,
DROP_INDEX_ERROR: 2,
CREATE_INDEX_ERROR: 3
INVALID_INDEXES: 3
};
}
};
9 changes: 2 additions & 7 deletions lib/mongodb-index-creator.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const logger = require('./colorful-lllog')();
const serverlessFunction = require('./serverless-function');

const { Client, ModelHelper, IndexHelper, Results } = require('./helpers');
const MongodbIndexCreatorError = require('../lib/mongodb-index-creator-error');

module.exports = class MongodbIndexCreator {

Expand Down Expand Up @@ -51,12 +50,8 @@ module.exports = class MongodbIndexCreator {
const models = modelHelper.getModels();

await Promise.all(models.map(model => {
try {
const indexHelper = new IndexHelper(model);
return indexHelper.process();
} catch(err) {
throw new MongodbIndexCreatorError(err.message, MongodbIndexCreatorError.codes.CREATE_INDEX_ERROR);
}
const indexHelper = new IndexHelper(model);
return indexHelper.process();
}));
}

Expand Down
6 changes: 2 additions & 4 deletions tests/core-indexes-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ describe('MongodbIndexCreator - Core Indexes', () => {

sinon.spy(SimpleModel.prototype, 'createIndex');

await assert.rejects(() => execute(), {
await assert.rejects(execute(), {
code: MongodbIndexCreatorError.codes.DROP_INDEX_ERROR
});

Expand Down Expand Up @@ -359,9 +359,7 @@ describe('MongodbIndexCreator - Core Indexes', () => {
sinon.stub(InvalidIndexesModel.prototype, 'createIndex')
.resolves(true);

await assert.rejects(execute(), {
code: MongodbIndexCreatorError.codes.CREATE_INDEX_ERROR
});
await assert.rejects(execute(), { code: MongodbIndexCreatorError.codes.INVALID_INDEXES });

sinon.assert.notCalled(InvalidIndexesModel.prototype.getIndexes);
sinon.assert.notCalled(InvalidIndexesModel.prototype.dropIndex);
Expand Down

0 comments on commit d23d172

Please sign in to comment.