moving slack response stuff into one module formatting now playing re…

…sponse

src/commands.js

@@ -1,7 +1,9 @@
 
 import request from 'request-promise-native';
-
-export const CMD_NOT_SUPPORTED = 'Command not supported.';
+import {
+    CMD_NOT_SUPPORTED,
+    NOW_PLAYING
+} from './slack-resp';
 
 let _apiRoot;
 
@@ -77,14 +79,16 @@ export function skipTrack() {
 }
 
 export function getPlaying() {
+
     const uri = `${_apiRoot}/api/spotify/playing/`;
+
     return request
         .get({
             uri,
             json: true
         })
-        .then((resp) => {
-            return resp;
+        .then(({ track }) => {
+            return NOW_PLAYING(track)
         });
 }
 

src/index.js

@@ -1,21 +1,12 @@
 
-import { response } from './util/lambda';
 import { parseFormString } from './util/parse';
 import { exec, setAPIRoot } from './commands';
-
-const TYPE_PRIVATE = 'ephemeral';
-const TYPE_PUBLIC = 'in_channel';
-
-const INVALID_TOKEN = 'Token is invalid.';
-
-function slackResp(text, code = 200, type = TYPE_PUBLIC) {
-    return response({
-        // eslint-disable-next-line camelcase
-        response_type: type,
-        text
-    }, code);
-}
-
+import {
+    slackResp,
+    INVALID_TOKEN,
+    TYPE_PRIVATE,
+    TYPE_PUBLIC
+} from './slack-resp';
 
 function handler(event, context, callback) {
 

src/slack-resp.js

@@ -0,0 +1,26 @@
+
+import { response } from './util/lambda';
+
+// response types
+export const TYPE_PRIVATE = 'ephemeral';
+export const TYPE_PUBLIC = 'in_channel';
+
+// error messages
+const INVALID_TOKEN = 'Token is invalid.';
+
+// message templates
+export const CMD_NOT_SUPPORTED = 'Command not supported.';
+export const NOW_PLAYING = ({ name, artist, requestedBy }) =>
+    `Now playing "${name}" by ${artist} requested by ${requestedBy}.`;
+
+
+
+export function slackResp(text, code = 200, type = TYPE_PUBLIC) {
+    return response({
+        // eslint-disable-next-line camelcase
+        response_type: type,
+        text
+    }, code);
+}
+
+export default {}

test/test_index.js

@@ -55,10 +55,12 @@ describe('The Spotify Slack Lambda index.handler', () => {
                     handler(event, {}, (err, resp) => {
                         try {
                             expect(resp.statusCode)
+
                                 .to.eq(200);
                             done()
                         } catch (err) {
-                            done(err);
+
+                            done(resp);
                         }
                     });
                 });