Pull menus from S3

times · Apr 8, 2017 · 0a1990c · 0a1990c
1 parent eb896b9
commit 0a1990c
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 71 deletions.
diff --git a/serverless.yml b/serverless.yml
@@ -26,7 +26,7 @@ functions:
           path: /core
           method: get
     environment:
-      DATA_URL: http://elliotdavies.co.uk/dev/menu/
+      DATA_URL: https://canteenbot-data.s3-eu-west-2.amazonaws.com/
 
   ## Slash-command listener
   slack:

diff --git a/slack/handler.js b/slack/handler.js
@@ -10,64 +10,61 @@ const coreUrl = process.env.CORE_URL;
 
 // Helper
 const parseCommand = body => {
-  return body
-    .split('&')
-    .reduce((params, str) => {
-      const parts = str.split('=').map(decodeURIComponent);
-      return Object.assign({}, params, {
-        [parts[0]]: parts[1]
-      })
-    }, {});
+  return body.split('&').reduce((params, str) => {
+    const parts = str.split('=').map(decodeURIComponent);
+    return Object.assign({}, params, {
+      [parts[0]]: parts[1],
+    });
+  }, {});
 };
 
-
 /**
  * Entry point
  */
 module.exports.handler = (event, context, callback) => {
-
   // Check the request was recieved via a supported method
   if (event.httpMethod !== 'POST') {
-    sendErrorResponse(callback, 'Invalid HTTP method. Method should be POST.', 405);
+    sendErrorResponse(
+      callback,
+      'Invalid HTTP method. Method should be POST.',
+      405
+    );
     return;
   }
 
   // Parse arguments
   const { token, command, text } = parseCommand(event.body);
 
   if (command !== '/canteen') {
-    sendErrorResponse(callback, `Sorry, the service ${command} isn't supported.`);
+    sendErrorResponse(
+      callback,
+      `Sorry, the service ${command} isn't supported.`
+    );
     return;
   }
 
   if (token !== process.env.TIMES_TEAM) {
-    sendErrorResponse(callback, 401, `Invalid token.`)
+    sendErrorResponse(callback, 401, `Invalid token.`);
     return;
   }
 
   canteenHandler(callback, command, text);
 };
 
-
 const canteenHandler = (callback, command, text) => {
   // Valid parameters that can be passed via Slack
-  const recognisedParams = [
-    '',
-    ...common.menuTypes,
-    'ingredient',
-    'help',
-  ];
+  const recognisedParams = ['', ...common.menuTypes, 'ingredient', 'help'];
 
   // Now look at the first parameter the user supplied
-  const params =
-    text
-      .split('+')
-      .map(a => a.toLowerCase());
+  const params = text.split('+').map(a => a.toLowerCase());
   const firstParam = params[0];
 
   // If we don't recognise the parameter, return an error
   if (!recognisedParams.includes(firstParam)) {
-    sendErrorResponse(callback, `Sorry, I didn’t recognise the command "${firstParam}."`);
+    sendErrorResponse(
+      callback,
+      `Sorry, I didn’t recognise the command "${firstParam}."`
+    );
     return;
   }
 
@@ -82,7 +79,10 @@ const canteenHandler = (callback, command, text) => {
 
       // Check the user passed an ingredient to check
       if (!ingredient) {
-        sendErrorResponse(callback, 'You need to give me an ingredient to check!');
+        sendErrorResponse(
+          callback,
+          'You need to give me an ingredient to check!'
+        );
         return;
       }
 
@@ -91,10 +91,15 @@ const canteenHandler = (callback, command, text) => {
         .then(res => res.json())
         .then(body => {
           if (body.error) sendErrorResponse(callback, body.error);
-          else if (body.data) sendIngredientResponse(callback, ingredient, body.data);
-          else throw new Error('Response from core server did not contain error or data');
+          else if (body.data)
+            sendIngredientResponse(callback, ingredient, body.data);
+          else
+            throw new Error(
+              'Response from core server did not contain error or data'
+            );
         })
-        .catch(err => sendErrorResponse(callback, `Error querying core server: ${err}`));
+        .catch(err =>
+          sendErrorResponse(callback, `Error querying core server: ${err}`));
       break;
 
     // Otherwise it must be a menu request
@@ -107,25 +112,28 @@ const canteenHandler = (callback, command, text) => {
         .then(res => res.json())
         .then(body => {
           if (body.error) sendErrorResponse(callback, body.error);
-          else if (body.data) sendMenuResponse(callback, requestedMenu, body.data);
-          else throw new Error('Response from core server did not contain error or data');
+          else if (body.data)
+            sendMenuResponse(callback, requestedMenu, body.data);
+          else
+            throw new Error(
+              'Response from core server did not contain error or data'
+            );
         })
-        .catch(err => sendErrorResponse(callback, `Error querying core server: ${err}`));
+        .catch(err =>
+          sendErrorResponse(callback, `Error querying core server: ${err}`));
       break;
   }
 };
 
-
 // Helper function to return a JSON response to Slack
 const sendSlackResponse = (callback, text = '', attachments = []) => {
   const payload = {
     text,
-    attachments
+    attachments,
   };
 
   sendResponse(callback, payload);
-}
-
+};
 
 // Return an error to Slack
 const sendErrorResponse = (callback, text) => {
@@ -134,19 +142,17 @@ const sendErrorResponse = (callback, text) => {
       fallback: text,
       text,
       color: 'danger',
-    }
-  ])
-}
-
+    },
+  ]);
+};
 
 // Build and return a 'help' response to Slack
 const sendHelpResponse = (callback, recognisedParams) => {
   const helpText = '*Hungry? Type* `/canteen` *, optionally followed by one of these commands, to see what’s on offer:*';
   const paramsText = recognisedParams.reduce((str, p) => `${str}\n${p}`);
-
-  sendSlackResponse(callback, helpText + paramsText);
-}
 
+  sendSlackResponse(callback, helpText + paramsText);
+};
 
 // Build and return an 'ingredient' response to Slack
 const sendIngredientResponse = (callback, ingredient, daysWithIngredient) => {
@@ -155,42 +161,45 @@ const sendIngredientResponse = (callback, ingredient, daysWithIngredient) => {
   // If we didn't find the ingredient
   if (daysWithIngredient.length === 0) {
     responseText = `Sorry, I couldn’t find "${ingredient}" in the menu this week`;
-  }
-  // If we did find it
-  else {
-    const daysText = daysWithIngredient.reduce((str, d, i, arr) => {
-      if (i === 0) return d;
-      if (i === arr.length - 1) return `${str} and ${d}`;
-      return `${str}, ${d}`;
-    }, '');
+  } else {
+    // If we did find it
+    const daysText = daysWithIngredient.reduce(
+      (str, d, i, arr) => {
+        if (i === 0) return d;
+        if (i === arr.length - 1) return `${str} and ${d}`;
+        return `${str}, ${d}`;
+      },
+      ''
+    );
     responseText = `Looks like the canteen are serving ${ingredient} on ${daysText} this week`;
   }
 
   sendSlackResponse(callback, responseText);
-}
-
+};
 
 // Build and return a 'menu' response to Slack;
 const sendMenuResponse = (callback, requestedMenu, menuData) => {
-  const menuText = menuData.locations.reduce((str, loc) => {
-    return str + '*' + loc.location + '*\n' + loc.menu + '\n';
-  }, '');
+  const menuText = menuData.locations
+    .map(({ location, menu }) => `*${location}*\n${menu}`)
+    .join('\n\n');
   const menuUrl = menuData.url;
   const day = requestedMenu.charAt(0).toUpperCase() + requestedMenu.slice(1);
 
-  const attachments = [{
-    'fallback': day + '’s menu',
-    'color': 'good',
-    'title': day + '’s menu',
-    'title_link': menuUrl,
-    'fields': [
-      {
-        'value': menuText,
-        'short': false
-      }
-    ],
-    'mrkdwn_in': [ 'fields' ]
-  }];
+  const attachments = [
+    {
+      fallback: day + '’s menu',
+      color: 'good',
+      title: day + '’s menu',
+      title_link: menuUrl,
+      fields: [
+        {
+          value: menuText,
+          short: false,
+        },
+      ],
+      mrkdwn_in: ['fields'],
+    },
+  ];
 
   sendSlackResponse(callback, '', attachments);
-}
+};