Fix: generate nextrunat time

juzser · Apr 25, 2023 · ea754e1 · ea754e1
1 parent fe66cfd
commit ea754e1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 36 deletions.
diff --git a/app.json b/app.json
@@ -48,4 +48,4 @@
         }
     ],
     "implements": []
-}
+}
diff --git a/src/commands/remind/migrate.ts b/src/commands/remind/migrate.ts
@@ -2,9 +2,9 @@ import { IModify, IPersistence, IRead } from '@rocket.chat/apps-engine/definitio
 import { SlashCommandContext } from '@rocket.chat/apps-engine/definition/slashcommands';
 
 import { OeReminderApp as AppClass } from '../../../OeReminderApp';
-import { JobStatus } from '../../interfaces/IJob';
+import { JobStatus, JobType } from '../../interfaces/IJob';
 import { AppConfig } from '../../lib/config';
-import { getNextRunAt, notifyUser } from '../../lib/helpers';
+import { getNextRunAt, getWhenDateTime, notifyUser } from '../../lib/helpers';
 import { getReminders, setReminder } from '../../services/reminder';
 
 // Open modal to request time off
@@ -40,6 +40,9 @@ export async function MigrateCommand({ app, context, read, persis, modify }: {
         });
 
         if (nextRunAt) {
+            // Remove old job
+            await modify.getScheduler().cancelJob(job.jobId);
+
             const nextJobId = await modify.getScheduler().scheduleOnce({
                 id: AppConfig.jobKey,
                 when: nextRunAt.toISOString(),

diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
@@ -324,24 +324,22 @@ export function getNextRunAt({ type, whenDate, whenTime, offset }: {
 }): Date {
     // Calculate the next run base on the last run
     // But the time should be correct as whenDate & whenTime
-    const nextRunAt = getWhenDateTime({ whenDate, whenTime, offset });
+    let nextRunAt = getWhenDateTime({ whenDate, whenTime, offset });
     const currentDate = new Date();
 
-    nextRunAt.setMonth(currentDate.getMonth());
-    nextRunAt.setFullYear(currentDate.getFullYear());
+    const currentTimestamp = currentDate.getTime() + 60 * 1000; // Add 1 minutes to process
 
-    const currentHoursMinutes = currentDate.getHours() * 60 + currentDate.getMinutes() + 1;
-    const originHoursMinutes = nextRunAt.getHours() * 60 + nextRunAt.getMinutes();
+    nextRunAt.setFullYear(currentDate.getFullYear());
+    nextRunAt.setMonth(currentDate.getMonth());
 
     // Get next run base on the current time
     if (type === JobType.DAILY || type === JobType.WEEKDAYS) {
-        // Compare hours & minutes with original hours & minutes
-        // If current hh:mm greater than original, then next run is tomorrow
-        // Otherwise, next run is today
-        nextRunAt.setDate(currentHoursMinutes > originHoursMinutes
-            ? currentDate.getDate() + 1
-            : currentDate.getDate()
-        );
+        nextRunAt.setDate(currentDate.getDate());
+
+        // If the time is passed, then wait until next day
+        if (currentTimestamp > nextRunAt.getTime()) {
+            nextRunAt.setDate(currentDate.getDate() + 1);
+        }
 
         if (type === JobType.WEEKDAYS) {
             // Skip weekend
@@ -354,41 +352,33 @@ export function getNextRunAt({ type, whenDate, whenTime, offset }: {
     }
 
     if (type === JobType.WEEKLY) {
-        // Compare day minutes with origin day minutes in week
-        // If current is greater than origin, then next run is the origin day of next week
-        // Otherwise, next run is the origin day of this week
-        const current = currentDate.getDay() * 24 * 60 + currentHoursMinutes;
-        const origin = nextRunAt.getDay() * 24 * 60 + originHoursMinutes;
-
         const weekDay = currentDate.getDate() - currentDate.getDay() + nextRunAt.getDay();
 
-        nextRunAt.setDate(current > origin ? weekDay + 7 : weekDay);
+        nextRunAt.setDate(weekDay);
+
+        // If the time is passed, then wait until next week
+        if (currentTimestamp > nextRunAt.getTime()) {
+            nextRunAt.setDate(weekDay + 7);
+        }
 
         return nextRunAt;
     }
 
     if (type === JobType.BIWEEKLY) {
-        // Compare day minutes with origin day minutes in 2 weeks
-        // If current is greater than origin, then next run is the origin day of next 2 weeks
-        // Otherwise, next run is the origin day of this week
-        const current = currentDate.getDay() * 24 * 60 + currentHoursMinutes;
-        const origin = nextRunAt.getDay() * 24 * 60 + originHoursMinutes;
-
         const weekDay = currentDate.getDate() - currentDate.getDay() + nextRunAt.getDay();
 
-        nextRunAt.setDate(current > origin ? weekDay + 14 : weekDay);
+        nextRunAt.setDate(weekDay);
+
+        // If the time is passed, then wait until next 2 weeks
+        if (currentTimestamp > nextRunAt.getTime()) {
+            nextRunAt.setDate(weekDay + 14);
+        }
 
         return nextRunAt;
     }
 
     if (type === JobType.MONTHLY) {
-        // Compare date minutes with origin date minutes in month
-        // If current is greater than origin, then next run is the origin date of next month
-        // Otherwise, next run is the origin date of this month
-        const current = currentDate.getDate() * 24 * 60 + currentHoursMinutes;
-        const origin = nextRunAt.getDate() * 24 * 60 + originHoursMinutes;
-
-        if (current > origin) {
+        if (currentTimestamp > nextRunAt.getTime()) {
             nextRunAt.setMonth(currentDate.getMonth() + 1);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,4 +48,4 @@ @@
             }
         ],
         "implements": []
-    }
+    }