Merge branch 'develop' into #4032-maintenance-calendar-notifications

Author: cielbellerose

.gitignore

@@ -70,4 +70,5 @@ eb-deploy/
 
 # Claude Code Files
 CLAUDE.md
-.playwright-mcp/
+.playwright-mcp/
+docs/

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

@@ -140,6 +140,25 @@ export default class ChangeRequestsController {
     }
   }
 
+  static async createLeadershipChangeRequest(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { wbsNum, leadId, managerId } = req.body;
+
+      const cr = await ChangeRequestsService.createLeadershipChangeRequest(
+        req.currentUser,
+        wbsNum.carNumber,
+        wbsNum.projectNumber,
+        wbsNum.workPackageNumber,
+        leadId,
+        managerId,
+        req.organization
+      );
+      res.status(200).json(cr);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createStandardChangeRequest(req: Request, res: Response, next: NextFunction) {
     try {
       const { wbsNum, type, what, why, proposedSolutions, projectProposedChanges, workPackageProposedChanges } = req.body;

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

@@ -22,28 +22,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async setImages(req: Request, res: Response, next: NextFunction) {
-    try {
-      const { applyInterestImage = [], exploreAsGuestImage = [] } = req.files as {
-        applyInterestImage?: Express.Multer.File[];
-        exploreAsGuestImage?: Express.Multer.File[];
-      };
-
-      const applyInterestFile = applyInterestImage[0] || null;
-      const exploreAsGuestFile = exploreAsGuestImage[0] || null;
-
-      const newImages = await OrganizationsService.setImages(
-        applyInterestFile,
-        exploreAsGuestFile,
-        req.currentUser,
-        req.organization
-      );
-
-      res.status(200).json(newImages);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
   static async getAllUsefulLinks(req: Request, res: Response, next: NextFunction) {
     try {
       const links = await OrganizationsService.getAllUsefulLinks(req.organization.organizationId);
@@ -97,15 +75,6 @@ export default class OrganizationsController {
     }
   }
 
-  static async getOrganizationImages(req: Request, res: Response, next: NextFunction) {
-    try {
-      const images = await OrganizationsService.getOrganizationImages(req.organization.organizationId);
-      res.status(200).json(images);
-    } catch (error: unknown) {
-      next(error);
-    }
-  }
-
   static async setOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const { projectIds } = req.body;
@@ -142,6 +111,20 @@ export default class OrganizationsController {
     }
   }
 
+  static async setPlatformLogoImage(req: Request, res: Response, next: NextFunction) {
+    try {
+      if (!req.file) {
+        throw new HttpException(400, 'Invalid or undefined image data');
+      }
+
+      const updatedOrg = await OrganizationsService.setPlatformLogoImage(req.file, req.currentUser, req.organization);
+
+      res.status(200).json(updatedOrg);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async setNewMemberImage(req: Request, res: Response, next: NextFunction) {
     try {
       if (!req.file) {
@@ -181,6 +164,20 @@ export default class OrganizationsController {
     }
   }
 
+  static async setPlatformDescription(req: Request, res: Response, next: NextFunction) {
+    try {
+      const updatedOrg = await OrganizationsService.setPlatformDescription(
+        req.body.platformDescription,
+        req.currentUser,
+        req.organization
+      );
+
+      res.status(200).json(updatedOrg);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async getOrganizationFeaturedProjects(req: Request, res: Response, next: NextFunction) {
     try {
       const featuredProjects = await OrganizationsService.getOrganizationFeaturedProjects(req.organization.organizationId);

src/backend/src/controllers/projects.controllers.ts

@@ -166,9 +166,16 @@ export default class ProjectsController {
 
   static async createLinkType(req: Request, res: Response, next: NextFunction) {
     try {
-      const { name, iconName, required } = req.body;
+      const { name, iconName, required, isOnGuestHomePage } = req.body;
 
-      const newLinkType = await ProjectsService.createLinkType(req.currentUser, name, iconName, required, req.organization);
+      const newLinkType = await ProjectsService.createLinkType(
+        req.currentUser,
+        name,
+        iconName,
+        required,
+        req.organization,
+        isOnGuestHomePage
+      );
       res.status(200).json(newLinkType);
     } catch (error: unknown) {
       next(error);
@@ -207,8 +214,7 @@ export default class ProjectsController {
         price,
         subtotal,
         linkUrl,
-        notes,
-        reimbursementRequestId
+        notes
       } = req.body;
       const wbsNum = validateWBS(req.params.wbsNum as string);
       const material = await BillOfMaterialsService.createMaterial(
@@ -227,8 +233,7 @@ export default class ProjectsController {
         notes,
         assemblyId,
         pdmFileName,
-        unitName,
-        reimbursementRequestId
+        unitName
       );
       res.status(200).json(material);
     } catch (error: unknown) {
@@ -386,8 +391,7 @@ export default class ProjectsController {
         price,
         subtotal,
         linkUrl,
-        notes,
-        reimbursementRequestId
+        notes
       } = req.body;
       const updatedMaterial = await BillOfMaterialsService.editMaterial(
         req.currentUser,
@@ -405,8 +409,7 @@ export default class ProjectsController {
         notes,
         unitName,
         assemblyId,
-        pdmFileName,
-        reimbursementRequestId
+        pdmFileName
       );
       res.status(200).json(updatedMaterial);
     } catch (error: unknown) {
@@ -453,13 +456,14 @@ export default class ProjectsController {
   static async editLinkType(req: Request, res: Response, next: NextFunction) {
     try {
       const { linkTypeName } = req.params as Record<string, string>;
-      const { name: newName, iconName, required } = req.body;
+      const { name: newName, iconName, required, isOnGuestHomePage } = req.body;
       const linkTypeUpdated = await ProjectsService.editLinkType(
         linkTypeName,
         iconName,
         required,
         req.currentUser,
         req.organization,
+        isOnGuestHomePage,
         newName
       );
       res.status(200).json(linkTypeUpdated);

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

@@ -83,7 +83,8 @@ export default class ReimbursementRequestsController {
         otherReimbursementProducts,
         wbsReimbursementProducts,
         accountCodeId,
-        totalCost
+        totalCost,
+        description
       } = req.body;
       const user = await getCurrentUserWithUserSettings(res);
 
@@ -96,7 +97,8 @@ export default class ReimbursementRequestsController {
         accountCodeId,
         totalCost,
         req.organization,
-        dateOfExpense
+        dateOfExpense,
+        description
       );
       res.status(200).json(createdReimbursementRequest);
     } catch (error: unknown) {
@@ -130,7 +132,8 @@ export default class ReimbursementRequestsController {
         totalCost,
         otherReimbursementProducts,
         wbsReimbursementProducts,
-        receiptPictures
+        receiptPictures,
+        description
       } = req.body;
 
       const updatedReimbursementRequestId = await ReimbursementRequestService.editReimbursementRequest(
@@ -144,7 +147,8 @@ export default class ReimbursementRequestsController {
         receiptPictures,
         req.currentUser,
         req.organization,
-        dateOfExpense
+        dateOfExpense,
+        description
       );
       res.status(200).json(updatedReimbursementRequestId);
     } catch (error: unknown) {

src/backend/src/prisma-query-args/bom.query-args.ts

@@ -1,6 +1,5 @@
 import { Prisma } from '@prisma/client';
 import { getUserQueryArgs } from './user.query-args.js';
-import { getReimbursementRequestQueryArgs } from './reimbursement-requests.query-args.js';
 
 export type AssemblyQueryArgs = ReturnType<typeof getAssemblyQueryArgs>;
 
@@ -25,20 +24,42 @@ export const getMaterialQueryArgs = (organizationId: string) =>
       materialType: true,
       unit: true,
       manufacturer: true,
-      reimbursementProducts: false,
-      reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+      reimbursementProducts: {
+        where: { dateDeleted: null },
+        select: {
+          dateDeleted: true,
+          reimbursementRequest: {
+            select: {
+              reimbursementRequestId: true,
+              identifier: true,
+              dateDeleted: true
+            }
+          }
+        }
+      }
     }
   });
 
 export type MaterialPreviewQueryArgs = ReturnType<typeof getMaterialPreviewQueryArgs>;
 
-export const getMaterialPreviewQueryArgs = (organizationId: string) =>
+export const getMaterialPreviewQueryArgs = (_organizationId: string) =>
   Prisma.validator<Prisma.MaterialDefaultArgs>()({
     include: {
       unit: true,
       manufacturer: true,
       materialType: true,
-      reimbursementProducts: false,
-      reimbursementRequest: getReimbursementRequestQueryArgs(organizationId)
+      reimbursementProducts: {
+        where: { dateDeleted: null },
+        select: {
+          dateDeleted: true,
+          reimbursementRequest: {
+            select: {
+              reimbursementRequestId: true,
+              identifier: true,
+              dateDeleted: true
+            }
+          }
+        }
+      }
     }
   });

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

@@ -39,7 +39,10 @@ export const getChangeRequestQueryArgs = (organizationId: string) =>
       },
       budgetChangeRequest: true,
       deletedBy: getUserQueryArgs(organizationId),
-      requestedReviewers: getUserQueryArgs(organizationId)
+      requestedReviewers: getUserQueryArgs(organizationId),
+      leadershipChangeRequest: {
+        include: { lead: getUserQueryArgs(organizationId), manager: getUserQueryArgs(organizationId) }
+      }
     }
   });
 
@@ -58,7 +61,10 @@ export const getManyChangeRequestQueryArgs = (organizationId: string) =>
       },
       budgetChangeRequest: true,
       deletedBy: getUserQueryArgs(organizationId),
-      requestedReviewers: getUserQueryArgs(organizationId)
+      requestedReviewers: getUserQueryArgs(organizationId),
+      leadershipChangeRequest: {
+        include: { lead: getUserQueryArgs(organizationId), manager: getUserQueryArgs(organizationId) }
+      }
     }
   });
 
@@ -101,6 +107,9 @@ export const getChangeRequestWithProjectAndWorkPackageQueryArgs = (organizationI
       },
       budgetChangeRequest: true,
       deletedBy: getUserQueryArgs(organizationId),
-      requestedReviewers: getUserQueryArgs(organizationId)
+      requestedReviewers: getUserQueryArgs(organizationId),
+      leadershipChangeRequest: {
+        include: { lead: getUserQueryArgs(organizationId), manager: getUserQueryArgs(organizationId) }
+      }
     }
   });

src/backend/src/prisma/migrations/20260223001543_leadership_cr/migration.sql

@@ -0,0 +1,27 @@
+-- AlterEnum
+ALTER TYPE "CR_Type" ADD VALUE 'LEADERSHIP';
+
+-- CreateTable
+CREATE TABLE "Leadership_CR" (
+    "leadershipCrId" TEXT NOT NULL,
+    "changeRequestId" TEXT NOT NULL,
+    "leadId" TEXT,
+    "managerId" TEXT,
+
+    CONSTRAINT "Leadership_CR_pkey" PRIMARY KEY ("leadershipCrId")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Leadership_CR_changeRequestId_key" ON "Leadership_CR"("changeRequestId");
+
+-- CreateIndex
+CREATE INDEX "Leadership_CR_changeRequestId_idx" ON "Leadership_CR"("changeRequestId");
+
+-- AddForeignKey
+ALTER TABLE "Leadership_CR" ADD CONSTRAINT "Leadership_CR_changeRequestId_fkey" FOREIGN KEY ("changeRequestId") REFERENCES "Change_Request"("crId") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Leadership_CR" ADD CONSTRAINT "Leadership_CR_leadId_fkey" FOREIGN KEY ("leadId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Leadership_CR" ADD CONSTRAINT "Leadership_CR_managerId_fkey" FOREIGN KEY ("managerId") REFERENCES "User"("userId") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/migrations/20260305012944_guest_home_page/migration.sql

@@ -0,0 +1,24 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `applyInterestImageId` on the `Organization` table. All the data in the column will be lost.
+  - You are about to drop the column `exploreAsGuestImageId` on the `Organization` table. All the data in the column will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Sponsor" DROP CONSTRAINT "Sponsor_sponsorTierId_fkey";
+
+-- AlterTable
+ALTER TABLE "Link_Type" ADD COLUMN     "isOnGuestHomePage" BOOLEAN NOT NULL DEFAULT false;
+
+-- AlterTable
+ALTER TABLE "Organization" DROP COLUMN "applyInterestImageId",
+DROP COLUMN "exploreAsGuestImageId",
+ADD COLUMN     "platformDescription" TEXT NOT NULL DEFAULT '',
+ADD COLUMN     "platformLogoImageId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Sponsor" ALTER COLUMN "valueTypes" DROP DEFAULT;
+
+-- AddForeignKey
+ALTER TABLE "Sponsor" ADD CONSTRAINT "Sponsor_sponsorTierId_fkey" FOREIGN KEY ("sponsorTierId") REFERENCES "Sponsor_Tier"("sponsorTierId") ON DELETE SET NULL ON UPDATE CASCADE;

src/backend/src/prisma/migrations/20260309041950_add_description_to_rr/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Reimbursement_Request" ADD COLUMN     "description" TEXT NOT NULL DEFAULT '';