Applied PR corrections

lib/helpers/indexes.js

@@ -1,17 +1,17 @@
 'use strict';
 
-const Model = require('./model');
+const Model = require('./model-generator');
 
 const DEFAULT_ID_INDEX_NAME = '_id_';
 
 class IndexesHelper {
 
 	static prepareCoreIndexes(coreSchemas) {
-		return this._generateModels(Object.entries(coreSchemas), Model.getInstanceByDatabaseKey);
+		return this._generateCoreModels(coreSchemas);
 	}
 
 	static prepareClientIndexes(clients, clientSchemas) {
-		return this._generateModels(clients.map(client => [client, clientSchemas]), Model.getSessionInstance);
+		return this._generateClientModels(clients, clientSchemas);
 	}
 
 	static async get(modelInstance) {
@@ -21,23 +21,42 @@ class IndexesHelper {
 		return indexes.filter(({ name }) => name !== DEFAULT_ID_INDEX_NAME);
 	}
 
-	static getIndexesDifference(indexesA, indexesB) {
+	static difference(indexesA, indexesB) {
 		return indexesA.filter(indexA => !indexesB.some(({ name }) => indexA.name === name));
 	}
 
-	static _generateModels(formattedIndexes, handler) {
+	static _generateCoreModels(schemas) {
 
-		return formattedIndexes.reduce((prev, [key, collections]) => {
+		return Object.entries(schemas).reduce((models, [databaseKey, collections]) => {
 
-			return [
-				...prev,
+			models.push(
 				...Object.entries(collections).map(([collection, indexes]) => (
 					{
-						modelInstance: handler(key, collection),
+						modelInstance: Model.getInstanceByDatabaseKey(databaseKey, collection),
 						indexes
-					})
-				)
-			];
+					}
+				))
+			);
+
+			return models;
+
+		}, []);
+	}
+
+	static _generateClientModels(clients, collections) {
+
+		return clients.reduce((models, client) => {
+
+			models.push(
+				...Object.entries(collections).map(([collection, indexes]) => (
+					{
+						modelInstance: Model.getSessionInstance(client, collection),
+						indexes
+					}
+				))
+			);
+
+			return models;
 
 		}, []);
 	}

lib/mongodb-index-creator.js

@@ -153,13 +153,13 @@ class MongodbIndexCreator {
 
 	async _createIndexes(modelInstance, currentIndexes, indexes) {
 
-		const indexesToCreate = Indexes.getIndexesDifference(indexes, currentIndexes);
-
-		if(!indexesToCreate.length)
-			return Results.save('skipped', indexes.length);
+		const indexesToCreate = Indexes.difference(indexes, currentIndexes);
 
 		Results.save('skipped', indexes.length - indexesToCreate.length);
 
+		if(!indexesToCreate.length)
+			return;
+
 		const result = await modelInstance.createIndexes(indexesToCreate);
 
 		Results.save(
@@ -170,7 +170,7 @@ class MongodbIndexCreator {
 
 	async _dropIndexes(modelInstance, currentIndexes, indexes) {
 
-		const indexesToDrop = Indexes.getIndexesDifference(currentIndexes, indexes);
+		const indexesToDrop = Indexes.difference(currentIndexes, indexes);
 
 		if(!indexesToDrop.length)
 			return;