[#507] fix: make delivery recording recoverable when contract call fails - #533
Open
payfoxX wants to merge 3 commits into
Open
[#507] fix: make delivery recording recoverable when contract call fails#533payfoxX wants to merge 3 commits into
payfoxX wants to merge 3 commits into
Conversation
…all fails Swapped the order of operations in TrackingPollWorker.run: contractService.recordDelivery is now called before escrowRepository.markDelivered. If the chain call fails, the escrow remains in SHIPPED state and will be retried on the next poll cycle. This follows the same claim-before-chain pattern used by AutoReleaseWorker. Closes JSE-ORG#507
|
@Myart352 Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits. You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀 |
payfoxX
changed the title
The @optional() decorator was used without importing Optional from @nestjs/common. This caused tests importing PrismaService to fail.
Fixed duplicated content in escrow.service.spec.ts (3 copies -> 1), sync throw issue in prisma.service.spec.ts, and missing closing brace in api-keys.controller.spec.ts. These are pre-existing bugs on dev that were causing CI failures.
Contributor
|
check and resolve your conflicts |
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
2 participants
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.
Closes #507
Problem
TrackingPollWorker.run called markDelivered BEFORE recordDelivery. If the contract call failed, the escrow was already DELIVERED in the database, so findShippedWithTracking would not return it again. The contract was never told, and no retry was possible.
Solution
Reversed the order: call recordDelivery FIRST, then markDelivered. If the chain call fails, the escrow remains SHIPPED and will be retried on the next poll cycle. This follows the same claim-before-chain pattern used by AutoReleaseWorker.
Changes Made
Test Results
All 3 existing tests pass.