Fix stopping hold (#10)

matthewturner · Mar 31, 2019 · 6f146cd · 6f146cd
1 parent 7306e75
commit 6f146cd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -15,7 +15,7 @@
         ],
         "linebreak-style": [
             "error",
-            "linux"
+            "unix"
         ],
         "quotes": [
             "error",

diff --git a/.hound.yml b/.hound.yml
@@ -0,0 +1,5 @@
+fail_on_violations: true
+
+eslint:
+  enabled: true
+  config_file: .eslintrc.json
diff --git a/.jshintrc b/.jshintrc
diff --git a/aws/lambda.js b/aws/lambda.js
@@ -119,7 +119,8 @@ app.intent('SetTempIntent', {
 
 app.intent('TurnIntent', {
     'slots': {
-        'onoff': 'ONOFF'
+        'onoff': 'ONOFF',
+        'duration': 'AMAZON.DURATION'
     },
     'utterances': ['to turn {onoff}', 'to turn heating {onoff}', 'to turn the heating {onoff}']
 }, async (request, response) => {    

diff --git a/core/ControlService.js b/core/ControlService.js
@@ -182,7 +182,7 @@ class ControlService {
                     let intent = await this._holdStrategy.holdIfRequiredFor(duration);
                     return messages.concat(this.summarize(intent, updatedDevice));
                 } else {
-                    await this._holdStrategy.stopHoldIfRequiredFor(thermostat.executionId);
+                    await this._holdStrategy.stopHoldIfRequired(thermostat.executionId);
                 }
             }
             return messages;

diff --git a/core/test.js b/core/test.js
@@ -15,9 +15,8 @@ const say = (messages) => {
 };
 
 const main = async () => {
-    let onOff = 'on';
     let duration = process.env.DURATION;
-    let context = { userId: process.env.ALEXA_USER_ID };
+    let context = { userId: process.env.ALEXA_USER_ID, source: 'user' };
     let holdStrategy;
     if (process.env.HOLD_STRATEGY === 'aws') {
         holdStrategy = new AwsHoldStrategy(context);
@@ -50,7 +49,7 @@ const main = async () => {
     }
 
     try {
-        let messages = await service.turn(onOff, duration);
+        let messages = await service.turn('on', duration);
         say(messages);
     } catch (e) {
         say(e);
@@ -62,6 +61,13 @@ const main = async () => {
     } catch (e) {
         say(e);
     }
+
+    try {
+        let messages = await service.turn('off');
+        say(messages);
+    } catch (e) {
+        say(e);
+    }
 };
 
 main();