returning the callback on success

chrisdevwords · Aug 15, 2017 · bc5c25c · bc5c25c
1 parent 2c53f50
commit bc5c25c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/index.js b/src/index.js
@@ -42,12 +42,11 @@ function handler(event, context, callback) {
             extractFromUri(trackUri, 'track'),
             SPOTIFY_USER_ACCESS_TOKEN
         )
-        .catch((error) => {
-            callback(null, slack.slackResp(
-                error.message, 200, slack.TYPE_PRIVATE
-            ));
-        })
         .then((trackInfo) => {
+            slack.notify(
+                response_url,
+                radio.SLACK_PENDING_MESSAGE(trackInfo)
+            );
             radio
                 .playBasedOnTrack(
                     SPOTIFY_RADIO_PLAYLIST,
@@ -70,12 +69,18 @@ function handler(event, context, callback) {
                         slack.TYPE_PRIVATE
                     );
                 });
-              // eslint-disable-next-line no-param-reassign
-            context.callbackWaitsForEmptyEventLoop = false;
-            callback(null, slack.slackResp(
-                radio.SLACK_PENDING_MESSAGE(trackInfo)
-            ));
+        })
+        .catch((error) => {
+            slack.notify(
+                response_url,
+                error.message,
+                slack.TYPE_PRIVATE
+            );
         });
+    // eslint-disable-next-line no-param-reassign
+    context.callbackWaitsForEmptyEventLoop = false;
+    return callback(null, slack.slackResp(''));
+
 }
 
 module.exports = {

diff --git a/test/test_index.js b/test/test_index.js
@@ -61,7 +61,7 @@ describe('The Index Lambda Handler', () => {
             artist: 'Cardi B',
             id: '2771LMNxwf62FTAdpJMQfM'
         };
-        const respMsg = radio.SLACK_PENDING_MESSAGE(trackInfo);
+        const respMsg = ''; //radio.SLACK_PENDING_MESSAGE(trackInfo);
 
         beforeEach(() => {
            sinon