feat(s5): Modulr SEPA payout adapter + 7 WireMock tests (STA-152)#156
Merged
Conversation
… 24 ITs (STA-149, STA-150) 3 JPA entities (PayoutOrder with @Version optimistic locking, StablecoinRedemption, OffRampTransaction with @JdbcTypeCode(SqlTypes.JSON) for JSONB), 3 Spring Data JPA repositories, 4 MapStruct mappers (including PayoutOrderEntityUpdater for in-place Hibernate update), 3 persistence adapters implementing domain ports, V2 migration adding BankAccount (4 cols) and MobileMoneyAccount (3 cols) to payout_orders. 24 integration tests: 13 PayoutOrder (CRUD, state machine happy/failure paths, unique constraints, findBy queries), 5 StablecoinRedemption (save, findById, findByPayoutId, ticker round-trip), 6 OffRampTransaction (append-only, JSONB round-trip, multiple per payout). 181 total tests (149 unit + 8 ArchUnit + 24 IT). Closes STA-149 Closes STA-150 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… ordered queries, new ITs (STA-150) - Fail-fast on partial bank/mobile columns in PayoutOrderPersistenceMapper - Scope sp_readonly GRANT to service-specific tables in V2 migration - Add deterministic ordering to OffRampTransactionJpaRepository (receivedAt ASC) - Add optimistic locking IT for PayoutOrderEntity @Version - Add FK constraint IT for StablecoinRedemption Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
CircleRedemptionAdapter implements RedemptionGateway port via Circle Business Account Payouts API (POST /v1/businessAccount/payouts). Bearer API key auth, @CIRCUITBREAKER, HTTP/1.1. Package-private ACL DTOs. FallbackAdaptersConfig provides dev RedemptionGateway. 188 total tests (149 unit + 8 ArchUnit + 7 WireMock + 24 IT). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Puneethkumarck
added
phase-3
WalkthroughIntroduces complete persistence infrastructure for off-ramp payment transactions: JPA entities and repositories for OffRampTransaction, PayoutOrder, and StablecoinRedemption; MapStruct mappers with nested object validation; repository pattern adapters; Circle-based redemption provider with REST client; fallback adapter; database schema extensions; and comprehensive integration tests. Changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~50 minutes Rationale: Heterogeneous changes across persistence infrastructure, mappers with nested validation logic (PayoutOrderPersistenceMapper enforces invariants on partial BankAccount/MobileMoneyAccount data), Circle HTTP client with circuit-breaker resilience patterns, and integration tests validating database constraints and state transitions. PayoutOrderPersistenceMapper's error-handling paths and schema migration's role-based grants warrant careful review. Possibly related PRs
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches
🧪 Generate unit tests (beta)
Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 15
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In
`@fiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/OffRampTransactionPersistenceAdapterIT.java`:
- Around line 99-112: The test currently asserts only a substring of the stored
JSON (results.getFirst().rawResponse() contains "mod_txn_999"), which misses
double-serialization bugs; update the assertion to compare the semantic JSON
payload instead: retrieve rawResponse via
adapter.findByPayoutId(...).getFirst().rawResponse(), parse it into a JSON tree
(e.g., with ObjectMapper.readTree) and compare it against the expected JSON tree
created from the original string used in OffRampTransaction.create (or construct
an expected JsonNode), ensuring the trees are equal; update the test method
shouldPersistRawResponseJsonb to use OffRampTransaction.create, adapter.save,
adapter.findByPayoutId and then assert JSON equality rather than substring
containment.
In
`@fiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/PayoutOrderPersistenceAdapterIT.java`:
- Around line 234-250: The test shouldThrowOnStaleUpdate in
PayoutOrderPersistenceAdapterIT needs a short clarifying note and/or explicit
version assertions to show why entityManager.detach(second) is required: add a
one-line comment above entityManager.detach(second) explaining that without
detach Hibernate would refresh second from the persistence context (so detach
forces a stale version), and optionally assert the entity version before
saveAndFlush(first) and after to demonstrate the version increment (referencing
variables first, second, jpa.saveAndFlush(first), and
entityManager.detach(second)); keep the test logic unchanged and only add the
comment and/or lightweight assertions to make the optimistic-locking behavior
explicit.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/config/FallbackAdaptersConfig.java`:
- Line 33: Replace the magic literal 0.92 in the multiplication inside
FallbackAdaptersConfig with a named constant: add a static final BigDecimal
constant (e.g., EIGHT_PERCENT_DISCOUNT or DISCOUNT_FACTOR) in the class
FallbackAdaptersConfig, initialize it to new BigDecimal("0.92"), add a short
comment describing it as the 8% discount factor, and use that constant in the
call that currently does request.amount().multiply(new BigDecimal("0.92")) so
the discount is documented and easily discoverable.
- Around line 25-38: The fallbackRedemptionGateway bean uses Instant.now()
directly which breaks time-based testing; change fallbackRedemptionGateway() to
obtain and use an injected Clock (e.g., accept Clock or ObjectProvider<Clock> as
a parameter) and replace Instant.now() with clock.instant() when building the
RedemptionResult; if bean ordering/circular issues exist, inject
ObjectProvider<Clock> or a Supplier<Clock> and call provider.get().instant()
inside the lambda so the Clock is resolved lazily.
- Around line 25-38: The FallbackAdaptersConfig currently provides fallbacks for
RedemptionGateway and Clock but is missing a `@ConditionalOnMissingBean` fallback
for PayoutPartnerGateway; add a bean method in FallbackAdaptersConfig named
something like fallbackPayoutPartnerGateway annotated with `@Bean` and
`@ConditionalOnMissingBean` that returns a PayoutPartnerGateway implementation
which logs a warning (use log.warn with context like payoutId or request
details) and returns a safe dev behavior (either a sensible default response
object or a clear failure/unsupported result) so the hexagonal port is always
satisfied when no real bean is provided.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/OffRampTransactionJpaRepository.java`:
- Line 10: The repository method findByPayoutIdOrderByReceivedAtAsc currently
orders only by receivedAt which can yield non-deterministic ordering when
timestamps tie; update the query method in OffRampTransactionJpaRepository to
include a stable tiebreaker (e.g., append IdAsc or createdAt) so results are
deterministic (for example change to findByPayoutIdOrderByReceivedAtAscIdAsc),
and verify OffRampTransactionPersistenceAdapter.findByPayoutId(...) still
compiles/uses the repo method after renaming. Ensure the chosen secondary field
is the entity primary key (id) or another immutable column to guarantee stable
ordering.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/mapper/OffRampTransactionPersistenceMapper.java`:
- Around line 14-24: The mapper currently always calls
.rawResponse(transaction.rawResponse()) in OffRampTransactionPersistenceMapper
which overrides OffRampTransactionEntity's `@Builder.Default` and breaks when
transaction.rawResponse() is null; modify the mapping to only set rawResponse on
the builder when transaction.rawResponse() is non-null (e.g., check
transaction.rawResponse() != null and then call .rawResponse(...)), leaving the
builder to use its default when the domain value is null so persistence won't
fail.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/mapper/PayoutOrderPersistenceMapper.java`:
- Around line 62-65: The mapping silently drops partially populated
off_ramp_partner columns; add a private static PartnerIdentifier
mapOffRampPartner(PayoutOrderEntity entity) that checks hasId =
entity.getOffRampPartnerId() != null and hasName =
entity.getOffRampPartnerName() != null, return null if both false, throw an
IllegalStateException if only one is present (include hasId/hasName in the
message), and otherwise return new
PartnerIdentifier(entity.getOffRampPartnerId(), entity.getOffRampPartnerName());
replace the current inline creation in PayoutOrderPersistenceMapper with a call
to mapOffRampPartner to fail fast on corrupted payout_orders rows.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/PayoutOrderPersistenceAdapter.java`:
- Around line 27-33: The save path in PayoutOrderPersistenceAdapter currently
overlays the fresh entity without applying the caller's version, bypassing
optimistic locking; update the PayoutOrder record to include a version field,
propagate that version through mapper.toEntity/toDomain, and modify
PayoutOrderEntityUpdater.updateEntity(existingEntity, order) to set the entity's
version from order.version before saving so the JPA save will include the
caller-observed version and trigger an OptimisticLockingFailureException on
concurrent updates.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/StablecoinRedemptionPersistenceAdapter.java`:
- Around line 33-34: The adapter assumes one-to-one but the DB allows multiples;
change the JPA repository method signature from returning Optional to List
(e.g., List<StablecoinRedemptionEntity> findByPayoutId(UUID payoutId)) and
update StablecoinRedemptionPersistenceAdapter.findByPayoutId(UUID) to call
jpa.findByPayoutId(payoutId), handle the returned List (return Optional.empty()
if empty, decide behavior for multiple rows — either throw a
NonUniqueResultException or pick the first entry), and map entities using
mapper::toDomain for the chosen item(s); alternatively, instead of code changes
you can add a unique constraint on stablecoin_redemptions.payout_id in the DB
migration so the existing Optional-based jpa.findByPayoutId and adapter logic
remain valid.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapter.java`:
- Around line 63-69: The code in CircleRedemptionAdapter currently dereferences
the response body and payout data without null checks (the variables response,
payoutData, and fields on CirclePayoutResponse), which can cause NPEs when
Circle returns an empty or partial body; update the post/retrieve/body handling
to validate that response != null and response.data() != null and that required
fields like data().amount() are present before using them, and if any are
missing throw or return a clear, partner-contract-aware error (preserving
partner/contract identifiers) so callers receive context rather than an NPE.
- Around line 75-79: The RedemptionResult currently sets redeemedAt using
Instant.now() in CircleRedemptionAdapter; change this to map the provider
timestamp (e.g., payoutData.createDate()) into the RedemptionResult instead of
using the local clock. Locate the code that constructs new RedemptionResult in
CircleRedemptionAdapter and replace Instant.now() with a parsed Instant from
payoutData.createDate() (e.g., Instant.parse(...) or
OffsetDateTime.parse(...).toInstant() depending on the format), ensuring any
necessary null/format handling so the provider timestamp is used as redeemedAt.
- Around line 52-87: The redeemFallback currently accepts Exception which causes
Resilience4j to route all errors into the fallback; change the fallback overload
to accept CallNotPermittedException instead so only open-circuit rejections are
handled: replace the method signature redeemFallback(RedemptionRequest request,
Exception ex) with redeemFallback(RedemptionRequest request,
CallNotPermittedException ex) in CircleRedemptionAdapter, keep the same log call
and rethrow (or return a degraded response) so other exceptions from redeem(...)
propagate normally; ensure you import
io.github.resilience4j.circuitbreaker.CallNotPermittedException.
In `@fiat-off-ramp/fiat-off-ramp/src/main/resources/application.yml`:
- Around line 120-125: Remove the placeholder defaults for Circle credentials
and destination so startup fails when values are not provided: in
application.yml remove the fallback values for CIRCLE_BASE_URL, CIRCLE_API_KEY
and CIRCLE_DESTINATION_ID under redemption.circle (leave them as ${...} with no
default), and update the CircleProperties class (the configuration
properties/bean that maps redemption.circle fields) to make
baseUrl/apiKey/destinationId required (remove default field values and add
validation — e.g., `@NotBlank` or constructor-binding with non-null parameters —
or throw a clear exception during bean creation), ensuring the app fails fast if
those properties are missing.
In
`@fiat-off-ramp/fiat-off-ramp/src/test/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapterTest.java`:
- Around line 108-109: The tests in CircleRedemptionAdapterTest currently assert
any Exception from adapter.redeem(aRedemptionRequest()), which is too broad;
update those assertions to expect the specific exception class and/or message
that the adapter should throw for each scenario (e.g., AuthenticationException,
ValidationException, TimeoutException or a custom CircleRedemptionException) and
verify meaningful details (error code or message) rather than Exception.class;
locate the failing assertions in CircleRedemptionAdapterTest (calls to
adapter.redeem and aRedemptionRequest()) and replace
assertThatThrownBy(...).isInstanceOf(Exception.class) with assertions that check
the concrete exception type and relevant message or error field for each
scenario, repeating the same change for the other occurrences noted (around the
second, third, and fourth occurrences).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: cd465d05-e952-4607-a811-f25a53f1ac01
📒 Files selected for processing (24)
fiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/OffRampTransactionPersistenceAdapterIT.javafiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/PayoutOrderPersistenceAdapterIT.javafiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/StablecoinRedemptionPersistenceAdapterIT.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/config/FallbackAdaptersConfig.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/OffRampTransactionPersistenceAdapter.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/PayoutOrderPersistenceAdapter.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/StablecoinRedemptionPersistenceAdapter.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/OffRampTransactionEntity.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/OffRampTransactionJpaRepository.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/PayoutOrderEntity.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/PayoutOrderJpaRepository.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/StablecoinRedemptionEntity.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/StablecoinRedemptionJpaRepository.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/mapper/OffRampTransactionPersistenceMapper.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/mapper/PayoutOrderEntityUpdater.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/mapper/PayoutOrderPersistenceMapper.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/mapper/StablecoinRedemptionPersistenceMapper.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CirclePayoutRequest.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CirclePayoutResponse.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleProperties.javafiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapter.javafiat-off-ramp/fiat-off-ramp/src/main/resources/application.ymlfiat-off-ramp/fiat-off-ramp/src/main/resources/db/migration/V2__add_bank_and_mobile_money_columns.sqlfiat-off-ramp/fiat-off-ramp/src/test/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapterTest.java
Comment on lines
+99
to
+112
| @Test | ||
| @DisplayName("should persist raw response JSONB") | ||
| void shouldPersistRawResponseJsonb() { | ||
| var order = savePayoutOrder(); | ||
| var txn = OffRampTransaction.create( | ||
| order.payoutId(), "modulr", "payout.completed", | ||
| new BigDecimal("920.00"), "EUR", "completed", | ||
| "{\"id\":\"mod_txn_999\",\"amount\":920.00,\"currency\":\"EUR\"}"); | ||
| adapter.save(txn); | ||
|
|
||
| var results = adapter.findByPayoutId(order.payoutId()); | ||
| assertThat(results).hasSize(1); | ||
| assertThat(results.getFirst().rawResponse()).contains("mod_txn_999"); | ||
| } |
There was a problem hiding this comment.
Assert the full JSONB payload, not a substring.
Line 111 only checks for "mod_txn_999". That still passes if rawResponse is double-serialized or stored as a JSON string literal instead of the expected JSON document. Compare the payload semantically.
Suggested change
`@Test`
`@DisplayName`("should persist raw response JSONB")
- void shouldPersistRawResponseJsonb() {
+ void shouldPersistRawResponseJsonb() throws Exception {
var order = savePayoutOrder();
+ var expectedJson = "{\"id\":\"mod_txn_999\",\"amount\":920.00,\"currency\":\"EUR\"}";
var txn = OffRampTransaction.create(
order.payoutId(), "modulr", "payout.completed",
new BigDecimal("920.00"), "EUR", "completed",
- "{\"id\":\"mod_txn_999\",\"amount\":920.00,\"currency\":\"EUR\"}");
+ expectedJson);
adapter.save(txn);
var results = adapter.findByPayoutId(order.payoutId());
assertThat(results).hasSize(1);
- assertThat(results.getFirst().rawResponse()).contains("mod_txn_999");
+ var objectMapper = new com.fasterxml.jackson.databind.ObjectMapper();
+ assertThat(objectMapper.readTree(results.getFirst().rawResponse()))
+ .isEqualTo(objectMapper.readTree(expectedJson));
}🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/OffRampTransactionPersistenceAdapterIT.java`
around lines 99 - 112, The test currently asserts only a substring of the stored
JSON (results.getFirst().rawResponse() contains "mod_txn_999"), which misses
double-serialization bugs; update the assertion to compare the semantic JSON
payload instead: retrieve rawResponse via
adapter.findByPayoutId(...).getFirst().rawResponse(), parse it into a JSON tree
(e.g., with ObjectMapper.readTree) and compare it against the expected JSON tree
created from the original string used in OffRampTransaction.create (or construct
an expected JsonNode), ensuring the trees are equal; update the test method
shouldPersistRawResponseJsonb to use OffRampTransaction.create, adapter.save,
adapter.findByPayoutId and then assert JSON equality rather than substring
containment.
Comment on lines
+234
to
+250
| @Test | ||
| @DisplayName("should throw on stale version update (optimistic locking)") | ||
| void shouldThrowOnStaleUpdate() { | ||
| var saved = adapter.save(aPendingOrder()); | ||
|
|
||
| var first = jpa.findById(saved.payoutId()).orElseThrow(); | ||
| var second = jpa.findById(saved.payoutId()).orElseThrow(); | ||
|
|
||
| first.setStatus(PayoutStatus.REDEEMING); | ||
| jpa.saveAndFlush(first); | ||
|
|
||
| entityManager.detach(second); | ||
| second.setStatus(PayoutStatus.REDEEMING); | ||
|
|
||
| assertThatThrownBy(() -> jpa.saveAndFlush(second)) | ||
| .isInstanceOf(ObjectOptimisticLockingFailureException.class); | ||
| } |
There was a problem hiding this comment.
🧹 Nitpick | 🔵 Trivial
Optimistic locking test is correct but could be clearer.
The test works, but the mechanics are subtle:
- Both
firstandsecondare loaded with the same version - After
saveAndFlush(first), the DB version increments detach(second)is crucial — without it, Hibernate would refreshsecondfrom session cache
Consider adding a brief comment explaining why detach is necessary, or asserting the version before/after to make the test self-documenting:
📝 Suggested clarifying comment
entityManager.detach(second);
+ // second is now stale (version 0) while DB has version 1
second.setStatus(PayoutStatus.REDEEMING);🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/integration-test/java/com/stablecoin/payments/offramp/infrastructure/persistence/PayoutOrderPersistenceAdapterIT.java`
around lines 234 - 250, The test shouldThrowOnStaleUpdate in
PayoutOrderPersistenceAdapterIT needs a short clarifying note and/or explicit
version assertions to show why entityManager.detach(second) is required: add a
one-line comment above entityManager.detach(second) explaining that without
detach Hibernate would refresh second from the persistence context (so detach
forces a stale version), and optionally assert the entity version before
saveAndFlush(first) and after to demonstrate the version increment (referencing
variables first, second, jpa.saveAndFlush(first), and
entityManager.detach(second)); keep the test logic unchanged and only add the
comment and/or lightweight assertions to make the optimistic-locking behavior
explicit.
Comment on lines
+25
to
+38
| @Bean | ||
| @ConditionalOnMissingBean | ||
| public RedemptionGateway fallbackRedemptionGateway() { | ||
| return request -> { | ||
| log.warn("[FALLBACK-REDEMPTION] Using dev redemption gateway payoutId={} amount={}", | ||
| request.payoutId(), request.amount()); | ||
| return new RedemptionResult( | ||
| "dev-redeem-" + UUID.randomUUID(), | ||
| request.amount().multiply(new BigDecimal("0.92")), | ||
| "EUR", | ||
| Instant.now() | ||
| ); | ||
| }; | ||
| } |
There was a problem hiding this comment.
Use injected Clock instead of Instant.now() for testability.
Line 35 calls Instant.now() directly, but this class already defines a Clock bean (lines 40-44). This breaks time-based testing and is inconsistent with the existing pattern.
Inject the Clock and use clock.instant():
🔧 Proposed fix
+ private final Clock clock;
+
+ public FallbackAdaptersConfig(Clock clock) {
+ this.clock = clock;
+ }
+
`@Bean`
`@ConditionalOnMissingBean`
public RedemptionGateway fallbackRedemptionGateway() {
return request -> {
log.warn("[FALLBACK-REDEMPTION] Using dev redemption gateway payoutId={} amount={}",
request.payoutId(), request.amount());
return new RedemptionResult(
"dev-redeem-" + UUID.randomUUID(),
request.amount().multiply(new BigDecimal("0.92")),
"EUR",
- Instant.now()
+ clock.instant()
);
};
}Note: Since Clock bean is also @ConditionalOnMissingBean, you may need to use ObjectProvider<Clock> or ensure ordering via @DependsOn to avoid circular dependency issues. Alternatively, inject Clock lazily into the lambda.
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| @Bean | |
| @ConditionalOnMissingBean | |
| public RedemptionGateway fallbackRedemptionGateway() { | |
| return request -> { | |
| log.warn("[FALLBACK-REDEMPTION] Using dev redemption gateway payoutId={} amount={}", | |
| request.payoutId(), request.amount()); | |
| return new RedemptionResult( | |
| "dev-redeem-" + UUID.randomUUID(), | |
| request.amount().multiply(new BigDecimal("0.92")), | |
| "EUR", | |
| Instant.now() | |
| ); | |
| }; | |
| } | |
| private final Clock clock; | |
| public FallbackAdaptersConfig(Clock clock) { | |
| this.clock = clock; | |
| } | |
| `@Bean` | |
| `@ConditionalOnMissingBean` | |
| public RedemptionGateway fallbackRedemptionGateway() { | |
| return request -> { | |
| log.warn("[FALLBACK-REDEMPTION] Using dev redemption gateway payoutId={} amount={}", | |
| request.payoutId(), request.amount()); | |
| return new RedemptionResult( | |
| "dev-redeem-" + UUID.randomUUID(), | |
| request.amount().multiply(new BigDecimal("0.92")), | |
| "EUR", | |
| clock.instant() | |
| ); | |
| }; | |
| } |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/config/FallbackAdaptersConfig.java`
around lines 25 - 38, The fallbackRedemptionGateway bean uses Instant.now()
directly which breaks time-based testing; change fallbackRedemptionGateway() to
obtain and use an injected Clock (e.g., accept Clock or ObjectProvider<Clock> as
a parameter) and replace Instant.now() with clock.instant() when building the
RedemptionResult; if bean ordering/circular issues exist, inject
ObjectProvider<Clock> or a Supplier<Clock> and call provider.get().instant()
inside the lambda so the Clock is resolved lazily.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Check if PayoutPartnerGateway fallback exists elsewhere or is missing
echo "=== Searching for PayoutPartnerGateway fallback beans ==="
rg -n '@ConditionalOnMissingBean' --type=java -A3 | rg -i 'PayoutPartnerGateway|payout.*gateway'
echo ""
echo "=== Listing all beans in FallbackAdaptersConfig ==="
ast-grep --pattern $'@Bean
$$$
public $_ $_() {
$$$
}'Repository: Puneethkumarck/stablebridge-platform
Length of output: 190
🏁 Script executed:
#!/bin/bash
# Find and read the FallbackAdaptersConfig.java file
echo "=== Finding FallbackAdaptersConfig file ==="
find . -name "FallbackAdaptersConfig.java" -type fRepository: Puneethkumarck/stablebridge-platform
Length of output: 1035
🏁 Script executed:
#!/bin/bash
# Search for PayoutPartnerGateway references in entire codebase
echo "=== Searching for PayoutPartnerGateway references ==="
rg -n 'PayoutPartnerGateway' --type=java
echo ""
echo "=== Searching for fallback gateway beans ==="
rg -n '@Bean' --type=java -A2 | rg -B2 -i 'fallback.*gateway|gateway.*fallback'Repository: Puneethkumarck/stablebridge-platform
Length of output: 1183
🏁 Script executed:
#!/bin/bash
echo "=== Full content of fiat-off-ramp FallbackAdaptersConfig.java ==="
cat -n ./fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/config/FallbackAdaptersConfig.javaRepository: Puneethkumarck/stablebridge-platform
Length of output: 1929
🏁 Script executed:
#!/bin/bash
echo "=== PayoutPartnerGateway interface definition ==="
cat -n ./fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/domain/port/PayoutPartnerGateway.java
echo ""
echo "=== Searching for PayoutPartnerGateway bean instantiation or usage in offramp module ==="
rg -n 'PayoutPartnerGateway' ./fiat-off-ramp --type=java -B2 -A5Repository: Puneethkumarck/stablebridge-platform
Length of output: 1514
Add PayoutPartnerGateway fallback bean or clarify PR scope.
PayoutPartnerGateway interface is defined in this module but has no fallback implementation. The file currently provides only RedemptionGateway and Clock beans. Either add a @ConditionalOnMissingBean fallback for PayoutPartnerGateway to match the stated PR objective, or update the PR description to reflect actual scope. Leaving the port without a fallback breaks the hexagonal architecture pattern established in this FallbackAdaptersConfig.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/config/FallbackAdaptersConfig.java`
around lines 25 - 38, The FallbackAdaptersConfig currently provides fallbacks
for RedemptionGateway and Clock but is missing a `@ConditionalOnMissingBean`
fallback for PayoutPartnerGateway; add a bean method in FallbackAdaptersConfig
named something like fallbackPayoutPartnerGateway annotated with `@Bean` and
`@ConditionalOnMissingBean` that returns a PayoutPartnerGateway implementation
which logs a warning (use log.warn with context like payoutId or request
details) and returns a safe dev behavior (either a sensible default response
object or a clear failure/unsupported result) so the hexagonal port is always
satisfied when no real bean is provided.
| request.payoutId(), request.amount()); | ||
| return new RedemptionResult( | ||
| "dev-redeem-" + UUID.randomUUID(), | ||
| request.amount().multiply(new BigDecimal("0.92")), |
There was a problem hiding this comment.
🧹 Nitpick | 🔵 Trivial
Extract magic number 0.92 to a named constant.
The 8% discount simulation is undocumented. A constant improves readability and grep-ability.
♻️ Suggested improvement
+ /** Simulates ~8 % fee deduction in fallback redemption. */
+ private static final BigDecimal DEV_FEE_MULTIPLIER = new BigDecimal("0.92");
+
`@Bean`
`@ConditionalOnMissingBean`
public RedemptionGateway fallbackRedemptionGateway() {
return request -> {
log.warn("[FALLBACK-REDEMPTION] Using dev redemption gateway payoutId={} amount={}",
request.payoutId(), request.amount());
return new RedemptionResult(
"dev-redeem-" + UUID.randomUUID(),
- request.amount().multiply(new BigDecimal("0.92")),
+ request.amount().multiply(DEV_FEE_MULTIPLIER),
"EUR",
Instant.now()
);
};
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| request.amount().multiply(new BigDecimal("0.92")), | |
| /** Simulates ~8 % fee deduction in fallback redemption. */ | |
| private static final BigDecimal DEV_FEE_MULTIPLIER = new BigDecimal("0.92"); | |
| `@Bean` | |
| `@ConditionalOnMissingBean` | |
| public RedemptionGateway fallbackRedemptionGateway() { | |
| return request -> { | |
| log.warn("[FALLBACK-REDEMPTION] Using dev redemption gateway payoutId={} amount={}", | |
| request.payoutId(), request.amount()); | |
| return new RedemptionResult( | |
| "dev-redeem-" + UUID.randomUUID(), | |
| request.amount().multiply(DEV_FEE_MULTIPLIER), | |
| "EUR", | |
| Instant.now() | |
| ); | |
| }; | |
| } |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/config/FallbackAdaptersConfig.java`
at line 33, Replace the magic literal 0.92 in the multiplication inside
FallbackAdaptersConfig with a named constant: add a static final BigDecimal
constant (e.g., EIGHT_PERCENT_DISCOUNT or DISCOUNT_FACTOR) in the class
FallbackAdaptersConfig, initialize it to new BigDecimal("0.92"), add a short
comment describing it as the 8% discount factor, and use that constant in the
call that currently does request.amount().multiply(new BigDecimal("0.92")) so
the discount is documented and easily discoverable.
|
|
||
| public interface OffRampTransactionJpaRepository extends JpaRepository<OffRampTransactionEntity, UUID> { | ||
|
|
||
| List<OffRampTransactionEntity> findByPayoutIdOrderByReceivedAtAsc(UUID payoutId); |
There was a problem hiding this comment.
Make payout-history ordering deterministic.
Line 10 sorts only by receivedAt. If two partner events land on the same persisted timestamp, the database can return them in arbitrary order, and OffRampTransactionPersistenceAdapter.findByPayoutId(...) will propagate that instability upstream. Add a stable tiebreaker.
Suggested change
- List<OffRampTransactionEntity> findByPayoutIdOrderByReceivedAtAsc(UUID payoutId);
+ List<OffRampTransactionEntity> findByPayoutIdOrderByReceivedAtAscOffRampTxnIdAsc(UUID payoutId);📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| List<OffRampTransactionEntity> findByPayoutIdOrderByReceivedAtAsc(UUID payoutId); | |
| List<OffRampTransactionEntity> findByPayoutIdOrderByReceivedAtAscOffRampTxnIdAsc(UUID payoutId); |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/persistence/entity/OffRampTransactionJpaRepository.java`
at line 10, The repository method findByPayoutIdOrderByReceivedAtAsc currently
orders only by receivedAt which can yield non-deterministic ordering when
timestamps tie; update the query method in OffRampTransactionJpaRepository to
include a stable tiebreaker (e.g., append IdAsc or createdAt) so results are
deterministic (for example change to findByPayoutIdOrderByReceivedAtAscIdAsc),
and verify OffRampTransactionPersistenceAdapter.findByPayoutId(...) still
compiles/uses the repo method after renaming. Ensure the chosen secondary field
is the entity primary key (id) or another immutable column to guarantee stable
ordering.
Comment on lines
+52
to
+87
| @CircuitBreaker(name = "circle", fallbackMethod = "redeemFallback") | ||
| public RedemptionResult redeem(RedemptionRequest request) { | ||
| log.info("[CIRCLE] Redeeming stablecoin payoutId={} stablecoin={} amount={}", | ||
| request.payoutId(), request.stablecoin(), request.amount()); | ||
|
|
||
| var circleRequest = new CirclePayoutRequest( | ||
| request.payoutId().toString(), | ||
| new CirclePayoutRequest.CircleDestination("wire", properties.destinationId()), | ||
| new CirclePayoutRequest.CircleAmount(request.amount().toPlainString(), "USD") | ||
| ); | ||
|
|
||
| var response = restClient.post() | ||
| .uri("/v1/businessAccount/payouts") | ||
| .body(circleRequest) | ||
| .retrieve() | ||
| .body(CirclePayoutResponse.class); | ||
|
|
||
| var payoutData = response.data(); | ||
|
|
||
| log.info("[CIRCLE] Redemption initiated payoutId={} circleRef={} status={} fiatAmount={} currency={}", | ||
| request.payoutId(), payoutData.id(), payoutData.status(), | ||
| payoutData.amount().amount(), payoutData.amount().currency()); | ||
|
|
||
| return new RedemptionResult( | ||
| payoutData.id(), | ||
| new BigDecimal(payoutData.amount().amount()), | ||
| payoutData.amount().currency(), | ||
| Instant.now() | ||
| ); | ||
| } | ||
|
|
||
| @SuppressWarnings("unused") | ||
| private RedemptionResult redeemFallback(RedemptionRequest request, Exception ex) { | ||
| log.error("[CIRCLE] Circuit breaker open — redemption failed payoutId={}", | ||
| request.payoutId(), ex); | ||
| throw new IllegalStateException("Circle redemption unavailable", ex); |
There was a problem hiding this comment.
🧩 Analysis chain
🌐 Web query:
Resilience4j Spring Boot @CIRCUITBREAKERfallbackMethod semantics: is the fallback called for any exception from the annotated method or only when the circuit is open? What is the recommended way to handle onlyCallNotPermittedException for an open circuit?
💡 Result:
With Resilience4j’s Spring @CircuitBreaker(fallbackMethod=...), the fallback is not only for “circuit is OPEN”. It is invoked whenever the annotated invocation results in a throwable that matches one of your fallback method signatures (same args as the original method + a last parameter that is a Throwable subtype). If you declare the fallback with a broad last parameter like Throwable/Exception/RuntimeException, it will also run for ordinary failures while the circuit is still CLOSED (e.g., timeouts, IOException, etc.), not just for open-circuit short-circuits. Resilience4j picks the most specific matching fallback overload based on the thrown exception type. [1]
When the circuit is OPEN, Resilience4j rejects calls by throwing CallNotPermittedException. [2]
Recommended way to handle only open-circuit (CallNotPermittedException)
Provide a fallback overload that only accepts CallNotPermittedException (and avoid a broader Throwable fallback if you don’t want to catch other failures):
`@CircuitBreaker`(name = "backend", fallbackMethod = "onOpenCircuit")
public String callBackend(String id) {
return backend.call(id);
}
private String onOpenCircuit(String id, CallNotPermittedException ex) {
return "circuit-open-fallback";
}Because fallback matching is type-based, this fallback will run only when the circuit is open (i.e., when CallNotPermittedException is thrown), and other exceptions will propagate normally. This pattern is also a commonly cited workaround/approach when you want retries (or callers) to still see the original exception unless the circuit is open. [1]
If you also want a general fallback for other exceptions, add a second overload with a broader exception type; Resilience4j will choose the most specific one first. [1]
Sources: Resilience4j FallbackMethod matching rules [1]; CircuitBreaker OPEN-state rejection exception (CallNotPermittedException) [2]; discussion/workaround recommending CallNotPermittedException-typed fallback for “open only” behavior [1].
[1] (javadoc.io)
[2] (resilience4j.readme.io)
Citations:
- 1: https://javadoc.io/static/io.github.resilience4j/resilience4j-spring/2.3.0/io/github/resilience4j/fallback/FallbackMethod.html
- 2: https://resilience4j.readme.io/v1.3.0/docs/circuitbreaker
Change the fallback to only handle CallNotPermittedException for open-circuit scenarios.
The current fallback method accepts Exception, which means Resilience4j invokes it for any exception thrown by redeem()—not just when the circuit is open. This masks the original failure (validation errors, auth failures, timeouts) and rewrites them all to the same IllegalStateException, breaking retry and error diagnostics.
Resilience4j throws CallNotPermittedException only when the circuit is open. Provide a fallback overload that accepts only that exception type so other failures propagate normally:
`@CircuitBreaker`(name = "circle", fallbackMethod = "redeemFallback")
public RedemptionResult redeem(RedemptionRequest request) {
// ... existing implementation
}
`@SuppressWarnings`("unused")
private RedemptionResult redeemFallback(RedemptionRequest request, CallNotPermittedException ex) {
log.error("[CIRCLE] Circuit breaker open — redemption failed payoutId={}",
request.payoutId(), ex);
throw ex; // or return degraded response
}This way, ordinary failures are logged and propagated to callers for proper retry/fallback handling, while only true open-circuit rejections hit the fallback.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapter.java`
around lines 52 - 87, The redeemFallback currently accepts Exception which
causes Resilience4j to route all errors into the fallback; change the fallback
overload to accept CallNotPermittedException instead so only open-circuit
rejections are handled: replace the method signature
redeemFallback(RedemptionRequest request, Exception ex) with
redeemFallback(RedemptionRequest request, CallNotPermittedException ex) in
CircleRedemptionAdapter, keep the same log call and rethrow (or return a
degraded response) so other exceptions from redeem(...) propagate normally;
ensure you import
io.github.resilience4j.circuitbreaker.CallNotPermittedException.
Comment on lines
+63
to
+69
| var response = restClient.post() | ||
| .uri("/v1/businessAccount/payouts") | ||
| .body(circleRequest) | ||
| .retrieve() | ||
| .body(CirclePayoutResponse.class); | ||
|
|
||
| var payoutData = response.data(); |
There was a problem hiding this comment.
Validate the success payload before dereferencing it.
Line 69 assumes Circle always returns data and amount on 201. If the body is empty or partially populated, this becomes an NPE and the caller loses the partner-contract context.
Suggested change
var response = restClient.post()
.uri("/v1/businessAccount/payouts")
.body(circleRequest)
.retrieve()
.body(CirclePayoutResponse.class);
+ if (response == null || response.data() == null || response.data().amount() == null) {
+ throw new IllegalStateException("Circle payout response missing required fields");
+ }
+
var payoutData = response.data();📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| var response = restClient.post() | |
| .uri("/v1/businessAccount/payouts") | |
| .body(circleRequest) | |
| .retrieve() | |
| .body(CirclePayoutResponse.class); | |
| var payoutData = response.data(); | |
| var response = restClient.post() | |
| .uri("/v1/businessAccount/payouts") | |
| .body(circleRequest) | |
| .retrieve() | |
| .body(CirclePayoutResponse.class); | |
| if (response == null || response.data() == null || response.data().amount() == null) { | |
| throw new IllegalStateException("Circle payout response missing required fields"); | |
| } | |
| var payoutData = response.data(); |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapter.java`
around lines 63 - 69, The code in CircleRedemptionAdapter currently dereferences
the response body and payout data without null checks (the variables response,
payoutData, and fields on CirclePayoutResponse), which can cause NPEs when
Circle returns an empty or partial body; update the post/retrieve/body handling
to validate that response != null and response.data() != null and that required
fields like data().amount() are present before using them, and if any are
missing throw or return a clear, partner-contract-aware error (preserving
partner/contract identifiers) so callers receive context rather than an NPE.
Comment on lines
+75
to
+79
| return new RedemptionResult( | ||
| payoutData.id(), | ||
| new BigDecimal(payoutData.amount().amount()), | ||
| payoutData.amount().currency(), | ||
| Instant.now() |
There was a problem hiding this comment.
Map redeemedAt from Circle's createDate, not the local clock.
Line 79 stamps the node time even though the response already carries the provider timestamp. That will skew audit/reconciliation data and makes the value nondeterministic across retries.
Suggested change
return new RedemptionResult(
payoutData.id(),
new BigDecimal(payoutData.amount().amount()),
payoutData.amount().currency(),
- Instant.now()
+ Instant.parse(payoutData.createDate())
);🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/main/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapter.java`
around lines 75 - 79, The RedemptionResult currently sets redeemedAt using
Instant.now() in CircleRedemptionAdapter; change this to map the provider
timestamp (e.g., payoutData.createDate()) into the RedemptionResult instead of
using the local clock. Locate the code that constructs new RedemptionResult in
CircleRedemptionAdapter and replace Instant.now() with a parsed Instant from
payoutData.createDate() (e.g., Instant.parse(...) or
OffsetDateTime.parse(...).toInstant() depending on the format), ensuring any
necessary null/format handling so the provider timestamp is used as redeemedAt.
Comment on lines
+120
to
+125
| redemption: | ||
| circle: | ||
| base-url: ${CIRCLE_BASE_URL:https://api-sandbox.circle.com} | ||
| api-key: ${CIRCLE_API_KEY:SAND_API_KEY_DEFAULT} | ||
| destination-id: ${CIRCLE_DESTINATION_ID:default-wire-id} | ||
| timeout-seconds: 10 |
There was a problem hiding this comment.
Require Circle credentials and destination explicitly.
These defaults let the Circle adapter start with placeholder auth and a synthetic payout target whenever app.redemption.provider=circle is enabled. In a payment integration that turns a deployment mistake into runtime traffic. Remove the fallback values here and in CircleProperties so startup fails fast.
Suggested change
redemption:
circle:
base-url: ${CIRCLE_BASE_URL:https://api-sandbox.circle.com}
- api-key: ${CIRCLE_API_KEY:SAND_API_KEY_DEFAULT}
- destination-id: ${CIRCLE_DESTINATION_ID:default-wire-id}
+ api-key: ${CIRCLE_API_KEY}
+ destination-id: ${CIRCLE_DESTINATION_ID}
timeout-seconds: 10📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| redemption: | |
| circle: | |
| base-url: ${CIRCLE_BASE_URL:https://api-sandbox.circle.com} | |
| api-key: ${CIRCLE_API_KEY:SAND_API_KEY_DEFAULT} | |
| destination-id: ${CIRCLE_DESTINATION_ID:default-wire-id} | |
| timeout-seconds: 10 | |
| redemption: | |
| circle: | |
| base-url: ${CIRCLE_BASE_URL:https://api-sandbox.circle.com} | |
| api-key: ${CIRCLE_API_KEY} | |
| destination-id: ${CIRCLE_DESTINATION_ID} | |
| timeout-seconds: 10 |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@fiat-off-ramp/fiat-off-ramp/src/main/resources/application.yml` around lines
120 - 125, Remove the placeholder defaults for Circle credentials and
destination so startup fails when values are not provided: in application.yml
remove the fallback values for CIRCLE_BASE_URL, CIRCLE_API_KEY and
CIRCLE_DESTINATION_ID under redemption.circle (leave them as ${...} with no
default), and update the CircleProperties class (the configuration
properties/bean that maps redemption.circle fields) to make
baseUrl/apiKey/destinationId required (remove default field values and add
validation — e.g., `@NotBlank` or constructor-binding with non-null parameters —
or throw a clear exception during bean creation), ensuring the app fails fast if
those properties are missing.
Comment on lines
+108
to
+109
| assertThatThrownBy(() -> adapter.redeem(aRedemptionRequest())) | ||
| .isInstanceOf(Exception.class); |
There was a problem hiding this comment.
Assert the failure contract, not just Exception.
These assertions pass for auth errors, validation errors, timeouts, and unrelated bugs alike. Pin the concrete exception or message per scenario so the adapter cannot collapse distinct partner failures into one path. As per coding guidelines, "Assert on meaningful values — avoid assertTrue(result != null)".
Also applies to: 126-127, 155-156, 214-215
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In
`@fiat-off-ramp/fiat-off-ramp/src/test/java/com/stablecoin/payments/offramp/infrastructure/provider/circle/CircleRedemptionAdapterTest.java`
around lines 108 - 109, The tests in CircleRedemptionAdapterTest currently
assert any Exception from adapter.redeem(aRedemptionRequest()), which is too
broad; update those assertions to expect the specific exception class and/or
message that the adapter should throw for each scenario (e.g.,
AuthenticationException, ValidationException, TimeoutException or a custom
CircleRedemptionException) and verify meaningful details (error code or message)
rather than Exception.class; locate the failing assertions in
CircleRedemptionAdapterTest (calls to adapter.redeem and aRedemptionRequest())
and replace assertThatThrownBy(...).isInstanceOf(Exception.class) with
assertions that check the concrete exception type and relevant message or error
field for each scenario, repeating the same change for the other occurrences
noted (around the second, third, and fourth occurrences).
Puneethkumarck
added a commit
that referenced
this pull request
Mar 10, 2026
…rcuit breaker (STA-152) - Map version field through PayoutOrder domain record for true optimistic locking - Use injected Clock instead of Instant.now() in FallbackAdaptersConfig - Add deterministic tiebreaker (offRampTxnId) to transaction query ordering - Guard null rawResponse with Objects.requireNonNullElse in mapper - Add unique constraint on stablecoin_redemptions.payout_id (V3 migration) - Narrow CircleRedemptionAdapter fallback to CallNotPermittedException only - Add null validation on Circle payout response before dereferencing - Use Circle's createDate as redeemedAt instead of local clock - Extract magic number 0.92 to DEV_FEE_MULTIPLIER constant Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Puneethkumarck
added a commit
that referenced
this pull request
Mar 10, 2026
…nts (STA-153) (#157) * feat(s5): webhook handler — partner settlement callbacks + outbox events (STA-153) Add POST /internal/webhooks/partner/{partnerName} endpoint with HMAC-SHA256 signature validation, idempotent settlement/failure handling, OffRampTransaction audit trail, and Namastack outbox event publishing for FiatPayoutCompleted and FiatPayoutFailed domain events. 36 new tests (11 handler + 16 HMAC + 9 controller). Closes STA-153 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(s5): address PR #156 review — optimistic locking, null safety, circuit breaker (STA-152) - Map version field through PayoutOrder domain record for true optimistic locking - Use injected Clock instead of Instant.now() in FallbackAdaptersConfig - Add deterministic tiebreaker (offRampTxnId) to transaction query ordering - Guard null rawResponse with Objects.requireNonNullElse in mapper - Add unique constraint on stablecoin_redemptions.payout_id (V3 migration) - Narrow CircleRedemptionAdapter fallback to CallNotPermittedException only - Add null validation on Circle payout response before dereferencing - Use Circle's createDate as redeemedAt instead of local clock - Extract magic number 0.92 to DEV_FEE_MULTIPLIER constant Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(s5): address PR #157 review — webhook security, error handling, state shortcut (STA-153) - Catch IllegalArgumentException in controller → return 400 for malformed payloads - Fail fast on invalid settled_at timestamp (remove silent null coercion) - Remove default webhook secret from application.yml and ModulrWebhookProperties - Add fail-fast validation in ModulrWebhookSignatureValidator constructor - Add PAYOUT_INITIATED → PAYOUT_PROCESSING shortcut in handleSettlement - Fix test to exercise PAYOUT_INITIATED shortcut path directly - Add controller test for malformed payload returning 400 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
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.
Summary
ModulrPayoutAdapterimplementsPayoutPartnerGatewayport — calls ModulrPOST /paymentsAPI with Bearer auth,@CircuitBreaker, HTTP/1.1ModulrProperties(@ConfigurationProperties), package-private ACL DTOs (ModulrPaymentRequest/ModulrPaymentResponse)FallbackAdaptersConfigupdated with@ConditionalOnMissingBeandevPayoutPartnerGatewayTest plan
spotlessCheckcleanCloses STA-152
🤖 Generated with Claude Code
Summary by CodeRabbit
New Features
Database