#3271: club account and product purchase other reason now a model by wavehassman · Pull Request #3281 · Northeastern-Electric-Racing/FinishLine

wavehassman · 2025-03-06T19:48:35Z

Changes

I made Club_Account and Reimbursment_Product_Other_Reason models. This caused a bunch of errors in the frontend and backend, so I had to go and fix those.

Notes

In the migration, I am adding the existing allowedRefundSources to the account code to index code table, but not sure if that is right.

Test Cases

Screenshots

Checklist

Closes #3271

Peyton-McKee

Generally i would refactor the migration to look something like this

Change account to indexCode in RR Model

Create the Index Code Table, Create the Other Reimbursement Reason Table,
Create new Admin user
Insert each cash and budget into index code table and use admin user id as the user who created
Insert each other reimbursement reason into reimbursement table with admin as the creator
iterate over every rr and if rr.account === indexCode.name, set rr.indexCodeId = indexCode.indexCodeId, yk, and do something similar for whatever uses other reimbursement reason

src/backend/src/prisma/migrations/20250127014440_finance_redesign/migration.sql

dreifusjack

I was only able to review the frontend and endpoints bc you know more than me on the db stuff. Overall everything looks great! Just added some small fixes. Also I noticed that the getAllIndexCode endpoint ensures the user is an admin or on the finance team, but not the getSingleIndexCode, just want to confirm that one should be validating and the other not. Same goes for the getSingleOtherR... and getAllSingleOtherR...

src/shared/src/types/reimbursement-requests-types.ts

src/frontend/src/hooks/finance.hooks.ts

src/frontend/src/apis/finance.api.ts

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

src/backend/src/prisma/migrations/20250321005151_finance_redesign/migration.sql

src/backend/src/prisma/schema.prisma

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

walker-sean · 2025-03-28T19:31:28Z

src/backend/src/prisma/manual.ts

@@ -201,27 +202,27 @@ const getTotalAmountOwedForCashAndBudgetForSubmittedToSaboAndPendingFinanceTeam
  );

  const totalAmountOwedForCashSabo = submittedToSabo.reduce((acc, curr) => {


Assuming other organizations won't have the exact same accounts as us, this will have to be reworked. You should make it another ticket but it def needs to be done

How would someone go about this like high level? Trying to write up a ticket and am stuck

Oh actually I didn't realize this was the manual file, don't worry about it

walker-sean · 2025-03-28T19:35:05Z

src/backend/src/utils/validation.utils.ts


 export const isAccount = (validationObject: ValidationChain): ValidationChain => {
-  return validationObject.isString().isIn([ClubAccount.BUDGET, ClubAccount.CASH]);
+  return validationObject.isString().isIn(['Budget', 'Cash']);


This only works for these two accounts. If there are more, we need to check against an org's list of accounts

Since this is now a model, I changed the create and edit reimbursement request endpoints to now take in indexCodeIds instead of the whole model, so this isn't even used now.

…ma-changes" This reverts commit e81deba, reversing changes made to 2ab1e87.

uncomment seed

seed and project route

…eastern-Electric-Racing/FinishLine into #3271-rerun-schema-changes

walker-sean · 2025-04-03T22:35:46Z

src/backend/src/prisma/manual.ts

@@ -201,27 +202,27 @@ const getTotalAmountOwedForCashAndBudgetForSubmittedToSaboAndPendingFinanceTeam
  );

  const totalAmountOwedForCashSabo = submittedToSabo.reduce((acc, curr) => {


Oh actually I didn't realize this was the manual file, don't worry about it

walker-sean · 2025-04-03T22:41:31Z

src/frontend/src/pages/FinancePage/FinanceComponents/TotalAmountSpentModal.tsx

@@ -1,4 +1,4 @@
-import { ClubAccount, ReimbursementRequest } from 'shared';


This modal needs to be reworked to use non-predermined accounts and codes. You can make that a seperate ticket if you'd like

#3271: still getting a null constraint in seed data and tests

28a2a19

wavehassman self-assigned this Mar 6, 2025

#3271: prettier + linting

6133907

wavehassman assigned dreifusjack Mar 8, 2025

wavehassman requested a review from walker-sean March 8, 2025 02:57

wavehassman added the Ready for Review label Mar 8, 2025

wavehassman and others added 2 commits March 11, 2025 15:09

Merge branch 'feature/finance-redesign' into #3271-rerun-schema-changes

d8aa4eb

#3271: error utils

83c16c5

Peyton-McKee requested changes Mar 19, 2025

View reviewed changes

wavehassman added 3 commits March 22, 2025 14:55

#3271 fixed null constraint

b6aa024

#3271 uncomment seed data

2795eb0

#3271 prettier

f80896b

wavehassman added Sean and removed Ready for Review Sean labels Mar 22, 2025

wavehassman added 2 commits March 24, 2025 16:47

#3271: endpoints and hooks work

80e824a

#3271: prettier

1b68e66

wavehassman requested a review from Peyton-McKee March 24, 2025 20:57

wavehassman added Sean Ready for Review labels Mar 24, 2025

wavehassman requested a review from dreifusjack March 25, 2025 00:36

dreifusjack requested changes Mar 26, 2025

View reviewed changes

#3271 requested changes

5723b9d

walker-sean requested changes Mar 28, 2025

View reviewed changes

wavehassman added 3 commits March 29, 2025 14:41

migration changes

2fbf051

migration changes

04b15d8

#3271 index coes organization bound

2ab1e87

wavehassman requested a review from walker-sean March 29, 2025 20:36

wavehassman and others added 2 commits April 1, 2025 12:52

Merge branch 'feature/finance-redesign' into #3271-rerun-schema-changes

e81deba

Revert "Merge branch 'feature/finance-redesign' into #3271-rerun-sche…

21d7ed1

…ma-changes" This reverts commit e81deba, reversing changes made to 2ab1e87.

wavehassman added 17 commits April 1, 2025 13:25

revert 1 commit

c5857d7

Revert "Merge branch 'feature/finance-redesign' into #3271-rerun-sche…

d18030a

…ma-changes" This reverts commit e81deba, reversing changes made to 2ab1e87.

maybe rebasing will help??

6367f73

fix merge

caec5cb

migration merge

cbd8e64

more rebase

470191d

migration changes

0552a08

uncomment seed

revert 1 commit

7f7a8a4

seed and project route

#3271: learned my lesson to not use git hub to fix merge conflicts

7401e64

Merge branch '#3271-rerun-schema-changes' of https://github.com/North…

2e46d16

…eastern-Electric-Racing/FinishLine into #3271-rerun-schema-changes

#3271: changed query args to make more sense

3e90a5e

merge develop into feature

9614a73

#3271 New Migration

5c06a89

#3271 Edit Migration

770c2f8

#3271: migration

f536c08

#3271 naming changes

abb5996

#3271: added code to index code

588821a

walker-sean previously approved these changes Apr 3, 2025

View reviewed changes

#3271 merge conflicts

1023c28

wavehassman dismissed walker-sean’s stale review via 1023c28 April 4, 2025 00:22

wavehassman merged commit 76382ae into feature/finance-redesign Apr 4, 2025
4 checks passed

wavehassman deleted the #3271-rerun-schema-changes branch April 4, 2025 00:43

		@@ -201,27 +202,27 @@ const getTotalAmountOwedForCashAndBudgetForSubmittedToSaboAndPendingFinanceTeam
		);

		const totalAmountOwedForCashSabo = submittedToSabo.reduce((acc, curr) => {

		@@ -1,4 +1,4 @@
		import { ClubAccount, ReimbursementRequest } from 'shared';

Conversation

wavehassman commented Mar 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Notes

Test Cases

Screenshots

Checklist

Uh oh!

Peyton-McKee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dreifusjack left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

walker-sean Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

wavehassman Mar 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

walker-sean Apr 3, 2025

Choose a reason for hiding this comment

Uh oh!

walker-sean Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

wavehassman Mar 29, 2025

Choose a reason for hiding this comment

Uh oh!

walker-sean Apr 3, 2025

Choose a reason for hiding this comment

Uh oh!

walker-sean Apr 3, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wavehassman commented Mar 6, 2025 •

edited

Loading

wavehassman Mar 29, 2025 •

edited

Loading