-
Notifications
You must be signed in to change notification settings - Fork 9
#3271: club account and product purchase other reason now a model #3281
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
wavehassman
merged 33 commits into
feature/finance-redesign
from
#3271-rerun-schema-changes
Apr 4, 2025
Merged
Changes from 32 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
28a2a19
#3271: still getting a null constraint in seed data and tests
wavehassman 6133907
#3271: prettier + linting
wavehassman d8aa4eb
Merge branch 'feature/finance-redesign' into #3271-rerun-schema-changes
wavehassman 83c16c5
#3271: error utils
wavehassman b6aa024
#3271 fixed null constraint
wavehassman 2795eb0
#3271 uncomment seed data
wavehassman f80896b
#3271 prettier
wavehassman 80e824a
#3271: endpoints and hooks work
wavehassman 1b68e66
#3271: prettier
wavehassman 5723b9d
#3271 requested changes
wavehassman 2fbf051
migration changes
wavehassman 04b15d8
migration changes
wavehassman 2ab1e87
#3271 index coes organization bound
wavehassman e81deba
Merge branch 'feature/finance-redesign' into #3271-rerun-schema-changes
wavehassman 21d7ed1
Revert "Merge branch 'feature/finance-redesign' into #3271-rerun-sche…
wavehassman c5857d7
revert 1 commit
wavehassman d18030a
Revert "Merge branch 'feature/finance-redesign' into #3271-rerun-sche…
wavehassman 6367f73
maybe rebasing will help??
wavehassman caec5cb
fix merge
wavehassman cbd8e64
migration merge
wavehassman 470191d
more rebase
wavehassman 0552a08
migration changes
wavehassman 7f7a8a4
revert 1 commit
wavehassman 7401e64
#3271: learned my lesson to not use git hub to fix merge conflicts
wavehassman 2e46d16
Merge branch '#3271-rerun-schema-changes' of https://github.com/North…
wavehassman 3e90a5e
#3271: changed query args to make more sense
wavehassman 9614a73
merge develop into feature
wavehassman 5c06a89
#3271 New Migration
wavehassman 770c2f8
#3271 Edit Migration
wavehassman f536c08
#3271: migration
wavehassman abb5996
#3271 naming changes
wavehassman 588821a
#3271: added code to index code
wavehassman 1023c28
#3271 merge conflicts
wavehassman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
src/backend/src/prisma-query-args/account-code.query-args.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { Prisma } from '@prisma/client'; | ||
| import { getUserQueryArgs } from './user.query-args'; | ||
|
|
||
| export type AccountCodeQueryArgs = ReturnType<typeof getAccountCodeQueryArgs>; | ||
|
|
||
| export const getAccountCodeQueryArgs = (organizationId: string) => | ||
| Prisma.validator<Prisma.Account_CodeDefaultArgs>()({ | ||
| include: { | ||
| indexCodes: { | ||
| include: { | ||
| userCreated: { | ||
| ...getUserQueryArgs(organizationId), | ||
| include: { | ||
| organizations: true, | ||
| roles: true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }); |
17 changes: 17 additions & 0 deletions
17
src/backend/src/prisma-query-args/index-code.query-args.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { Prisma } from '@prisma/client'; | ||
| import { getUserQueryArgs } from './user.query-args'; | ||
|
|
||
| export type IndexCodeQueryArgs = ReturnType<typeof getIndexCodeQueryArgs>; | ||
|
|
||
| export const getIndexCodeQueryArgs = (organizationId: string) => | ||
| Prisma.validator<Prisma.Index_CodeDefaultArgs>()({ | ||
| include: { | ||
| userCreated: { | ||
| ...getUserQueryArgs(organizationId), | ||
| include: { | ||
| roles: true, | ||
| organizations: true | ||
| } | ||
| } | ||
| } | ||
| }); |
15 changes: 15 additions & 0 deletions
15
src/backend/src/prisma-query-args/reimbursement-product-other-reason.query-args.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import { Prisma } from '@prisma/client'; | ||
| import { getUserQueryArgs } from './user.query-args'; | ||
| import { getIndexCodeQueryArgs } from './index-code.query-args'; | ||
| import { getAccountCodeQueryArgs } from './account-code.query-args'; | ||
|
|
||
| export type ReimbursementProductOtherReasonQueryArgs = ReturnType<typeof getReimbursementProductOtherReasonQueryArgs>; | ||
|
|
||
| export const getReimbursementProductOtherReasonQueryArgs = (organizationId: string) => | ||
| Prisma.validator<Prisma.Reimbursement_Product_Other_ReasonDefaultArgs>()({ | ||
| include: { | ||
| userCreated: getUserQueryArgs(organizationId), | ||
| indexCode: getIndexCodeQueryArgs(organizationId), | ||
| accountCodes: getAccountCodeQueryArgs(organizationId) | ||
| } | ||
| }); |
6 changes: 4 additions & 2 deletions
6
src/backend/src/prisma-query-args/reimbursement-products.query-args.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How would someone go about this like high level? Trying to write up a ticket and am stuck
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh actually I didn't realize this was the manual file, don't worry about it