fix: resolve merge conflict in subscriptions.ts, retain giftCardService import#197
Open
Rickyy1017 wants to merge 1 commit intoCalebux:mainfrom
Open
fix: resolve merge conflict in subscriptions.ts, retain giftCardService import#197Rickyy1017 wants to merge 1 commit intoCalebux:mainfrom
Rickyy1017 wants to merge 1 commit intoCalebux:mainfrom
Conversation
|
@Rickyy1017 is attempting to deploy a commit to the Calebux's projects Team on Vercel. A member of the Team first needs to authorize it. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Resolved the unresolved git merge conflict in backend/src/routes/subscriptions.ts.
Resolution: Retained the HEAD import block which includes giftCardService, as it is actively used in the POST /:id/attach-gift-card route handler (giftCardService.attachGiftCard(...)). Removing it would break that endpoint.
Additionally fixed two calls to subscriptionService.deleteSubscription() which does not exist on SubscriptionService replaced with subscriptionService.cancelSubscription() which is the correct method per the service layer.
subscriptions.ts now produces zero TypeScript errors. Remaining build errors are in unrelated files (batch.module.ts, scheduler.ts, merchants.ts etc.) and pre-existed before this change.
Tested: npm run build subscriptions.ts removed from error output.