Merge branch 'develop' into 3604-maintenence---tracking-spending-on-project-overview

Author: chpy04

package.json

@@ -66,7 +66,9 @@
     "@types/react-dom": "17.0.1"
   },
   "dependencies": {
+    "@microsoft/clarity": "^1.0.0",
     "@types/multer": "^1.4.12",
+    "canvas-confetti": "^1.9.3",
     "mitt": "^3.0.1",
     "react-hook-form-persist": "^3.0.0",
     "recharts": "^2.15.3",
@@ -77,6 +79,7 @@
     "@babel/plugin-transform-object-assign": "^7.18.6",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
+    "@types/canvas-confetti": "^1.9.0",
     "@types/jest": "^29.5.14",
     "@types/node": "20.0.0",
     "@typescript-eslint/eslint-plugin": "8.20.0",

src/backend/src/controllers/organizations.controllers.ts

@@ -217,4 +217,27 @@ export default class OrganizationsController {
       next(error);
     }
   }
+
+  static async getFinanceDelegates(req: Request, res: Response, next: NextFunction) {
+    try {
+      const financeDelegates = await OrganizationsService.getFinanceDelegates(req.organization.organizationId);
+      res.status(200).json(financeDelegates);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async setFinanceDelegates(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { userIds } = req.body;
+      const updatedDelegates = await OrganizationsService.setFinanceDelegates(
+        req.currentUser,
+        req.organization.organizationId,
+        userIds
+      );
+      res.status(200).json(updatedDelegates);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -23,6 +23,18 @@ export default class ReimbursementRequestsController {
     }
   }
 
+  static async getCurrentUserAssignedReimbursementRequests(req: Request, res: Response, next: NextFunction) {
+    try {
+      const assignedReimbursementRequests = await ReimbursementRequestService.getUserAssignedReimbursementRequests(
+        req.currentUser,
+        req.organization
+      );
+      res.status(200).json(assignedReimbursementRequests);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getCurrentUserReimbursements(req: Request, res: Response, next: NextFunction) {
     try {
       const userReimbursements = await ReimbursementRequestService.getUserReimbursements(req.currentUser, req.organization);
@@ -140,6 +152,23 @@ export default class ReimbursementRequestsController {
     }
   }
 
+  static async assignFinanceMember(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { requestId } = req.params;
+      const { assigneeId } = req.body;
+
+      const updatedReimbursementRequest = await ReimbursementRequestService.assignFinanceMember(
+        req.currentUser,
+        req.organization,
+        requestId,
+        assigneeId
+      );
+      res.status(200).json(updatedReimbursementRequest);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async editReimbursement(req: Request, res: Response, next: NextFunction) {
     try {
       const { reimbursementId } = req.params;
@@ -217,8 +246,8 @@ export default class ReimbursementRequestsController {
         req.currentUser,
         name,
         req.organization,
-        taxExempt,
-        twoFactorContacts,
+        taxExempt ?? false,
+        twoFactorContacts ?? [],
         notes,
         username,
         password,
@@ -300,11 +329,26 @@ export default class ReimbursementRequestsController {
     }
   }
 
-  static async approveReimbursementRequest(req: Request, res: Response, next: NextFunction) {
+  static async inputReimbursementRequestInSabo(req: Request, res: Response, next: NextFunction) {
     try {
       const { requestId } = req.params;
 
-      const reimbursementStatus = await ReimbursementRequestService.approveReimbursementRequest(
+      const reimbursementStatus = await ReimbursementRequestService.inputReimbursementRequestInSabo(
+        requestId,
+        req.currentUser,
+        req.organization
+      );
+      res.status(200).json(reimbursementStatus);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async markReimbursementRequestAsSaboSubmitted(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { requestId } = req.params;
+
+      const reimbursementStatus = await ReimbursementRequestService.markReimbursementRequestAsSaboSubmitted(
         requestId,
         req.currentUser,
         req.organization
@@ -525,6 +569,23 @@ export default class ReimbursementRequestsController {
     }
   }
 
+  static async editIndexCode(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { name, code } = req.body;
+      const { indexCodeId } = req.params;
+      const updatedIndexCode = await ReimbursementRequestService.editIndexCode(
+        req.currentUser,
+        req.organization,
+        indexCodeId,
+        name,
+        code
+      );
+      res.status(200).json(updatedIndexCode);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async deleteIndexCode(req: Request, res: Response, next: NextFunction) {
     try {
       const { indexCodeId } = req.params;

src/backend/src/controllers/tasks.controllers.ts

@@ -5,7 +5,7 @@ import { validateWBS, WbsNumber } from 'shared';
 export default class TasksController {
   static async createTask(req: Request, res: Response, next: NextFunction) {
     try {
-      const { title, deadline, priority, status, assignees, notes } = req.body;
+      const { title, deadline, startDate, priority, status, assignees, notes } = req.body;
       const wbsNum: WbsNumber = validateWBS(req.params.wbsNum);
 
       const task = await TasksService.createTask(
@@ -17,6 +17,7 @@ export default class TasksController {
         status,
         assignees,
         req.organization,
+        startDate ? new Date(startDate) : undefined,
         deadline ? new Date(deadline) : undefined
       );
 
@@ -28,7 +29,7 @@ export default class TasksController {
 
   static async editTask(req: Request, res: Response, next: NextFunction) {
     try {
-      const { title, notes, priority, deadline } = req.body;
+      const { title, notes, priority, deadline, startDate } = req.body;
       const { taskId } = req.params;
 
       const updateTask = await TasksService.editTask(
@@ -38,7 +39,8 @@ export default class TasksController {
         title,
         notes,
         priority,
-        deadline
+        startDate ? new Date(startDate) : undefined,
+        deadline ? new Date(deadline) : undefined
       );
 
       res.status(200).json(updateTask);

src/backend/src/prisma-query-args/reimbursement-requests.query-args.ts

@@ -31,6 +31,7 @@ export const getReimbursementRequestQueryArgs = (organizationId: string) =>
           dateDeleted: null
         },
         ...getReimbursementRequestCommentQueryArgs(organizationId)
-      }
+      },
+      assignee: getUserQueryArgs(organizationId)
     }
   });

src/backend/src/prisma/migrations/20251011223007_finance_delegates/migration.sql

@@ -0,0 +1,19 @@
+-- AlterEnum
+ALTER TYPE "public"."Reimbursement_Status_Type" ADD VALUE 'PENDING_SABO_SUBMISSION';
+
+-- CreateTable
+CREATE TABLE "public"."_financeDelegates" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL,
+
+    CONSTRAINT "_financeDelegates_AB_pkey" PRIMARY KEY ("A","B")
+);
+
+-- CreateIndex
+CREATE INDEX "_financeDelegates_B_index" ON "public"."_financeDelegates"("B");
+
+-- AddForeignKey
+ALTER TABLE "public"."_financeDelegates" ADD CONSTRAINT "_financeDelegates_A_fkey" FOREIGN KEY ("A") REFERENCES "public"."Organization"("organizationId") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."_financeDelegates" ADD CONSTRAINT "_financeDelegates_B_fkey" FOREIGN KEY ("B") REFERENCES "public"."User"("userId") ON DELETE CASCADE ON UPDATE CASCADE;

src/backend/src/prisma/migrations/20251018025621_task_start_dates/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."Task" ADD COLUMN     "startDate" TIMESTAMP(3);

src/backend/src/prisma/migrations/20251018122516_reimbursement_request_assignees/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Reimbursement_Request" ADD COLUMN     "assigneeId" TEXT;
+
+-- AddForeignKey
+ALTER TABLE "Reimbursement_Request" ADD CONSTRAINT "Reimbursement_Request_assigneeId_fkey" FOREIGN KEY ("assigneeId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
 # It should be added in your version-control system (e.g., Git)
-provider = "postgresql"
+provider = "postgresql"

src/backend/src/prisma/schema.prisma

@@ -78,6 +78,7 @@ enum Reimbursement_Status_Type {
   PENDING_LEADERSHIP_APPROVAL
   LEADERSHIP_APPROVED
   PENDING_FINANCE
+  PENDING_SABO_SUBMISSION
   SABO_SUBMITTED
   ADVISOR_APPROVED
   REIMBURSED
@@ -258,6 +259,8 @@ model User {
   reimbursementRequestComments            Reimbursement_Request_Comment[]      @relation(name: "createdReimbursementRequestComments")
   deletedReimbursementRequestComments     Reimbursement_Request_Comment[]      @relation(name: "deletedReimbursementRequestComments")
   deletedSponsorTiers                     Sponsor_Tier[]
+  financeDelegateForOrganizations         Organization[]                       @relation(name: "financeDelegates")
+  assignedReimbursementRequests           Reimbursement_Request[]              @relation(name: "reimbursementRequestAssignee")
 }
 
 model Role {
@@ -630,6 +633,7 @@ model Task {
   title           String
   notes           String
   deadline        DateTime?
+  startDate       DateTime?
   assignees       User[]        @relation(name: "assignedTo")
   priority        Task_Priority
   status          Task_Status
@@ -698,6 +702,8 @@ model Reimbursement_Request {
   notificationSlackThreads Message_Info[]
   materials                Material[]
   reimbursementComments    Reimbursement_Request_Comment[]
+  assigneeId               String?
+  assignee                 User?                           @relation(name: "reimbursementRequestAssignee", fields: [assigneeId], references: [userId])
 
   @@unique([identifier, organizationId], name: "uniqueReimbursementRequest")
   @@index([organizationId])
@@ -1205,6 +1211,7 @@ model Organization {
   sponsors                 Sponsor[]
   sponsorTiers             Sponsor_Tier[]
   indexCodes               Index_Code[]
+  financeDelegates         User[]                       @relation(name: "financeDelegates")
 }
 
 model FrequentlyAskedQuestion {