Merge pull request #3993 from Northeastern-Electric-Racing/dates-fix

dates fix

Author: chpy04

src/backend/package.json

@@ -22,6 +22,7 @@
     "concat-stream": "^2.0.0",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
+    "dayjs": "^1.11.19",
     "decimal.js": "^10.4.3",
     "dotenv": "^16.0.1",
     "express": "^5.0.0",

src/backend/src/prisma/seed.ts

@@ -31,7 +31,7 @@ import ProjectsService from '../services/projects.services.js';
 import { Decimal } from 'decimal.js';
 import BillOfMaterialsService from '../services/boms.services.js';
 import UsersService from '../services/users.services.js';
-import { transformDate } from '../utils/datetime.utils.js';
+import { toDateString } from 'shared';
 import { writeFileSync, readFileSync } from 'fs';
 import WbsElementTemplatesService from '../services/wbs-element-templates.services.js';
 import RecruitmentServices from '../services/recruitment.services.js';
@@ -1137,7 +1137,7 @@ const performSeed: () => Promise<void> = async () => {
     'Bodywork Concept of Design',
     changeRequestProject1Id,
     WorkPackageStage.Design,
-    weeksAgo(12).toISOString().split('T')[0],
+    toDateString(weeksAgo(12)),
     6,
     [],
     [],
@@ -1183,7 +1183,7 @@ const performSeed: () => Promise<void> = async () => {
     'Adhesive Shear Strength Test',
     changeRequestProject1Id,
     WorkPackageStage.Research,
-    weeksAgo(10).toISOString().split('T')[0],
+    toDateString(weeksAgo(10)),
     5,
     [],
     [],
@@ -1201,7 +1201,7 @@ const performSeed: () => Promise<void> = async () => {
     'Manufacture Wiring Harness',
     changeRequestProject5Id,
     WorkPackageStage.Manufacturing,
-    weeksAgo(9).toISOString().split('T')[0],
+    toDateString(weeksAgo(9)),
     4,
     [],
     [],
@@ -1234,7 +1234,7 @@ const performSeed: () => Promise<void> = async () => {
     'Install Wiring Harness',
     changeRequestProject5Id,
     WorkPackageStage.Install,
-    weeksAgo(5).toISOString().split('T')[0],
+    toDateString(weeksAgo(5)),
     6,
     [],
     [],
@@ -1267,7 +1267,7 @@ const performSeed: () => Promise<void> = async () => {
     'Design Plush',
     changeRequestProject6Id,
     WorkPackageStage.Design,
-    weeksAgo(16).toISOString().split('T')[0],
+    toDateString(weeksAgo(16)),
     7,
     [],
     [],
@@ -1300,7 +1300,7 @@ const performSeed: () => Promise<void> = async () => {
     'Put Plush Together',
     changeRequestProject6Id,
     WorkPackageStage.Manufacturing,
-    weeksAgo(9).toISOString().split('T')[0],
+    toDateString(weeksAgo(9)),
     5,
     [],
     [],
@@ -1333,7 +1333,7 @@ const performSeed: () => Promise<void> = async () => {
     'Plush Testing',
     changeRequestProject6Id,
     WorkPackageStage.Testing,
-    weeksAgo(4).toISOString().split('T')[0],
+    toDateString(weeksAgo(4)),
     4,
     [],
     [],
@@ -1367,7 +1367,7 @@ const performSeed: () => Promise<void> = async () => {
     'Design Laser Canon',
     changeRequestProject7Id,
     WorkPackageStage.Design,
-    weeksAgo(8).toISOString().split('T')[0],
+    toDateString(weeksAgo(8)),
     5,
     [],
     [],
@@ -1400,7 +1400,7 @@ const performSeed: () => Promise<void> = async () => {
     'Laser Canon Research',
     changeRequestProject7Id,
     WorkPackageStage.Research,
-    weeksAgo(3).toISOString().split('T')[0],
+    toDateString(weeksAgo(3)),
     6,
     [],
     [],
@@ -1418,7 +1418,7 @@ const performSeed: () => Promise<void> = async () => {
     'Laser Canon Testing',
     changeRequestProject7Id,
     WorkPackageStage.Testing,
-    weeksFromNow(3).toISOString().split('T')[0],
+    toDateString(weeksFromNow(3)),
     4,
     [project3WP1.wbsNum, project3WP2.wbsNum],
     [],
@@ -1437,7 +1437,7 @@ const performSeed: () => Promise<void> = async () => {
     'Stadium Research',
     changeRequestProject8Id,
     WorkPackageStage.Research,
-    weeksAgo(14).toISOString().split('T')[0],
+    toDateString(weeksAgo(14)),
     7,
     [],
     [],
@@ -1470,7 +1470,7 @@ const performSeed: () => Promise<void> = async () => {
     'Stadium Install',
     changeRequestProject8Id,
     WorkPackageStage.Install,
-    weeksAgo(7).toISOString().split('T')[0],
+    toDateString(weeksAgo(7)),
     6,
     [],
     [],
@@ -1488,7 +1488,7 @@ const performSeed: () => Promise<void> = async () => {
     'Stadium Testing',
     changeRequestProject8Id,
     WorkPackageStage.Testing,
-    weeksAgo(1).toISOString().split('T')[0],
+    toDateString(weeksAgo(1)),
     5,
     [],
     [],
@@ -2411,7 +2411,7 @@ const performSeed: () => Promise<void> = async () => {
       leadId: batman.userId,
       managerId: cyborg.userId,
       duration: 5,
-      startDate: transformDate(new Date()),
+      startDate: toDateString(new Date()),
       stage: WorkPackageStage.Design,
       blockedBy: [],
       descriptionBullets: [],
@@ -2425,7 +2425,7 @@ const performSeed: () => Promise<void> = async () => {
     'Slim and Light Car',
     newWorkPackageChangeRequest.crId,
     WorkPackageStage.Design,
-    weeksAgo(2).toISOString().split('T')[0],
+    toDateString(weeksAgo(2)),
     5,
     [],
     [],
@@ -2453,7 +2453,7 @@ const performSeed: () => Promise<void> = async () => {
       leadId: batman.userId,
       managerId: cyborg.userId,
       duration: 5,
-      startDate: transformDate(new Date()),
+      startDate: toDateString(new Date()),
       stage: WorkPackageStage.Design,
       blockedBy: [],
       descriptionBullets: [],

src/backend/src/routes/calendar.routes.ts

@@ -3,6 +3,7 @@ import { body, param } from 'express-validator';
 import {
   intMinZero,
   isDate,
+  isDateOnly,
   nonEmptyString,
   validateInputs,
   isEventStatus,
@@ -185,7 +186,7 @@ calendarRouter.post(
   body('availability').isArray(),
   body('availability.*.availability').isArray(),
   intMinZero(body('availability.*.availability.*')),
-  isDate(body('availability.*.dateSet')),
+  isDateOnly(body('availability.*.dateSet')),
   validateInputs,
   CalendarController.markUserConfirmed
 );

src/backend/src/routes/change-requests.routes.ts

@@ -4,6 +4,7 @@ import { ChangeRequestReason, ChangeRequestType } from 'shared';
 import ChangeRequestsController from '../controllers/change-requests.controllers.js';
 import {
   intMinZero,
+  isDateOnly,
   nonEmptyString,
   projectProposedChangesValidators,
   validateInputs,
@@ -38,7 +39,7 @@ changeRequestsRouter.post(
   intMinZero(body('wbsNum.projectNumber')),
   intMinZero(body('wbsNum.workPackageNumber')),
   body('type').custom((value) => value === ChangeRequestType.Activation),
-  body('startDate').custom((value) => !isNaN(Date.parse(value))),
+  isDateOnly(body('startDate')),
   nonEmptyString(body('leadId')),
   nonEmptyString(body('managerId')),
   body('confirmDetails').isBoolean(),

src/backend/src/routes/recruitment.routes.ts

@@ -1,5 +1,5 @@
 import express from 'express';
-import { isDate, nonEmptyString, validateInputs } from '../utils/validation.utils.js';
+import { isDateOnly, nonEmptyString, validateInputs } from '../utils/validation.utils.js';
 import { body } from 'express-validator';
 import RecruitmentController from '../controllers/recruitment.controllers.js';
 
@@ -12,7 +12,7 @@ recruitmentRouter.post(
   '/milestone/create',
   nonEmptyString(body('name')),
   nonEmptyString(body('description')),
-  isDate(body('dateOfEvent')),
+  isDateOnly(body('dateOfEvent')),
   validateInputs,
   RecruitmentController.createMilestone
 );
@@ -21,7 +21,7 @@ recruitmentRouter.post(
   '/milestone/:milestoneId/edit',
   nonEmptyString(body('name')),
   nonEmptyString(body('description')),
-  isDate(body('dateOfEvent')),
+  isDateOnly(body('dateOfEvent')),
   validateInputs,
   RecruitmentController.editMilestone
 );

src/backend/src/routes/reimbursement-requests.routes.ts

@@ -8,7 +8,7 @@ import { body } from 'express-validator';
 import {
   intMinZero,
   isDate,
-  isOptionalDate,
+  isOptionalDateOnly,
   nonEmptyString,
   validateInputs,
   validateReimbursementProducts
@@ -115,7 +115,7 @@ reimbursementRequestsRouter.post('/:vendorId/vendors/delete', ReimbursementReque
 
 reimbursementRequestsRouter.post(
   '/create',
-  isOptionalDate(body('dateOfExpense')),
+  isOptionalDateOnly(body('dateOfExpense')),
   nonEmptyString(body('vendorId')),
   nonEmptyString(body('indexCodeId')),
   nonEmptyString(body('accountCodeId')),
@@ -131,7 +131,7 @@ reimbursementRequestsRouter.get('/:requestId', ReimbursementRequestController.ge
 
 reimbursementRequestsRouter.post(
   '/:requestId/edit',
-  isOptionalDate(body('dateOfExpense')),
+  isOptionalDateOnly(body('dateOfExpense')),
   nonEmptyString(body('vendorId')),
   nonEmptyString(body('indexCodeId')),
   body('receiptPictures').isArray(),

src/backend/src/routes/tasks.routes.ts

@@ -1,7 +1,13 @@
 import express from 'express';
 import { body } from 'express-validator';
 import TasksController from '../controllers/tasks.controllers.js';
-import { nonEmptyString, isTaskPriority, isTaskStatus, validateInputs, isOptionalDate } from '../utils/validation.utils.js';
+import {
+  nonEmptyString,
+  isTaskPriority,
+  isTaskStatus,
+  validateInputs,
+  isOptionalDateOnly
+} from '../utils/validation.utils.js';
 import { isDate } from '../utils/validation.utils.js';
 
 const tasksRouter = express.Router();
@@ -21,8 +27,8 @@ tasksRouter.post(
 tasksRouter.post(
   '/:wbsNum',
   nonEmptyString(body('title')),
-  isOptionalDate(body('deadline')),
-  isOptionalDate(body('startDate')),
+  isOptionalDateOnly(body('deadline')),
+  isOptionalDateOnly(body('startDate')),
   body('notes').isString(),
   isTaskPriority(body('priority')),
   isTaskStatus(body('status')),
@@ -36,8 +42,8 @@ tasksRouter.post(
   '/:taskId/edit',
   nonEmptyString(body('title')),
   nonEmptyString(body('notes')),
-  isOptionalDate(body('deadline')),
-  isOptionalDate(body('startDate')),
+  isOptionalDateOnly(body('deadline')),
+  isOptionalDateOnly(body('startDate')),
   isTaskPriority(body('priority')),
   TasksController.editTask
 );

src/backend/src/routes/users.routes.ts

@@ -2,7 +2,7 @@ import { Theme } from '@prisma/client';
 import express from 'express';
 import { body } from 'express-validator';
 import UsersController from '../controllers/users.controllers.js';
-import { isRole, nonEmptyString, intMinZero, validateInputs, isDate } from '../utils/validation.utils.js';
+import { isRole, nonEmptyString, intMinZero, validateInputs, isDateOnly } from '../utils/validation.utils.js';
 
 const userRouter = express.Router();
 
@@ -50,7 +50,7 @@ userRouter.post(
   body('availability').isArray(),
   body('availability.*.availability').isArray(),
   intMinZero(body('availability.*.availability.*')),
-  isDate(body('availability.*.dateSet')),
+  isDateOnly(body('availability.*.dateSet')),
   validateInputs,
   UsersController.setUserScheduleSettings
 );

src/backend/src/routes/work-packages.routes.ts

@@ -5,7 +5,7 @@ import {
   blockedByValidators,
   descriptionBulletsValidators,
   intMinZero,
-  isDate,
+  isDateOnly,
   isWorkPackageStageOrNone,
   nonEmptyString,
   validateInputs
@@ -35,7 +35,7 @@ workPackagesRouter.post(
   nonEmptyString(body('crId').optional()),
   nonEmptyString(body('name')),
   isWorkPackageStageOrNone(body('stage')),
-  isDate(body('startDate')),
+  isDateOnly(body('startDate')),
   intMinZero(body('duration')),
   intMinZero(body('projectWbsNum.carNumber')),
   intMinZero(body('projectWbsNum.projectNumber')),
@@ -51,7 +51,7 @@ workPackagesRouter.post(
   nonEmptyString(body('workPackageId')),
   nonEmptyString(body('crId')),
   nonEmptyString(body('name')),
-  isDate(body('startDate')),
+  isDateOnly(body('startDate')),
   intMinZero(body('duration')),
   isWorkPackageStageOrNone(body('stage')),
   ...blockedByValidators,
@@ -65,7 +65,7 @@ workPackagesRouter.delete('/:wbsNum/delete', WorkPackagesController.deleteWorkPa
 workPackagesRouter.get('/:wbsNum/blocking', WorkPackagesController.getBlockingWorkPackages);
 workPackagesRouter.post(
   '/slack-upcoming-deadlines',
-  isDate(body('deadline')),
+  isDateOnly(body('deadline')),
   validateInputs,
   WorkPackagesController.slackMessageUpcomingDeadlines
 );

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

@@ -7,7 +7,7 @@ import {
   EventWithAttendees
 } from '../utils/notifications.utils.js';
 import { sendMessage } from '../integrations/slack.js';
-import { daysBetween, meetingStartTimePipeNumbers, startOfDay, wbsPipe } from 'shared';
+import { daysBetween, startOfDay, wbsPipe, formatTimeForSlack } from 'shared';
 import { buildDueString, sendThreadResponse } from '../utils/slack.utils.js';
 import WorkPackagesService from './work-packages.services.js';
 import { addWeeksToDate } from 'shared';
@@ -196,15 +196,15 @@ export default class NotificationsService {
           // Get work package names for this event
           const workPackageNames = event.workPackages.map((wp) => wp.wbsElement.name).join(', ');
 
-          // Extract meeting times from scheduled slots
-          const meetingTimes = event.scheduledTimes
-            .map((slot) => (slot.startTime ? new Date(slot.startTime).getHours() : null))
-            .filter((hour): hour is number => hour !== null)
-            .sort((a, b) => a - b);
+          // Get the earliest scheduled start time for display
+          const [earliestSlot] = event.scheduledTimes
+            .filter((slot) => slot.startTime)
+            .sort((a, b) => new Date(a.startTime!).getTime() - new Date(b.startTime!).getTime());
+          const timeDisplay = earliestSlot ? formatTimeForSlack(new Date(earliestSlot.startTime!)) : 'TBD';
 
           return (
             `${usersToSlackPings(event.attendees ?? [])} ${event.title} (${workPackageNames}) ` +
-            `will be having an event today at ${meetingStartTimePipeNumbers(meetingTimes)} EST! ` +
+            `will be having an event today at ${timeDisplay} ET! ` +
             zoomLink +
             questionDocLink
           );