Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
},
"dependencies": {
"mitt": "^3.0.1",
"react-hook-form-persist": "^3.0.0",
"recharts": "^2.15.3",
"typescript": "^5.7.3"
},
"devDependencies": {
Expand Down
147 changes: 147 additions & 0 deletions src/backend/src/controllers/finance.controllers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,151 @@ export default class FinanceController {
next(error);
}
}

static async getReimbursementRequestProjectData(req: Request, res: Response, next: NextFunction) {
try {
const { projectId } = req.params;
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const rrData = await FinanceServices.getReimbursementRequestProjectData(
req.organization,
projectId,
parsedStartDate,
parsedEndDate
);
res.status(200).json(rrData);
} catch (error: unknown) {
next(error);
}
}

static async getReimbursementRequestTeamData(req: Request, res: Response, next: NextFunction) {
try {
const { teamId } = req.params;
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const rrData = await FinanceServices.getReimbursementRequestTeamData(
req.organization,
teamId,
parsedStartDate,
parsedEndDate
);
res.status(200).json(rrData);
} catch (error: unknown) {
next(error);
}
}

static async getReimbursementRequestTeamTypeData(req: Request, res: Response, next: NextFunction) {
try {
const { teamTypeId } = req.params;
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const rrData = await FinanceServices.getReimbursementRequestTeamTypeData(
req.organization,
teamTypeId,
parsedStartDate,
parsedEndDate
);
res.status(200).json(rrData);
} catch (error: unknown) {
next(error);
}
}

static async getSpendingBarTeamData(req: Request, res: Response, next: NextFunction) {
try {
const { teamId } = req.params;
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const spendingBarData = await FinanceServices.getSpendingBarTeamData(
req.organization,
teamId,
parsedStartDate,
parsedEndDate
);
res.status(200).json(spendingBarData);
} catch (error: unknown) {
next(error);
}
}

static async getSpendingBarTeamTypeData(req: Request, res: Response, next: NextFunction) {
try {
const { teamTypeId } = req.params;
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const spendingBarData = await FinanceServices.getSpendingBarTeamTypeData(
req.organization,
teamTypeId,
parsedStartDate,
parsedEndDate
);
res.status(200).json(spendingBarData);
} catch (error: unknown) {
next(error);
}
}

static async getAllReimbursementRequestData(req: Request, res: Response, next: NextFunction) {
try {
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const rrData = await FinanceServices.getAllReimbursementRequestData(req.organization, parsedStartDate, parsedEndDate);
res.status(200).json(rrData);
} catch (error: unknown) {
next(error);
}
}

static async getReimbursementRequestCategoryData(req: Request, res: Response, next: NextFunction) {
try {
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const rrData = await FinanceServices.getReimbursementRequestCategoryData(
req.organization,
parsedStartDate,
parsedEndDate
);
res.status(200).json(rrData);
} catch (error: unknown) {
next(error);
}
}

static async getAllSpendingBarData(req: Request, res: Response, next: NextFunction) {
try {
const { startDate, endDate } = req.query;
const parsedStartDate = typeof startDate === 'string' ? new Date(startDate) : undefined;
const parsedEndDate = typeof endDate === 'string' ? new Date(endDate) : undefined;

const spendingBarData = await FinanceServices.getAllSpendingBarData(req.organization, parsedStartDate, parsedEndDate);
res.status(200).json(spendingBarData);
} catch (error: unknown) {
next(error);
}
}

static async getSpendingBarCategoryData(req: Request, res: Response, next: NextFunction) {
try {
const spendingBarData = await FinanceServices.getSpendingBarCategoryData(req.organization);
res.status(200).json(spendingBarData);
} catch (error: unknown) {
next(error);
}
}
}
10 changes: 10 additions & 0 deletions src/backend/src/controllers/teams.controllers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ export default class TeamsController {
}
}

static async getUsersTeams(req: Request, res: Response, next: NextFunction) {
try {
const teams = await TeamsService.getUsersTeams(req.currentUser, req.organization);

res.status(200).json(teams);
} catch (error: unknown) {
next(error);
}
}

static async setTeamMembers(req: Request, res: Response, next: NextFunction) {
try {
const { userIds } = req.body;
Expand Down
3 changes: 2 additions & 1 deletion src/backend/src/prisma/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,8 @@ const performSeed: () => Promise<void> = async () => {
kyleHamilton,
marcusWilliams,
roquanSmith,
justinTucker
justinTucker,
regina
].map((user) => user.userId),
ner
);
Expand Down
21 changes: 21 additions & 0 deletions src/backend/src/routes/finance.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,25 @@ financeRouter.post(
FinanceController.createSponsorTask
);

financeRouter.get('/reimbursement-request-project-data/:projectId', FinanceController.getReimbursementRequestProjectData);

financeRouter.get('/reimbursement-request-team-data/:teamId', FinanceController.getReimbursementRequestTeamData);

financeRouter.get('/reimbursement-request-data', FinanceController.getAllReimbursementRequestData);

financeRouter.get('/reimbursement-request-category-data', FinanceController.getReimbursementRequestCategoryData);

financeRouter.get(
'/reimbursement-request-team-type-data/:teamTypeId',
FinanceController.getReimbursementRequestTeamTypeData
);

financeRouter.get('/spending-bar-team-data/:teamId', FinanceController.getSpendingBarTeamData);

financeRouter.get('/spending-bar-team-type-data/:teamTypeId', FinanceController.getSpendingBarTeamTypeData);

financeRouter.get('/spending-bar-data', FinanceController.getAllSpendingBarData);

financeRouter.get('/spending-bar-category-data', FinanceController.getSpendingBarCategoryData);

export default financeRouter;
1 change: 1 addition & 0 deletions src/backend/src/routes/teams.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const upload = multer({ limits: { fileSize: 30000000 }, storage: memoryStorage()

teamsRouter.get('/', TeamsController.getAllTeams);
teamsRouter.get('/archive', TeamsController.getAllArchivedTeams);
teamsRouter.get('/users-teams', TeamsController.getUsersTeams);
teamsRouter.get('/:teamId', TeamsController.getSingleTeam);

teamsRouter.post(
Expand Down
111 changes: 110 additions & 1 deletion src/backend/src/services/finance.services.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isHead } from 'shared';
import { isHead, ReimbursementRequestData, SpendingBarData } from 'shared';
import { User, Organization, Sponsor_Task, Sponsor } from '@prisma/client';
import { userHasPermission } from '../utils/users.utils';
import { getSponsorQueryArgs, getSponsorTaskQueryArgs } from '../prisma-query-args/sponsor.query.args';
Expand All @@ -11,6 +11,17 @@ import {
import prisma from '../prisma/prisma';
import { sponsorTransformer } from '../transformers/finance.transformer';
import sponsorTaskTransformer from '../transformers/sponsor-task.transformer';
import {
getAllReimbursementRequestData,
getAllSpendingBarData,
getReimbursementRequestCategoryData,
getReimbursementRequestDataForAdminFinance,
getReimbursementRequestDataForNonAdminFinance,
getReimbursementRequestsForReimbursementRequestsByProject,
getSpendingBarCategoryData,
getSpendingBarDataForAdminFinance,
getSpendingBarDataForNonAdminFinance
} from '../utils/finance.utils';

export default class FinanceServices {
/**
Expand Down Expand Up @@ -279,4 +290,102 @@ export default class FinanceServices {

return sponsorTaskTransformer(createdSponsorTask);
}

static async getReimbursementRequestProjectData(
organization: Organization,
projectId: string,
startDate?: Date,
endDate?: Date
): Promise<ReimbursementRequestData> {
return await getReimbursementRequestsForReimbursementRequestsByProject(
projectId,
organization.organizationId,
startDate ?? null,
endDate ?? null
);
}

static async getReimbursementRequestTeamData(
organization: Organization,
teamId: string,
startDate?: Date,
endDate?: Date
): Promise<ReimbursementRequestData> {
return await getReimbursementRequestDataForNonAdminFinance(
teamId,
organization.organizationId,
startDate ?? null,
endDate ?? null
);
}

static async getReimbursementRequestTeamTypeData(
organization: Organization,
teamTypeId: string,
startDate?: Date,
endDate?: Date
): Promise<ReimbursementRequestData> {
return await getReimbursementRequestDataForAdminFinance(
teamTypeId,
organization.organizationId,
startDate ?? null,
endDate ?? null
);
}

static async getSpendingBarTeamData(
organization: Organization,
teamId: string,
startDate?: Date,
endDate?: Date
): Promise<SpendingBarData> {
return await getSpendingBarDataForNonAdminFinance(
teamId,
organization.organizationId,
startDate ?? null,
endDate ?? null
);
}

static async getSpendingBarTeamTypeData(
organization: Organization,
teamTypeId: string,
startDate?: Date,
endDate?: Date
): Promise<SpendingBarData[]> {
return await getSpendingBarDataForAdminFinance(
teamTypeId,
organization.organizationId,
startDate ?? null,
endDate ?? null
);
}

static async getAllReimbursementRequestData(
organization: Organization,
startDate?: Date,
endDate?: Date
): Promise<ReimbursementRequestData[]> {
return await getAllReimbursementRequestData(organization.organizationId, startDate ?? null, endDate ?? null);
}

static async getReimbursementRequestCategoryData(
organization: Organization,
startDate?: Date,
endDate?: Date
): Promise<ReimbursementRequestData> {
return await getReimbursementRequestCategoryData(organization.organizationId, startDate ?? null, endDate ?? null);
}

static async getAllSpendingBarData(
organization: Organization,
startDate?: Date,
endDate?: Date
): Promise<SpendingBarData[]> {
return await getAllSpendingBarData(organization.organizationId, startDate ?? null, endDate ?? null);
}

static async getSpendingBarCategoryData(organization: Organization): Promise<SpendingBarData> {
return await getSpendingBarCategoryData(organization.organizationId);
}
}
17 changes: 17 additions & 0 deletions src/backend/src/services/teams.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,23 @@ export default class TeamsService {
return teamTransformer(team);
}

static async getUsersTeams(user: User, organization: Organization): Promise<Team[]> {
const teams = await prisma.team.findMany({
where: {
organizationId: organization.organizationId,
dateArchived: null,
OR: [
{ headId: user.userId },
{ leads: { some: { userId: user.userId } } },
{ members: { some: { userId: user.userId } } }
]
},
...getTeamQueryArgs(organization.organizationId)
});

return teams.map(teamTransformer);
}

/**
* Update the given teamId's team's members
* @param submitter a user who's making this request
Expand Down
Loading