fix: paddle transaction management for gifting #2648
Merged
Conversation
This file contains 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
sshanzel
requested review from
rebelchris,
omBratteng,
ilasw,
nensidosari and
AmarTrebinjac
sshanzel
commented
Feb 8, 2025
Comment on lines
-89
to
-115
| const { gifter_id: gifterId } = customData; | ||
| const duration = subscriptionGiftDuration; | ||
| const isGift = !!gifterId; | ||
| if (isGift) { | ||
| if (userId === gifterId) { | ||
| logger.error({ type: 'paddle', data }, 'User and gifter are the same'); | ||
| return false; | ||
| } | ||
|
|
||
| const gifterUser = await con | ||
| .getRepository(User) | ||
| .findOneBy({ id: gifterId }); | ||
| if (!gifterUser) { | ||
| logger.error({ type: 'paddle', data }, 'Gifter user not found'); | ||
| return false; | ||
| } | ||
|
|
||
| const targetUser = await con.getRepository(User).findOne({ | ||
| select: ['subscriptionFlags'], | ||
| where: { id: userId }, | ||
| }); | ||
| if (isPlusMember(targetUser?.subscriptionFlags?.cycle)) { | ||
| logger.error({ type: 'paddle', data }, 'User is already a Plus member'); | ||
| return false; | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Moved to its own function to lessen the noise here.
This comment has been minimized.
This comment has been minimized.
capJavert
reviewed
Feb 10, 2025
capJavert
reviewed
Feb 10, 2025
src/routes/webhooks/paddle.ts
Outdated
Comment on lines
421
to
423
| export const processTransactionCompleted = async ( | ||
| result: TransactionCompletedEvent, | ||
| ) => { |
There was a problem hiding this comment.
Let's make it accept object { data } or whatever, easier to expand later
There was a problem hiding this comment.
The whole object was needed originally, and didn't want to make any change outside the gifting, but yeah, I can update the other functions too.
There was a problem hiding this comment.
@sshanzel you can still do the whole object, just wanted to move to object syntax since you are adding this helper.
There was a problem hiding this comment.
export const processTransactionCompleted = async ({
result: TransactionCompletedEvent,
}) => PromiseThere was a problem hiding this comment.
Ah, cool, yeah, we can do that.
capJavert
reviewed
Feb 10, 2025
src/routes/webhooks/paddle.ts
Outdated
| @@ -405,6 +370,66 @@ const notifyNewPaddleTransaction = async ({ | |||
| await webhooks.transactions.send({ blocks }); | |||
| }; | |||
|
|
|||
| export const processGiftedPayment = async ( | |||
There was a problem hiding this comment.
capJavert
reviewed
Feb 10, 2025
capJavert
approved these changes
Feb 10, 2025
Co-authored-by: Ante Barić <[email protected]>
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
rebelchris
approved these changes
Feb 10, 2025
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
🍹 The Update (preview) for dailydotdev/api/prod was successful. Resource Changes Name Type Operation
~ vpc-native-personalized-digest-cron kubernetes:batch/v1:CronJob update
~ vpc-native-private-deployment kubernetes:apps/v1:Deployment update
~ vpc-native-update-trending-cron kubernetes:batch/v1:CronJob update
~ vpc-native-sync-subscription-with-cio-cron kubernetes:batch/v1:CronJob update
~ vpc-native-ws-deployment kubernetes:apps/v1:Deployment update
~ vpc-native-update-source-public-threshold-cron kubernetes:batch/v1:CronJob update
~ vpc-native-clean-gifted-plus-cron kubernetes:batch/v1:CronJob update
~ vpc-native-hourly-notification-cron kubernetes:batch/v1:CronJob update
~ vpc-native-calculate-top-readers-cron kubernetes:batch/v1:CronJob update
~ vpc-native-generic-referral-reminder-cron kubernetes:batch/v1:CronJob update
~ vpc-native-update-highlighted-views-cron kubernetes:batch/v1:CronJob update
- vpc-native-api-migration-75584513 kubernetes:batch/v1:Job delete
~ vpc-native-validate-active-users-cron kubernetes:batch/v1:CronJob update
~ vpc-native-clean-zombie-images-cron kubernetes:batch/v1:CronJob update
~ vpc-native-personalized-digest-deployment kubernetes:apps/v1:Deployment update
~ vpc-native-update-current-streak-cron kubernetes:batch/v1:CronJob update
~ vpc-native-temporal-deployment kubernetes:apps/v1:Deployment update
~ vpc-native-update-tags-str-cron kubernetes:batch/v1:CronJob update
~ vpc-native-deployment kubernetes:apps/v1:Deployment update
~ vpc-native-generate-search-invites-cron kubernetes:batch/v1:CronJob update
~ vpc-native-bg-deployment kubernetes:apps/v1:Deployment update
~ vpc-native-daily-digest-cron kubernetes:batch/v1:CronJob update
~ vpc-native-clean-zombie-users-cron kubernetes:batch/v1:CronJob update
~ vpc-native-update-source-tag-view-cron kubernetes:batch/v1:CronJob update
~ vpc-native-update-tag-recommendations-cron kubernetes:batch/v1:CronJob update
+ vpc-native-api-migration-7c5d7b35 kubernetes:batch/v1:Job create
~ vpc-native-check-analytics-report-cron kubernetes:batch/v1:CronJob update
~ vpc-native-update-views-cron kubernetes:batch/v1:CronJob update
~ vpc-native-clean-zombie-user-companies-cron kubernetes:batch/v1:CronJob update
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
One-time payments are not considered subscriptions in Paddle's dictionary, so we must handle the event for gifting within the TransactionCompleted. Events available are as below:
Test cases still check out.