feat: remove adherence between features and slack service, use the interface field to get informations

Author: denouche

src/feature/assistant-feature.js

@@ -1,5 +1,4 @@
-const _ = require('lodash'),
-    SlackService = require('../interface/slack-service');
+const _ = require('lodash');
 
 
 class AssistantFeature {
@@ -67,9 +66,9 @@ class AssistantFeature {
         return this.cache;
     }
 
-    static getCacheId(channelId, userId) {
+    static getCacheId(interfac, channelId, userId) {
         // channel, group ou im
-        let datastore = SlackService.getDataStore();
+        let datastore = interfac.getDataStore();
         if(datastore.getChannelById(channelId)
             || datastore.getGroupById(channelId)) {
             // On est dans un channel/group
@@ -130,7 +129,7 @@ class AssistantFeature {
 
     initAssistantFeature(interfac, context) {
         this.interface = interfac;
-        this.id = this.constructor.getCacheId(context.channelId, context.userId);
+        this.id = this.constructor.getCacheId(interfac, context.channelId, context.userId);
         this.context = context;
 
         this.resetTtl();

src/feature/configuration/configuration.js

@@ -1,7 +1,6 @@
 const AssistantFeature = require('../assistant-feature'),
     StateMachine = require('javascript-state-machine'),
-    ConfigurationService = require('../../helpers/configuration-service.js'),
-    SlackService = require('../../interface/slack-service');
+    ConfigurationService = require('../../helpers/configuration-service.js');
 
 class Configuration extends AssistantFeature {
 
@@ -64,7 +63,7 @@ class Configuration extends AssistantFeature {
 
     onHelp(event, from, to) {
         if(this.context.interfaceType === 'im') {
-            var fromUser = SlackService.getDataStore().getUserById(this.context.userId);
+            var fromUser = this.interface.getDataStore().getUserById(this.context.userId);
             if(fromUser.is_admin || this.interface.isAdministrator(this.context.userId)) {
                 var toSend = [
                     'Mode configuration activé, dites "fin" pour le quitter.',

src/interface/slack-service.js

@@ -14,13 +14,6 @@ const limiter = new Bottleneck(1, 1000);
 
 class SlackService extends EventEmitter {
 
-    static getDataStore() {
-        if(!this.dataStore) {
-            this.dataStore = new MemoryDataStore();
-        }
-        return this.dataStore;
-    }
-
     constructor(options) {
         super();
 
@@ -33,6 +26,10 @@ class SlackService extends EventEmitter {
         this.init();
         this.slack.start();
     }
+    
+    getDataStore() {
+        return this.slack.dataStore;
+    }
 
     isAdministrator(userId) {
         return this.administrators.indexOf(userId) !== -1;
@@ -49,7 +46,7 @@ class SlackService extends EventEmitter {
 
         this.slack = new RtmClient(process.env.SLACK_TOKEN, {
             logLevel: 'warning',
-            dataStore: this.constructor.getDataStore()
+            dataStore: new MemoryDataStore()
         });
         this.slack.on(CLIENT_EVENTS.RTM.AUTHENTICATED, (rtmStartData) => {
             this.authenticatedUserId = rtmStartData.self.id;

src/virtual-assistant.js

@@ -49,11 +49,11 @@ class VirtualAssistant {
 	    });
 	}
 
-	_getCurrentFeatureCacheId(context) {
+	_getCurrentFeatureCacheId(interfac, context) {
     	let cacheKey = null;
 		_.forEach(this.featureList, (o) => {
 			if(!cacheKey) {
-    			let currentCacheId = o.getCacheId(context.channelId, context.userId);
+    			let currentCacheId = o.getCacheId(interfac, context.channelId, context.userId);
 	    		if(currentCacheId && AssistantFeature.getCache().keys().indexOf(currentCacheId) !== -1) {
 	    			cacheKey = currentCacheId;
 	    		}
@@ -63,7 +63,7 @@ class VirtualAssistant {
 	}
 
 	_onMessage(fromInterface, context, message) {
-	    let featureCacheId = this._getCurrentFeatureCacheId(context);
+	    let featureCacheId = this._getCurrentFeatureCacheId(fromInterface, context);
 
 	    if(featureCacheId && AssistantFeature.getCache().get(featureCacheId)) {
 	        let feature = AssistantFeature.getCache().get(featureCacheId);