Create additional scheduler to handle channel reminder

Explicitly running the reminder task every 5 hours instead of running it every minute and trying to handle the timing from within the task logic
chris-mcdonald-dev · Jun 5, 2021 · 4d4dff6 · 4d4dff6
1 parent 5adc510
commit 4d4dff6
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/src/scheduler.js b/src/scheduler.js
@@ -3,9 +3,23 @@ import tasks from './tasks';
 
 function runScheduler(client) {
     // Run every minutes
-    cron.schedule('* * * * *', () => {
-        tasks.map((task) => task(client))
-    });
+    if (tasks["minute"].length > 0) {
+        cron.schedule('* * * * *', () => {
+            tasks["minute"].map((task) => task(client))
+        });
+    }
+
+    if (tasks["hour"].length > 0) {
+        cron.schedule('0 */1 * * *', () => {
+            tasks["hour"].map((task) => task(client))
+        });
+    }
+
+    if (tasks["five-hour"].length > 0) {
+        cron.schedule('0 */5 * * *', () => {
+            tasks["five-hour"].map((task) => task(client))
+        });
+    }
 }
 
 export default runScheduler;
diff --git a/src/tasks/index.js b/src/tasks/index.js
@@ -1,3 +1,12 @@
 import studySessionTasks from './studySession';
 
-export default [...studySessionTasks];
+const notifySubscribers = studySessionTasks[0];
+const sendChannelReminder = studySessionTasks[1];
+
+const tasks = {
+    "minute": [],
+    "hour": [notifySubscribers],
+    "five-hour": [sendChannelReminder]
+};
+
+export default tasks;
diff --git a/src/tasks/studySession/channelReminder.js b/src/tasks/studySession/channelReminder.js
@@ -2,8 +2,6 @@ const { getUpcomingStudySessionsForScheduler } = require('../../scripts/activiti
 const { getUTCFullDate } = require("../../utils/date");
 
 const upcomingStudySessionMessageContent = "Here are the upcoming study sessions:\n*Make sure to check the time zones!*";
-const oneHour = 60 * 60 * 1000;
-const interval = oneHour * 5;
 
 export default function sendChannelReminder(client) {
     const studySessionChannel = client.channels.cache.get(process.env.STUDY_SESSION_CHANNEL);
@@ -28,21 +26,19 @@ export default function sendChannelReminder(client) {
 
         const mostRecentStudySessionMessage = studySessionMessages.first();
 
-        if (isMessageOlderThan5HoursAgo(mostRecentStudySessionMessage)) {
-            makeStudySessionMessage().then((studyMessage) => {
-                if (upcomingSessionsAreDifferent(mostRecentStudySessionMessage, studyMessage)) {
-                    mostRecentStudySessionMessage.delete().then(() => {
-                        studySessionChannel.send(studyMessage).catch((error) => {
-                            console.log(error);
-                        });
-                    }).catch((error) => {
+        makeStudySessionMessage().then((studyMessage) => {
+            if (upcomingSessionsAreDifferent(mostRecentStudySessionMessage, studyMessage)) {
+                mostRecentStudySessionMessage.delete().then(() => {
+                    studySessionChannel.send(studyMessage).catch((error) => {
                         console.log(error);
                     });
-                }
-            }).catch((error) => {
-                console.log(error);
-            });
-        }
+                }).catch((error) => {
+                    console.log(error);
+                });
+            }
+        }).catch((error) => {
+            console.log(error);
+        });
     }).catch(function (error) {
         console.log(error)
     });
@@ -58,10 +54,6 @@ function isStudySessionMessage(message) {
     return message.content === upcomingStudySessionMessageContent;
 }
 
-function isMessageOlderThan5HoursAgo(message) {
-    return (new Date() - message.createdAt) > interval;
-}
-
 function makeStudySessionMessage() {
     return getUpcomingStudySessionsForScheduler().then((upcomingStudySessions) => {
         if (upcomingStudySessions.length === 0) {

diff --git a/src/tasks/studySession/notifySubscribers.js b/src/tasks/studySession/notifySubscribers.js
@@ -6,7 +6,7 @@ const StudySession = mongoose.model("StudySession");
 export default function notifySubscribersTask(client) {
     const now = new Date();
     const limit = new Date().setHours(now.getHours() + 1);
-    StudySession.find({startDate: {$gt: now, $lt: limit}, notificationSent: false}, (error, studySessions) => {
+    StudySession.find({ startDate: { $gt: now, $lte: limit }, notificationSent: false }, (error, studySessions) => {
         if (error) console.error(error);
         if (studySessions.length === 0) return null;
         studySessions.map((studySession) => {