Merge remote-tracking branch 'origin/develop' into #3873-guest-home-page

Author: staysgt

src/backend/index.ts

@@ -26,6 +26,7 @@ import retrospectiveRouter from './src/routes/retrospective.routes.js';
 import partsRouter from './src/routes/parts.routes.js';
 import financeRouter from './src/routes/finance.routes.js';
 import calendarRouter from './src/routes/calendar.routes.js';
+import prospectiveSponsorRouter from './src/routes/prospective-sponsor.routes.js';
 
 const app = express();
 
@@ -110,6 +111,7 @@ app.use('/retrospective', retrospectiveRouter);
 app.use('/parts', partsRouter);
 app.use('/finance', financeRouter);
 app.use('/calendar', calendarRouter);
+app.use('/prospective-sponsors', prospectiveSponsorRouter);
 app.use('/', (_req, res) => {
   res.status(200).json('Welcome to FinishLine');
 });

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/controllers/finance.controllers.ts

@@ -7,31 +7,43 @@ export default class FinanceController {
       const {
         name,
         activeStatus,
+        valueTypes,
         sponsorValue,
         joinDate,
         activeYears,
         sponsorTierId,
         taxExempt,
-        sponsorContact,
+        contactName,
+        contactEmail,
+        contactPhone,
+        contactPosition,
         sponsorTasks,
         discountCode,
-        sponsorNotes
+        sponsorNotes,
+        stockDescription,
+        discountDescription
       } = req.body;
 
       const sponsor = await FinanceServices.createSponsor(
         req.currentUser,
         name,
         activeStatus,
-        sponsorValue,
+        valueTypes,
         joinDate,
         activeYears,
-        sponsorTierId,
+        sponsorTierId || undefined,
         taxExempt,
-        sponsorContact,
+        contactName,
         sponsorTasks,
         req.organization,
+        sponsorValue,
         discountCode,
-        sponsorNotes
+        sponsorNotes,
+        contactEmail,
+        contactPhone,
+        contactPosition,
+        stockDescription,
+        discountDescription
       );
       res.status(200).json(sponsor);
     } catch (error: unknown) {
@@ -73,7 +85,7 @@ export default class FinanceController {
   static async editSponsorTask(req: Request, res: Response, next: NextFunction) {
     try {
       const { sponsorTaskId } = req.params as Record<string, string>;
-      const { dueDate, notes, notifyDate, assigneeUserId } = req.body;
+      const { dueDate, notes, notifyDate, assigneeUserId, done } = req.body;
 
       const updatedSponsorTask = await FinanceServices.editSponsorTask(
         req.currentUser,
@@ -82,7 +94,8 @@ export default class FinanceController {
         dueDate,
         notes,
         notifyDate,
-        assigneeUserId
+        assigneeUserId,
+        done
       );
       res.status(200).json(updatedSponsorTask);
     } catch (error: unknown) {
@@ -323,15 +336,21 @@ export default class FinanceController {
       const {
         name,
         activeStatus,
+        valueTypes,
         sponsorValue,
         joinDate,
         activeYears,
         sponsorTierId,
-        sponsorContact,
+        contactName,
+        contactEmail,
+        contactPhone,
+        contactPosition,
         taxExempt,
         sponsorTasks,
         discountCode,
-        sponsorNotes
+        sponsorNotes,
+        stockDescription,
+        discountDescription
       } = req.body;
 
       const updatedSponsor = await FinanceServices.editSponsor(
@@ -340,15 +359,21 @@ export default class FinanceController {
         sponsorId,
         name,
         activeStatus,
-        sponsorValue,
+        valueTypes,
         joinDate,
         activeYears,
-        sponsorTierId,
-        sponsorContact,
+        sponsorTierId || undefined,
+        contactName,
         taxExempt,
         sponsorTasks,
+        sponsorValue,
         discountCode,
-        sponsorNotes
+        sponsorNotes,
+        contactEmail,
+        contactPhone,
+        contactPosition,
+        stockDescription,
+        discountDescription
       );
 
       res.status(200).json(updatedSponsor);
@@ -385,4 +410,14 @@ export default class FinanceController {
       next(error);
     }
   }
+
+  static async toggleSponsorTaskDone(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { sponsorTaskId } = req.params as Record<string, string>;
+      const updatedTask = await FinanceServices.toggleSponsorTaskDone(req.currentUser, req.organization, sponsorTaskId);
+      res.status(200).json(updatedTask);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
 }

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

@@ -216,17 +216,17 @@ export default class ProjectsController {
         name,
         status,
         materialTypeName,
+        linkUrl,
+        wbsNum,
+        req.organization,
         manufacturerName,
         manufacturerPartNumber,
         quantity,
         price,
         subtotal,
-        linkUrl,
-        wbsNum,
-        req.organization,
         notes,
         assemblyId,
-        pdmFileName === '' ? undefined : pdmFileName,
+        pdmFileName,
         unitName,
         reimbursementRequestId
       );
@@ -236,6 +236,22 @@ export default class ProjectsController {
     }
   }
 
+  static async copyMaterialsToProject(req: Request, res: Response, next: NextFunction) {
+    try {
+      const { materialIds, destinationWbsNum } = req.body;
+
+      const newMaterialIds = await BillOfMaterialsService.copyMaterialsToProject(
+        req.currentUser,
+        materialIds,
+        destinationWbsNum,
+        req.organization
+      );
+      res.status(200).json(newMaterialIds);
+    } catch (error: unknown) {
+      next(error);
+    }
+  }
+
   static async createManufacturer(req: Request, res: Response, next: NextFunction) {
     try {
       const { name } = req.body;
@@ -379,17 +395,17 @@ export default class ProjectsController {
         name,
         status,
         materialTypeName,
+        linkUrl,
+        req.organization,
         manufacturerName,
         manufacturerPartNumber,
         quantity,
         price,
         subtotal,
-        linkUrl,
-        req.organization,
         notes,
         unitName,
         assemblyId,
-        pdmFileName === '' ? undefined : pdmFileName,
+        pdmFileName,
         reimbursementRequestId
       );
       res.status(200).json(updatedMaterial);