Merge pull request #22 from ibm-cloud-solutions/issue/20

Vague error when alerts enabled and rooms have changed. fixes #20

package.json

@@ -14,7 +14,8 @@
     "lint": "eslint src/**/*.js test/*.js index.js",
     "postinstall": "initDb src/nlc/NLC.json",
     "test": ". test/.env && mocha test",
-    "coverage": ". test/.env && istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
+    "coverage": ". test/.env && istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+    "coverage-local": ". test/.env && istanbul cover -x '**/tools/**' --include-all-sources --report lcov --report cobertura --report text --dir ./gh-pages/coverage _mocha -- test"
   },
   "keywords": [
     "hubot",

src/messages/en.json

@@ -50,7 +50,7 @@
     "app.alert.monitor.events.fallback": "Event alert for app: %s",
     "app.alert.monitor.events.timestamp": "Timestamp",
     "app.alert.monitor.events.type": "Type",
-    "app.alert.monitor.events.space": "Tpace",
+    "app.alert.monitor.events.space": "Space",
     "app.alert.monitor.events.user": "User",
 
     "help.app.alert.change": "Sets alert threshold for specified resource.",

src/scripts/app.alerts.js

@@ -184,13 +184,14 @@ function enableAlerts(contextKey, robot, space, type, res) {
 	}
 
 	if (res) {
-		let oldRoom = getRoom(spaceConfig.res);
-		let newRoom = getRoom(res);
+		let oldRoom = getRoom(robot, spaceConfig.res);
+		let newRoom = getRoom(robot, res);
 
 		if (oldRoom && newRoom && oldRoom !== newRoom) {
 			// user switch rooms.  tell old room that alerts for this space will go to the new room.
 			let message = i18n.__('app.alert.move.complete', spaceConfig.name, newRoom);
-			robot.emit('ibmcloud.formatter', { response: res, message: message});
+			robot.emit('ibmcloud.formatter', { response: spaceConfig.res, message: message}); // notify old room
+			robot.emit('ibmcloud.formatter', { response: res, message: message});  // notify new room
 		}
 
 		// res, ties back to room.  always send alerts to the latest room they were enabled in.
@@ -525,11 +526,15 @@ function getSpacesWithEnabledAlerts(alertContext, thresholdReq, alertType) {
 	return configs;
 }
 
-function getRoom(res) {
+function getRoom(robot, res) {
 	var room;
 
-	if (res && res.message && res.message.room) {
-		room = res.message.room;
+	if (robot && robot.adapter && robot.adapter.client && robot.adapter.client.rtm && robot.adapter.client.rtm.dataStore &&
+				res && res.message && res.message.room) {
+		var roomObj = robot.adapter.client.rtm.dataStore.getChannelGroupOrDMById(res.message.room);
+		if (roomObj.name) {
+			room = roomObj.name;
+		}
 	}
 
 	return room;