Merge pull request #279 from UofA-Blueprint/fix/mst-to-utc

fix
UofA-Blueprint · Dec 23, 2023 · eb99cc5 · eb99cc5
2 parents 8e6f41e + a018208
commit eb99cc5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/backend/src/controllers/cron/email.ts b/backend/src/controllers/cron/email.ts
@@ -31,7 +31,12 @@ export const getEmail = async (req: Request, res: Response) => {
         })
 
         const utcExpr = cron?.expression.split(" ")
-        const days = utcExpr[utcExpr.length-1].split(",")
+        let days = utcExpr[utcExpr.length-1]
+        if (days.length > 3) {
+            days = days.split(",")
+        } else {
+            days = [days]
+        }
         const minutes = parseInt(utcExpr[1])
         const hours = parseInt(utcExpr[2])
 
@@ -42,6 +47,11 @@ export const getEmail = async (req: Request, res: Response) => {
         }
         const tuple = convertToMT(minutes, hours, "MON")
         let cronExpression = `0 ${tuple[0]} ${tuple[1]} * * `
+        if (setDays.length > 1) {
+            cronExpression += setDays.join(",")
+        } else {
+            cronExpression += setDays[0]
+        }
         return res.status(200).json({ cron : {
             ...cron,
             expression: cronExpression

diff --git a/backend/src/services/cron/email.ts b/backend/src/services/cron/email.ts
@@ -61,7 +61,7 @@ export const convertToMT = (minute: number, hour: number, day: string) : [number
     }
 
     const newHour = (hour+increment+24)%24
-    if (newHour < hour) day = days[day]
+    if (newHour > hour) day = days[day]
 
     return [minute, newHour, day]
 }