Merge branch 'develop' into #4107-maintenance-bom-inline-editing

Author: cielbellerose

src/backend/src/controllers/finance.controllers.ts

@@ -43,7 +43,8 @@ export default class FinanceController {
         contactPhone,
         contactPosition,
         stockDescription,
-        discountDescription
+        discountDescription,
+        req.file
       );
       res.status(200).json(sponsor);
     } catch (error: unknown) {
@@ -383,7 +384,8 @@ export default class FinanceController {
         contactPhone,
         contactPosition,
         stockDescription,
-        discountDescription
+        discountDescription,
+        req.file
       );
 
       res.status(200).json(updatedSponsor);

src/backend/src/controllers/recruitment.controllers.ts

@@ -99,13 +99,48 @@ export default class RecruitmentController {
 
   static async createGuestDefinition(req: Request, res: Response, next: NextFunction) {
     try {
-      const { term, description, order, icon, buttonText, buttonLink } = req.body;
+      const { term, description, order, icon, type, buttonText, buttonLink } = req.body;
       const definition = await RecruitmentServices.createGuestDefinition(
         req.currentUser,
         req.organization,
         term,
         description,
         order,
+        type,
+        icon,
+        buttonText,
+        buttonLink
+      );
+      res.status(200).json(definition);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async getSingleGuestDefinition(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { definitionId } = req.params as Record<string, string>;
+
+      const definition = await RecruitmentServices.getSingleGuestDefinition(req.organization, definitionId);
+      res.status(200).json(definition);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
+  static async editGuestDefinition(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { definitionId } = req.params as Record<string, string>;
+      const { term, description, order, type, icon, buttonText, buttonLink } = req.body;
+
+      const definition = await RecruitmentServices.editGuestDefinition(
+        req.currentUser,
+        req.organization,
+        term,
+        description,
+        definitionId,
+        order,
+        type,
         icon,
         buttonText,
         buttonLink

src/backend/src/prisma/migrations/20260411195905_guest_definition_type/migration.sql

@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "Guest_Definition_Type" AS ENUM ('PROJECT_MANAGEMENT', 'INFO_PAGE');
+
+-- AlterTable
+ALTER TABLE "Guest_Definition" ADD COLUMN     "type" "Guest_Definition_Type" NOT NULL DEFAULT 'INFO_PAGE';

src/backend/src/prisma/schema.prisma

@@ -1787,21 +1787,27 @@ model Reimbursement_Request_Comment {
   @@index([reimbursementRequestId])
 }
 
+enum Guest_Definition_Type {
+  PROJECT_MANAGEMENT
+  INFO_PAGE
+}
+
 model Guest_Definition {
-  definitionId   String       @id @default(uuid())
+  definitionId   String                @id @default(uuid())
   term           String
   description    String
   order          Int
+  type           Guest_Definition_Type @default(INFO_PAGE)
   buttonText     String?
   buttonLink     String?
   icon           String?
-  dateCreated    DateTime     @default(now())
+  dateCreated    DateTime              @default(now())
   dateDeleted    DateTime?
-  userDeleted    User?        @relation(fields: [userDeletedId], references: [userId], name: "guestDefinitionDeleter")
+  userDeleted    User?                 @relation(fields: [userDeletedId], references: [userId], name: "guestDefinitionDeleter")
   userDeletedId  String?
-  userCreated    User         @relation(fields: [userCreatedId], references: [userId], name: "guestDefinitionCreator")
+  userCreated    User                  @relation(fields: [userCreatedId], references: [userId], name: "guestDefinitionCreator")
   userCreatedId  String
-  organization   Organization @relation(fields: [organizationId], references: [organizationId])
+  organization   Organization          @relation(fields: [organizationId], references: [organizationId])
   organizationId String
 
   @@index([organizationId])

src/backend/src/prisma/seed.ts

@@ -22,7 +22,15 @@ import { dbSeedAllTeams } from './seed-data/teams.seed.js';
 import { seedReimbursementRequests } from './seed-data/reimbursement-requests.seed.js';
 import ChangeRequestsService from '../services/change-requests.services.js';
 import TeamsService from '../services/teams.services.js';
-import { DayOfWeek, MaterialStatus, RoleEnum, StandardChangeRequest, WbsElementStatus, WorkPackageStage } from 'shared';
+import {
+  DayOfWeek,
+  GuestDefinitionType,
+  MaterialStatus,
+  RoleEnum,
+  StandardChangeRequest,
+  WbsElementStatus,
+  WorkPackageStage
+} from 'shared';
 import TasksService from '../services/tasks.services.js';
 import { seedProject } from './seed-data/projects.seed.js';
 import { seedWorkPackage } from './seed-data/work-packages.seed.js';
@@ -5117,6 +5125,7 @@ const performSeed: () => Promise<void> = async () => {
       term: 'NER',
       description: 'A really awesome organization!',
       order: 0,
+      type: 'INFO_PAGE',
       organizationId,
       userCreatedId: batman.userId
     }
@@ -5128,6 +5137,7 @@ const performSeed: () => Promise<void> = async () => {
     'Projects',
     'This is the definition of a project. Projects are blah blah blah',
     0,
+    GuestDefinitionType.PROJECT_MANAGEMENT,
     'bar_chart',
     'Click here to view all our projects!',
     '/projects'
@@ -5139,6 +5149,7 @@ const performSeed: () => Promise<void> = async () => {
     'Change Requests',
     'This is the definiton for a change request. Changes requests are blah blah blah',
     0,
+    GuestDefinitionType.PROJECT_MANAGEMENT,
     'bar_chart',
     'Click here to view all our change requests!',
     '/change-requests'
@@ -5150,6 +5161,7 @@ const performSeed: () => Promise<void> = async () => {
     'Gantt Chart',
     'This is the definiton for a change request. Changes requests are blah blah blah',
     0,
+    GuestDefinitionType.PROJECT_MANAGEMENT,
     'bar_chart',
     'Click here to view all our projects!',
     '/gantt'
@@ -5161,6 +5173,7 @@ const performSeed: () => Promise<void> = async () => {
     'Design Reviews',
     'This is the definiton for a design review. Design reviews are blah blah blah',
     0,
+    GuestDefinitionType.PROJECT_MANAGEMENT,
     'bar_chart',
     'Click here to view all our design reviews!',
     '/design-reviews'

src/backend/src/routes/finance.routes.ts

@@ -9,11 +9,15 @@ import {
 } from '../utils/validation.utils.js';
 import { body } from 'express-validator';
 import FinanceController from '../controllers/finance.controllers.js';
+import multer, { memoryStorage } from 'multer';
+import { MAX_FILE_SIZE } from 'shared';
 
 const financeRouter = express.Router();
+const upload = multer({ limits: { fileSize: MAX_FILE_SIZE }, storage: memoryStorage() });
 
 financeRouter.post(
   '/sponsor/create',
+  upload.single('logoImage'),
   nonEmptyString(body('name')),
   body('activeStatus').isBoolean(),
   body('valueTypes').isArray(),
@@ -142,6 +146,7 @@ financeRouter.get('/sponsorTiers', FinanceController.getAllSponsorTiers);
 
 financeRouter.post(
   '/sponsor/:sponsorId/edit',
+  upload.single('logoImage'),
   nonEmptyString(body('name')),
   body('activeStatus').isBoolean(),
   body('valueTypes').isArray(),

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

@@ -57,13 +57,29 @@ recruitmentRouter.post(
   nonEmptyString(body('term')),
   nonEmptyString(body('description')),
   body('order').isInt(),
+  nonEmptyString(body('type')),
   nonEmptyString(body('icon')).optional(),
   nonEmptyString(body('buttonText')).optional(),
   nonEmptyString(body('buttonLink')).optional(),
   validateInputs,
   RecruitmentController.createGuestDefinition
 );
 
+recruitmentRouter.get('/guestdefinition/:definitionId', RecruitmentController.getSingleGuestDefinition);
+
+recruitmentRouter.post(
+  '/guestdefinition/:definitionId/edit',
+  nonEmptyString(body('term')),
+  nonEmptyString(body('description')),
+  body('order').isInt(),
+  nonEmptyString(body('type')),
+  nonEmptyString(body('icon')).optional(),
+  nonEmptyString(body('buttonText')).optional(),
+  nonEmptyString(body('buttonLink')).optional(),
+  validateInputs,
+  RecruitmentController.editGuestDefinition
+);
+
 recruitmentRouter.delete('/guestdefinition/:definitionId/delete', RecruitmentController.deleteGuestDefinition);
 recruitmentRouter.get('/guestdefinitions', RecruitmentController.getAllGuestDefintions);
 

src/backend/src/services/finance.services.ts

@@ -34,6 +34,7 @@ import {
   getReimbursementRequestWhereInput
 } from '../utils/finance.utils.js';
 import { notifySponsorTaskAssignee } from '../utils/slack.utils.js';
+import { uploadFile } from '../utils/google-integration.utils.js';
 import { isUserFinanceTeamOrHead } from '../utils/reimbursement-requests.utils.js';
 
 export default class FinanceServices {
@@ -56,7 +57,7 @@ export default class FinanceServices {
    * @param contactPosition The position of the sponsor contact.
    * @param sponsorTasks An array of sponsor tasks associated with the sponsor.
    * @param organization The organization for which the sponsor is being created.
-   *
+   * @param logoImage An optional logo image file for the sponsor.
    * @returns The created sponsor object, including associated tasks.
    *
    * @throws AccessDeniedAdminOnlyException If the submitter does not have permission to create a sponsor.
@@ -80,7 +81,8 @@ export default class FinanceServices {
     contactPhone?: string,
     contactPosition?: string,
     stockDescription?: string,
-    discountDescription?: string
+    discountDescription?: string,
+    logoImage?: Express.Multer.File
   ) {
     if (!(await userHasPermission(submitter.userId, organization.organizationId, isHead)))
       throw new AccessDeniedException('Only heads can create a sponsor');
@@ -104,6 +106,8 @@ export default class FinanceServices {
       data: { name: contactName, email: contactEmail, phone: contactPhone, position: contactPosition }
     });
 
+    const { id: logoImageId } = logoImage ? await uploadFile(logoImage) : { id: undefined };
+
     const sponsor = await prisma.sponsor.create({
       data: {
         name,
@@ -118,6 +122,7 @@ export default class FinanceServices {
         taxExempt,
         discountCode,
         sponsorNotes,
+        logoImageId,
         contactId: contact.sponsorContactId,
         sponsorTasks: {
           create: sponsorTasks.map((task) => ({
@@ -1200,6 +1205,8 @@ export default class FinanceServices {
    * @param contactPosition The position of the sponsor contact.
    * @param sponsorTasks An array of sponsor tasks associated with the sponsor.
    * @param organization The organization for which the sponsor is being edited.
+   * @param logoImage An optional logo image file for the sponsor.
+   *
    * @returns the edited sponsor.
    */
 
@@ -1223,7 +1230,8 @@ export default class FinanceServices {
     contactPhone?: string,
     contactPosition?: string,
     stockDescription?: string,
-    discountDescription?: string
+    discountDescription?: string,
+    logoImage?: Express.Multer.File
   ): Promise<Sponsor> {
     if (!(await userHasPermission(submitter.userId, organization.organizationId, isHead)))
       throw new AccessDeniedException('Only heads can edit sponsors.');
@@ -1321,6 +1329,8 @@ export default class FinanceServices {
       data: { name: contactName, email: contactEmail, phone: contactPhone, position: contactPosition }
     });
 
+    const { id: logoImageId } = logoImage ? await uploadFile(logoImage) : { id: undefined };
+
     const updatedSponsor = await prisma.sponsor.update({
       where: { sponsorId: oldSponsor.sponsorId },
       data: {
@@ -1335,7 +1345,8 @@ export default class FinanceServices {
         tier: sponsorTierId ? { connect: { sponsorTierId } } : { disconnect: true },
         taxExempt,
         discountCode,
-        sponsorNotes
+        sponsorNotes,
+        ...(logoImageId && { logoImageId })
       },
       ...getSponsorQueryArgs(organization.organizationId)
     });