-
Notifications
You must be signed in to change notification settings - Fork 9
#4101 sponsor logo image id in backend #4145
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
Open
staysgt
wants to merge
2
commits into
develop
Choose a base branch
from
#4101-sponsor-logo-image-id
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ import { | |
| getReimbursementRequestWhereInput | ||
| } from '../utils/finance.utils.js'; | ||
| import { notifySponsorTaskAssignee } from '../utils/slack.utils.js'; | ||
| import { uploadFile } from '../utils/google-integration.utils.js'; | ||
| import { isUserFinanceTeamOrHead } from '../utils/reimbursement-requests.utils.js'; | ||
|
|
||
| export default class FinanceServices { | ||
|
|
@@ -56,7 +57,7 @@ export default class FinanceServices { | |
| * @param contactPosition The position of the sponsor contact. | ||
| * @param sponsorTasks An array of sponsor tasks associated with the sponsor. | ||
| * @param organization The organization for which the sponsor is being created. | ||
| * | ||
| * @param logoImage An optional logo image file for the sponsor. | ||
| * @returns The created sponsor object, including associated tasks. | ||
| * | ||
| * @throws AccessDeniedAdminOnlyException If the submitter does not have permission to create a sponsor. | ||
|
|
@@ -80,7 +81,8 @@ export default class FinanceServices { | |
| contactPhone?: string, | ||
| contactPosition?: string, | ||
| stockDescription?: string, | ||
| discountDescription?: string | ||
| discountDescription?: string, | ||
| logoImage?: Express.Multer.File | ||
| ) { | ||
| if (!(await userHasPermission(submitter.userId, organization.organizationId, isHead))) | ||
| throw new AccessDeniedException('Only heads can create a sponsor'); | ||
|
|
@@ -104,6 +106,12 @@ export default class FinanceServices { | |
| data: { name: contactName, email: contactEmail, phone: contactPhone, position: contactPosition } | ||
| }); | ||
|
|
||
| let logoImageId: string | undefined; | ||
| if (logoImage) { | ||
| const logoImageData = await uploadFile(logoImage); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. use object destructuring |
||
| logoImageId = logoImageData.id; | ||
| } | ||
|
|
||
| const sponsor = await prisma.sponsor.create({ | ||
| data: { | ||
| name, | ||
|
|
@@ -118,6 +126,7 @@ export default class FinanceServices { | |
| taxExempt, | ||
| discountCode, | ||
| sponsorNotes, | ||
| logoImageId, | ||
| contactId: contact.sponsorContactId, | ||
| sponsorTasks: { | ||
| create: sponsorTasks.map((task) => ({ | ||
|
|
@@ -1200,6 +1209,8 @@ export default class FinanceServices { | |
| * @param contactPosition The position of the sponsor contact. | ||
| * @param sponsorTasks An array of sponsor tasks associated with the sponsor. | ||
| * @param organization The organization for which the sponsor is being edited. | ||
| * @param logoImage An optional logo image file for the sponsor. | ||
| * | ||
| * @returns the edited sponsor. | ||
| */ | ||
|
|
||
|
|
@@ -1223,7 +1234,8 @@ export default class FinanceServices { | |
| contactPhone?: string, | ||
| contactPosition?: string, | ||
| stockDescription?: string, | ||
| discountDescription?: string | ||
| discountDescription?: string, | ||
| logoImage?: Express.Multer.File | ||
staysgt marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ): Promise<Sponsor> { | ||
| if (!(await userHasPermission(submitter.userId, organization.organizationId, isHead))) | ||
| throw new AccessDeniedException('Only heads can edit sponsors.'); | ||
|
|
@@ -1321,6 +1333,12 @@ export default class FinanceServices { | |
| data: { name: contactName, email: contactEmail, phone: contactPhone, position: contactPosition } | ||
| }); | ||
|
|
||
| let logoImageId: string | undefined; | ||
| if (logoImage) { | ||
| const logoImageData = await uploadFile(logoImage); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here |
||
| logoImageId = logoImageData.id; | ||
| } | ||
|
|
||
| const updatedSponsor = await prisma.sponsor.update({ | ||
| where: { sponsorId: oldSponsor.sponsorId }, | ||
| data: { | ||
|
|
@@ -1335,7 +1353,8 @@ export default class FinanceServices { | |
| tier: sponsorTierId ? { connect: { sponsorTierId } } : { disconnect: true }, | ||
| taxExempt, | ||
| discountCode, | ||
| sponsorNotes | ||
| sponsorNotes, | ||
| ...(logoImageId && { logoImageId }) | ||
| }, | ||
| ...getSponsorQueryArgs(organization.organizationId) | ||
| }); | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.