off by 1 task and event times fix

Author: chpy04

src/backend/src/services/notifications.services.ts

@@ -3,11 +3,13 @@ import {
   TaskWithAssignees,
   endOfDayTomorrow,
   startOfDayTomorrow,
+  startOfTodayEST,
+  startOfTomorrowEST,
   usersToSlackPings,
   EventWithAttendees
 } from '../utils/notifications.utils.js';
 import { sendMessage } from '../integrations/slack.js';
-import { daysBetween, startOfDay, wbsPipe, formatTimeForSlack } from 'shared';
+import { daysBetween, wbsPipe, formatTimeForSlack } from 'shared';
 import { buildDueString, sendThreadResponse } from '../utils/slack.utils.js';
 import WorkPackagesService from './work-packages.services.js';
 import { addWeeksToDate } from 'shared';
@@ -30,7 +32,7 @@ export default class NotificationsService {
   static async sendTaskDeadlineSlackNotifications() {
     const endOfDay = endOfDayTomorrow();
 
-    if (endOfDay.getDay() === 0 || endOfDay.getDay() === 2 || endOfDay.getDay() === 4) return;
+    if (endOfDay.getUTCDay() === 0 || endOfDay.getUTCDay() === 2 || endOfDay.getUTCDay() === 4) return;
 
     const tasks = await prisma.task.findMany({
       where: {
@@ -81,7 +83,8 @@ export default class NotificationsService {
       const messageBlock = tasks
         .map((task) => {
           // prisma call earlier allows the forced unwrap (deadline is guaranteed to be a non-null value)
-          const daysUntilDeadline = daysBetween(task.deadline!, new Date());
+          const todayMidnightUTC = new Date(new Date().setUTCHours(0, 0, 0, 0));
+          const daysUntilDeadline = daysBetween(task.deadline!, todayMidnightUTC);
 
           return `${usersToSlackPings(task.assignees ?? [])} <https://finishlinebyner.com/projects/${wbsPipe(
             task.wbsElement
@@ -121,8 +124,8 @@ export default class NotificationsService {
    * Sends Slack notifications for all events scheduled for today whose event type has sendSlackNotifications enabled
    */
   static async sendEventSlackNotifications() {
-    const endOfToday = startOfDayTomorrow();
-    const startOfToday = startOfDay(new Date());
+    const endOfToday = startOfTomorrowEST();
+    const startOfToday = startOfTodayEST();
 
     const events = await prisma.event.findMany({
       where: {
@@ -231,7 +234,7 @@ export default class NotificationsService {
    * Sends the sponsor task slack notifications for all tasks with a notify date of today
    */
   static async sendSponsorTaskNotifications() {
-    const startOfToday = startOfDay(new Date());
+    const startOfToday = new Date(new Date().setUTCHours(0, 0, 0, 0));
     const endOfToday = startOfDayTomorrow();
 
     const sponsorTasks = await prisma.sponsor_Task.findMany({

src/backend/src/utils/notifications.utils.ts

@@ -31,7 +31,10 @@ export const userToSlackPing = (user: UserWithSettings) => {
  * @returns the beginning of the day tomorrow (at 12am)
  */
 export const startOfDayTomorrow = () => {
-  return new Date(new Date().setHours(24, 0, 0, 0));
+  const tomorrow = new Date();
+  tomorrow.setUTCDate(tomorrow.getUTCDate() + 1);
+  tomorrow.setUTCHours(0, 0, 0, 0);
+  return tomorrow;
 };
 
 /**
@@ -41,6 +44,36 @@ export const startOfDayTomorrow = () => {
 export const endOfDayTomorrow = () => {
   const startOfDay = startOfDayTomorrow();
   const endOfDay = new Date(startOfDay);
-  endOfDay.setDate(startOfDay.getDate() + 1);
+  endOfDay.setUTCDate(startOfDay.getUTCDate() + 1);
   return endOfDay;
 };
+
+const EST_OFFSET_MS = 5 * 60 * 60 * 1000;
+
+/**
+ * Given a UTC Date, returns the start of that calendar day in EST (UTC-5), expressed as a UTC Date.
+ * EST is always treated as UTC-5 (no DST adjustment).
+ * @returns midnight EST of the given date as a UTC Date
+ */
+export const startOfDateEST = (date: Date): Date => {
+  const dateInEST = new Date(date.getTime() - EST_OFFSET_MS);
+  return new Date(Date.UTC(dateInEST.getUTCFullYear(), dateInEST.getUTCMonth(), dateInEST.getUTCDate(), 5, 0, 0, 0));
+};
+
+/**
+ * Gets the start of today in EST (UTC-5), expressed as a UTC Date.
+ * EST is always treated as UTC-5 (no DST adjustment).
+ * @returns midnight EST today as a UTC Date
+ */
+export const startOfTodayEST = (): Date => startOfDateEST(new Date());
+
+/**
+ * Gets the start of tomorrow in EST (UTC-5), expressed as a UTC Date.
+ * EST is always treated as UTC-5 (no DST adjustment).
+ * @returns midnight EST tomorrow as a UTC Date
+ */
+export const startOfTomorrowEST = (): Date => {
+  const start = startOfTodayEST();
+  start.setUTCDate(start.getUTCDate() + 1);
+  return start;
+};