fix to avoid multiplies gets to the db

janis-commerce · Jun 9, 2020 · 3de1ef5 · 3de1ef5
1 parent 134b27a
commit 3de1ef5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/lib/client-settings.js b/lib/client-settings.js
@@ -58,23 +58,20 @@ module.exports = class ClientSettings {
 	static async getForClient(entity, settingName) {
 
 		const clientSettingsModel = this.session.getSessionInstance(ClientSettingsModel);
-		const setting = await clientSettingsModel.getBy('entity', entity, { unique: true });
+		const clientSettings = await clientSettingsModel.getBy('entity', entity, { unique: true });
 
-		const value = setting && setting.values[settingName] ? setting.values[settingName] : this.getDefault(entity, settingName);
+		const defaultSettings = DefinitionFetcher.getByEntity(this.settingsPath, entity);
 
-		if(!cache[this.settingsPath][entity])
-			cache[this.settingsPath][entity] = {};
+		const settingsFormatted = {};
 
-		cache[this.settingsPath][entity][settingName] = value;
+		Object.entries(defaultSettings).forEach(([defaultSettingName, setting]) => {
+			settingsFormatted[defaultSettingName] = (clientSettings && clientSettings.values
+				&& typeof clientSettings.values[defaultSettingName] !== 'undefined')
+				? clientSettings.values[defaultSettingName]
+				: setting.default;
+		});
 
-		return value;
-	}
-
-	static getDefault(entity, settingName) {
-
-		cache[this.settingsPath][entity] = {
-			[settingName]: DefinitionFetcher.getDefaultValue(this.settingsPath, entity, settingName)
-		};
+		cache[this.settingsPath][entity] = settingsFormatted;
 
 		return cache[this.settingsPath][entity][settingName];
 	}

diff --git a/lib/definition-fetcher.js b/lib/definition-fetcher.js
@@ -43,10 +43,11 @@ module.exports = class DefinitionFetcher {
 		return definitions[pathToGet] && definitions[pathToGet][entity] && definitions[pathToGet][entity][settingName];
 	}
 
-	static getDefaultValue(definitionPath, entity, settingName) {
-		const setting = this.get(definitionPath, entity, settingName);
+	static getByEntity(definitionPath, entity) {
 
-		return setting && setting.default;
+		const pathToGet = this.getPath(definitionPath);
+
+		return definitions[pathToGet] && definitions[pathToGet][entity];
 	}
 
 };
diff --git a/tests/client-settings.js b/tests/client-settings.js
@@ -241,11 +241,10 @@ describe('ClientSettings', () => {
 		mockRequire(uniqueDefinitionPath, settingsDefinition);
 
 		sinon.stub(ClientSettingsModel.prototype, 'getBy');
-		ClientSettingsModel.prototype.getBy.onCall(0).resolves({
+		ClientSettingsModel.prototype.getBy.resolves({
 			entity,
 			values: { [settingName]: value }
 		});
-		ClientSettingsModel.prototype.getBy.onCall(1).resolves(null);
 
 		ClientSettings
 			.setSettingsDefinitionPath(uniqueDefinitionPath)
@@ -267,9 +266,8 @@ describe('ClientSettings', () => {
 
 		assert.deepStrictEqual(otherSettingValue, 0);
 
-		sinon.assert.calledTwice(ClientSettingsModel.prototype.getBy);
-		sinon.assert.calledWithExactly(ClientSettingsModel.prototype.getBy.getCall(0), 'entity', entity, {	unique: true });
-		sinon.assert.calledWithExactly(ClientSettingsModel.prototype.getBy.getCall(1), 'entity', entity, {	unique: true });
+		sinon.assert.calledOnce(ClientSettingsModel.prototype.getBy);
+		sinon.assert.calledWithExactly(ClientSettingsModel.prototype.getBy, 'entity', entity, {	unique: true });
 	});
 
 });