Removed unnecessary session

janis-commerce · May 26, 2020 · b9ea0a2 · b9ea0a2
1 parent bf44a4d
commit b9ea0a2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `databaseSettings` parameter for `postSaveHook()` method
 - `newClientsDatabaseKey` setting for new clients database config
 
+### Removed
+- `session` in client create API and Listener
+
 ### Changed
 - `Client` Model now set the new clients databaseKey from config
 

diff --git a/lib/api-create.js b/lib/api-create.js
@@ -11,10 +11,9 @@ class ClientCreateAPI extends API {
 
 	get clientModel() {
 
-		if(!this._clientModel) {
-			const instanceGetter = this.session.getSessionInstance(InstanceGetter);
-			this._clientModel = instanceGetter.getModelInstance('client');
-		}
+		if(!this._clientModel)
+			this._clientModel = InstanceGetter.getModelInstance('client');
+
 
 		return this._clientModel;
 	}

diff --git a/lib/helper/instance-getter.js b/lib/helper/instance-getter.js
@@ -12,10 +12,10 @@ class InstanceGetter {
 	 */
 	static getModelClass(entity) {
 
-		const modelPath = this.prototype.getModelRelativePath(entity);
+		const modelPath = this.getModelRelativePath(entity);
 
 		try {
-			return this.prototype.getClass(modelPath);
+			return this.getClass(modelPath);
 		} catch(e) {
 			throw new Error(`Invalid Model ${entity}. Must be in ${modelPath}.`);
 		}
@@ -25,7 +25,7 @@ class InstanceGetter {
      * Returns an instance model from the service.
      * @param {string} entity
      */
-	getModelInstance(entity) {
+	static getModelInstance(entity) {
 
 		const modelPath = this.getModelRelativePath(entity);
 
@@ -36,20 +36,20 @@ class InstanceGetter {
 		}
 	}
 
-	getModelRelativePath(entity) {
+	static getModelRelativePath(entity) {
 		return path.join(process.cwd(), process.env.MS_PATH || '', 'models', entity);
 	}
 
-	getClass(classPath) {
+	static getClass(classPath) {
 
 		// eslint-disable-next-line global-require, import/no-dynamic-require
 		return require(classPath);
 	}
 
-	getInstance(classPath) {
+	static getInstance(classPath) {
 
 		const TheClass = this.getClass(classPath);
-		return this.session.getSessionInstance(TheClass);
+		return new TheClass();
 	}
 }
 

diff --git a/lib/listener-created.js b/lib/listener-created.js
@@ -18,10 +18,9 @@ class ClientCreatedListener extends EventListener {
 
 	get clientModel() {
 
-		if(!this._clientModel) {
-			const instanceGetter = this.session.getSessionInstance(InstanceGetter);
-			this._clientModel = instanceGetter.getModelInstance('client');
-		}
+		if(!this._clientModel)
+			this._clientModel = InstanceGetter.getModelInstance('client');
+
 
 		return this._clientModel;
 	}

diff --git a/tests/api-create.js b/tests/api-create.js
@@ -50,7 +50,6 @@ describe('APIs', () => {
 
 			{
 				description: 'Should save all the received new clients to clients DB',
-				session: true,
 				request: {
 					data: {
 						clients: [
@@ -99,7 +98,6 @@ describe('APIs', () => {
 			},
 			{
 				description: 'Should return 500 when the client model multiSave fails',
-				session: true,
 				request: {
 					data: {
 						clients: ['some-client']
@@ -132,7 +130,6 @@ describe('APIs', () => {
 			},
 			{
 				description: 'Should return 500 when the index creator fails',
-				session: true,
 				request: {
 					data: {
 						clients: ['some-client']
@@ -166,7 +163,6 @@ describe('APIs', () => {
 			},
 			{
 				description: 'Should return 400 when the received request data is invalid',
-				session: true,
 				request: {
 					data: ['something']
 				},
@@ -176,7 +172,6 @@ describe('APIs', () => {
 			},
 			{
 				description: 'Should return 400 when the received clients are invalid',
-				session: true,
 				request: {
 					data: {
 						clients: { some: 'object' }
@@ -188,7 +183,6 @@ describe('APIs', () => {
 			},
 			{
 				description: 'Should return 400 when the client model is not in the corresponding path',
-				session: true,
 				request: {
 					data: {
 						clients: [

diff --git a/tests/listener-created.js b/tests/listener-created.js
@@ -66,7 +66,6 @@ describe('Client Created Listener', async () => {
 		{
 			description: 'Should return 500 when client model fails to save the new client',
 			event: validEvent,
-			session: true,
 			before: sandbox => {
 
 				mockRequire(fakeClientPath, ClientModel);
@@ -91,7 +90,6 @@ describe('Client Created Listener', async () => {
 		{
 			description: 'Should return 500 when the index creator fails',
 			event: validEvent,
-			session: true,
 			before: sandbox => {
 
 				mockRequire(fakeClientPath, ClientModel);
@@ -116,7 +114,6 @@ describe('Client Created Listener', async () => {
 		{
 			description: 'Should return 200 when client model saves the new client sucessfully',
 			event: validEvent,
-			session: true,
 			before: sandbox => {
 
 				mockRequire(fakeClientPath, ClientModel);