Merge branch 'develop' into #3494-wp-status-in-cr-diff

Author: chpy04

package.json

@@ -58,14 +58,17 @@
     "docker:start": "yarn database:setup:script && cd devContainerization && node start-containers.js",
     "docker:i": "cd devContainerization && docker compose -f docker-compose.dev.yml exec -T backend sh -c \"yarn install && cd src/backend && npx prisma generate\" && docker compose -f docker-compose.dev.yml exec -T frontend sh -c \"yarn install\"",
     "docker:test": "yarn test:setup && cd devContainerization && docker compose -f docker-compose.dev.yml exec backend bash -c \"yarn test:backend\" && docker compose -f docker-compose.dev.yml exec frontend sh -c \"yarn test:frontend\" && yarn test:teardown",
-    "docker:rebuild": "docker compose -f devContainerization/docker-compose.dev.yml rm -f -s && yarn docker:start"
+    "docker:rebuild": "docker compose -f devContainerization/docker-compose.dev.yml rm -f -s && yarn docker:start",
+    "db:pull": "node scripts/db-pull.js"
   },
   "resolutions": {
     "@types/react": "17.0.1",
     "@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",
@@ -76,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",

scripts/db-pull.js

@@ -0,0 +1,67 @@
+const { execSync } = require('child_process');
+const readline = require('readline');
+
+function promptUser(question) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+
+async function main() {
+  console.log('🚀 Database Migration Script\n');
+
+  try {
+    const targetUrl = "postgresql://postgres:docker@localhost:5432/nerpm"
+
+    console.log(`📍 Target database: ${targetUrl.replace(/\/\/[^@]*@/, '//***:***@')}`);
+
+    const sourceUrl = new URL(await promptUser('\nSource database URL (READ-ONLY - will not be modified): '));
+    sourceUrl.search = '';
+
+    console.log(`\n📋 Migration Summary:`);
+    console.log(`• Source (READ-ONLY): ${sourceUrl.href.replace(/\/\/[^@]*@/, '//***:***@')}`);
+    console.log(`• Target (WILL BE OVERWRITTEN): ${targetUrl.replace(/\/\/[^@]*@/, '//***:***@')}`);
+
+    const confirm = await promptUser('\n⚠️  This will COMPLETELY OVERWRITE the target database. Continue? (y/n): ');
+
+    if (confirm.toLowerCase() !== 'y') {
+      console.log('❌ Cancelled');
+      return;
+    }
+
+    console.log('\n🗑️  Clearing target database...');
+
+    // First, clear the target database completely
+    const clearCommand = `psql "${targetUrl}" -c "DROP SCHEMA public CASCADE; CREATE SCHEMA public;"`;
+    console.log(targetUrl)
+
+    try {
+      execSync(clearCommand, { stdio: 'inherit' });
+      console.log('✅ Target database cleared');
+    } catch (error) {
+      console.log('⚠️  Warning: Could not clear database, continuing anyway...');
+    }
+
+    console.log('\n📦 Dumping and restoring database...');
+
+    const dumpCommand = `pg_dump "${sourceUrl}" --no-acl --no-owner --clean --if-exists | psql "${targetUrl}"`;
+
+    execSync(dumpCommand, { stdio: 'inherit' });
+
+    console.log('✅ Migration complete!');
+
+  } catch (error) {
+    console.error('❌ Error:', error.message);
+    process.exit(1);
+  }
+}
+
+main();

src/backend/custom.d.ts

@@ -1,9 +1,10 @@
-import { Organization, User as PrismaUser } from '@prisma/client';
+import { Organization } from '@prisma/client';
+import { User as SharedUser } from 'shared';
 
 declare global {
   namespace Express {
     export interface Request {
-      currentUser: PrismaUser;
+      currentUser: SharedUser;
       organization: Organization;
     }
   }

src/backend/package.json

@@ -9,7 +9,7 @@
     "prisma:manual": "ts-node ./src/prisma/manual.ts"
   },
   "dependencies": {
-    "@prisma/client": "6.2.1",
+    "@prisma/client": "^6.2.1",
     "@slack/events-api": "^3.0.1",
     "@slack/web-api": "^7.8.0",
     "@types/concat-stream": "^2.0.0",
@@ -32,6 +32,7 @@
     "jsonwebtoken": "^8.5.1",
     "multer": "^1.4.5-lts.1",
     "nodemailer": "^6.9.1",
+    "prisma": "^6.2.1",
     "shared": "1.0.0"
   },
   "devDependencies": {
@@ -40,7 +41,6 @@
     "@types/node": "^20.0.0",
     "@types/supertest": "^2.0.12",
     "nodemon": "^2.0.16",
-    "prisma": "6.2.1",
     "supertest": "^6.2.4",
     "ts-node": "^8.10.1",
     "typescript": "^5.7.3",

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

@@ -12,7 +12,7 @@ export default class FinanceController {
         activeYears,
         sponsorTierId,
         taxExempt,
-        vendorContact,
+        sponsorContact,
         sponsorTasks,
         discountCode
       } = req.body;
@@ -26,7 +26,7 @@ export default class FinanceController {
         activeYears,
         sponsorTierId,
         taxExempt,
-        vendorContact,
+        sponsorContact,
         sponsorTasks,
         req.organization,
         discountCode
@@ -157,15 +157,17 @@ export default class FinanceController {
   static async getReimbursementRequestTeamData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params;
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
       const rrData = await FinanceServices.getReimbursementRequestTeamData(
         req.organization,
         teamId,
         parsedStartDate,
-        parsedEndDate
+        parsedEndDate,
+        parsedCarNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -176,15 +178,17 @@ export default class FinanceController {
   static async getReimbursementRequestTeamTypeData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamTypeId } = req.params;
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
       const rrData = await FinanceServices.getReimbursementRequestTeamTypeData(
         req.organization,
         teamTypeId,
         parsedStartDate,
-        parsedEndDate
+        parsedEndDate,
+        parsedCarNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -195,15 +199,17 @@ export default class FinanceController {
   static async getSpendingBarTeamData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamId } = req.params;
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
       const spendingBarData = await FinanceServices.getSpendingBarTeamData(
         req.organization,
         teamId,
         parsedStartDate,
-        parsedEndDate
+        parsedEndDate,
+        parsedCarNumber
       );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
@@ -214,15 +220,17 @@ export default class FinanceController {
   static async getSpendingBarTeamTypeData(req: Request, res: Response, next: NextFunction) {
     try {
       const { teamTypeId } = req.params;
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
       const spendingBarData = await FinanceServices.getSpendingBarTeamTypeData(
         req.organization,
         teamTypeId,
         parsedStartDate,
-        parsedEndDate
+        parsedEndDate,
+        parsedCarNumber
       );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
@@ -232,11 +240,17 @@ export default class FinanceController {
 
   static async getAllReimbursementRequestData(req: Request, res: Response, next: NextFunction) {
     try {
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
-      const rrData = await FinanceServices.getAllReimbursementRequestData(req.organization, parsedStartDate, parsedEndDate);
+      const rrData = await FinanceServices.getAllReimbursementRequestData(
+        req.organization,
+        parsedStartDate,
+        parsedEndDate,
+        parsedCarNumber
+      );
       res.status(200).json(rrData);
     } catch (error: unknown) {
       next(error);
@@ -246,15 +260,17 @@ export default class FinanceController {
   static async getReimbursementRequestCategoryData(req: Request, res: Response, next: NextFunction) {
     try {
       const { otherReasonId } = req.params;
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
       const rrData = await FinanceServices.getReimbursementRequestCategoryData(
         otherReasonId,
         req.organization,
         parsedStartDate,
-        parsedEndDate
+        parsedEndDate,
+        parsedCarNumber
       );
       res.status(200).json(rrData);
     } catch (error: unknown) {
@@ -264,11 +280,17 @@ export default class FinanceController {
 
   static async getAllSpendingBarData(req: Request, res: Response, next: NextFunction) {
     try {
-      const { startDate, endDate } = req.query;
+      const { startDate, endDate, carNumber } = req.query;
       const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
       const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;
+      const parsedCarNumber = typeof carNumber === 'string' ? Number(carNumber) : undefined;
 
-      const spendingBarData = await FinanceServices.getAllSpendingBarData(req.organization, parsedStartDate, parsedEndDate);
+      const spendingBarData = await FinanceServices.getAllSpendingBarData(
+        req.organization,
+        parsedStartDate,
+        parsedEndDate,
+        parsedCarNumber
+      );
       res.status(200).json(spendingBarData);
     } catch (error: unknown) {
       next(error);
@@ -303,7 +325,7 @@ export default class FinanceController {
         joinDate,
         activeYears,
         sponsorTierId,
-        vendorContact,
+        sponsorContact,
         taxExempt,
         sponsorTasks,
         discountCode
@@ -319,7 +341,7 @@ export default class FinanceController {
         joinDate,
         activeYears,
         sponsorTierId,
-        vendorContact,
+        sponsorContact,
         taxExempt,
         sponsorTasks,
         discountCode

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);
+    }
+  }
 }