fix: check if lunch date is this week

closes #2
sparkbox · Mar 24, 2016 · b4180c2 · b4180c2
1 parent a2e203c
commit b4180c2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/src/generalAnnouncement.js b/src/generalAnnouncement.js
@@ -18,16 +18,21 @@ const getData = () => {
 const parseData = (data) => {
   const dates = getDateColumn(data);
   const next = getNextLunch(dates);
-  const names = parseNames(data, next);
-  const slackNames = returnSlackNames(names, namesObj);
-  const formattedNames = formatSlackNames(slackNames).toString();
-  const msg = `
-    <@dayton> ${formattedNames} are scheduled to help with lunch on Friday.
-    
-    ${process.env.sheetUrl}
-  `;
-
-  postToSlack('#general', msg);
+  const today = new Date();
+  //1000 * 3600 * 24 is milliseconds in 1 day
+  const dayInMilliseconds = 1000 * 3600 * 24;
+  if ((next - today) / (dayInMilliseconds) < 7) {
+    const names = parseNames(data, next);
+    const slackNames = returnSlackNames(names, namesObj);
+    const formattedNames = formatSlackNames(slackNames).toString();
+    const msg = `
+      <@dayton> ${formattedNames} are scheduled to help with lunch on Friday.
+
+      ${process.env.sheetUrl}
+    `;
+
+    postToSlack('#general', msg);
+  }
 };
 
 const formatSlackNames = (names) => {

diff --git a/src/privateReminder.js b/src/privateReminder.js
@@ -18,17 +18,22 @@ const getData = () => {
 const parseData = (data) => {
   const dates = getDateColumn(data);
   const next = getNextLunch(dates);
-  const names = parseNames(data, next);
-  const slackNames = returnSlackNames(names, namesObj);
-  const msg = `
-    You are scheduled to help with lunch on Friday with ${names}.\n If you are unable to do so please find a replacement and update the spreadsheet.
-    
-    ${process.env.sheetUrl}
-  `;
+  const today = new Date();
+  //1000 * 3600 * 24 is milliseconds in 1 day
+  const dayInMilliseconds = 1000 * 3600 * 24;
+  if ((next - today) / (dayInMilliseconds) < 7) {
+    const names = parseNames(data, next);
+    const slackNames = returnSlackNames(names, namesObj);
+    const msg = `
+      You are scheduled to help with lunch on Friday with ${names}.\n If you are unable to do so please find a replacement and update the spreadsheet.
 
-  slackNames.forEach((helper) => {
-    postToSlack(`@${helper}`, msg);
-  });
+      ${process.env.sheetUrl}
+    `;
+
+    slackNames.forEach((helper) => {
+      postToSlack(`@${helper}`, msg);
+    });
+  }
 };
 
 const date = new Date();