fix(s3): handle charge.succeeded webhook event type (STA-194)

WebhookCommandHandler only handled payment_intent.succeeded but not
charge.succeeded. When Stripe sends a charge.succeeded webhook it now
routes to the same handlePaymentSucceeded flow and the idempotency
check covers both event types. Also corrects the E2E
StripeWebhookSender payload to use charge.succeeded.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: Puneethkumarck

fiat-on-ramp/fiat-on-ramp/src/main/java/com/stablecoin/payments/onramp/domain/service/WebhookCommandHandler.java

@@ -30,6 +30,7 @@
 public class WebhookCommandHandler {
 
     private static final String EVENT_PAYMENT_SUCCEEDED = "payment_intent.succeeded";
+    private static final String EVENT_CHARGE_SUCCEEDED = "charge.succeeded";
     private static final String EVENT_PAYMENT_FAILED = "payment_intent.payment_failed";
 
     private final CollectionOrderRepository orderRepository;
@@ -61,7 +62,7 @@ public CollectionOrder handleWebhook(WebhookCommand command) {
         recordPspTransaction(order, command);
 
         return switch (command.eventType()) {
-            case EVENT_PAYMENT_SUCCEEDED -> handlePaymentSucceeded(order, command);
+            case EVENT_PAYMENT_SUCCEEDED, EVENT_CHARGE_SUCCEEDED -> handlePaymentSucceeded(order, command);
             case EVENT_PAYMENT_FAILED -> handlePaymentFailed(order, command);
             default -> {
                 log.warn("Ignoring unrecognised webhook event type={}", command.eventType());
@@ -138,7 +139,7 @@ private CollectionOrder handlePaymentFailed(CollectionOrder order, WebhookComman
 
     private boolean isAlreadyProcessed(CollectionOrder order, String eventType) {
         return switch (eventType) {
-            case EVENT_PAYMENT_SUCCEEDED ->
+            case EVENT_PAYMENT_SUCCEEDED, EVENT_CHARGE_SUCCEEDED ->
                     order.status() == CollectionStatus.COLLECTED
                             || order.status() == CollectionStatus.REFUND_INITIATED
                             || order.status() == CollectionStatus.REFUND_PROCESSING

fiat-on-ramp/fiat-on-ramp/src/test/java/com/stablecoin/payments/onramp/domain/service/WebhookCommandHandlerTest.java

@@ -25,6 +25,7 @@
 import static com.stablecoin.payments.onramp.fixtures.CollectionOrderFixtures.anAwaitingConfirmationOrder;
 import static com.stablecoin.payments.onramp.fixtures.TestUtils.eqIgnoring;
 import static com.stablecoin.payments.onramp.fixtures.TestUtils.eqIgnoringTimestamps;
+import static com.stablecoin.payments.onramp.fixtures.WebhookFixtures.aChargeSucceededCommand;
 import static com.stablecoin.payments.onramp.fixtures.WebhookFixtures.aFailedCommand;
 import static com.stablecoin.payments.onramp.fixtures.WebhookFixtures.aMismatchCommand;
 import static com.stablecoin.payments.onramp.fixtures.WebhookFixtures.aSucceededCommand;
@@ -108,6 +109,57 @@ void shouldDetectAmountMismatch() {
         }
     }
 
+    @Nested
+    @DisplayName("charge.succeeded")
+    class ChargeSucceeded {
+
+        @Test
+        @DisplayName("should transition AWAITING_CONFIRMATION to COLLECTED and publish CollectionCompletedEvent")
+        void shouldTransitionToCollectedAndPublishEventForChargeSucceeded() {
+            // given
+            var order = anAwaitingConfirmationOrder();
+            var command = aChargeSucceededCommand();
+            var collected = order.confirmCollection(command.amount());
+
+            given(orderRepository.findByPspReference(PSP_REFERENCE)).willReturn(Optional.of(order));
+            given(orderRepository.save(eqIgnoringTimestamps(collected))).willReturn(collected);
+
+            // when
+            handler.handleWebhook(command);
+
+            // then
+            then(orderRepository).should().save(eqIgnoringTimestamps(collected));
+            then(eventPublisher).should().publish(eqIgnoringTimestamps(
+                    new CollectionCompletedEvent(
+                            collected.collectionId(),
+                            collected.paymentId(),
+                            collected.correlationId(),
+                            collected.collectedAmount().amount(),
+                            collected.collectedAmount().currency(),
+                            collected.paymentRail().rail().name(),
+                            collected.psp().pspName(),
+                            collected.pspReference(),
+                            collected.pspSettledAt())));
+        }
+
+        @Test
+        @DisplayName("should skip duplicate charge.succeeded webhook for already COLLECTED order")
+        void shouldSkipDuplicateChargeSucceededWebhookForAlreadyCollectedOrder() {
+            // given
+            var order = aCollectedOrder();
+            var command = aChargeSucceededCommand();
+
+            given(orderRepository.findByPspReference(PSP_REFERENCE)).willReturn(Optional.of(order));
+
+            // when
+            handler.handleWebhook(command);
+
+            // then — no save or event publish should occur
+            then(orderRepository).should(never()).save(eqIgnoringTimestamps(order));
+            then(eventPublisher).shouldHaveNoInteractions();
+        }
+    }
+
     @Nested
     @DisplayName("payment_intent.payment_failed")
     class PaymentFailed {

fiat-on-ramp/fiat-on-ramp/src/testFixtures/java/com/stablecoin/payments/onramp/fixtures/WebhookFixtures.java

@@ -22,6 +22,7 @@ private WebhookFixtures() {}
     public static final String WEBHOOK_SECRET = "whsec_test_secret_12345";
     public static final String EVENT_ID = "evt_test_001";
     public static final String EVENT_TYPE_SUCCEEDED = "payment_intent.succeeded";
+    public static final String EVENT_TYPE_CHARGE_SUCCEEDED = "charge.succeeded";
     public static final String EVENT_TYPE_FAILED = "payment_intent.payment_failed";
     public static final UUID COLLECTION_ID = UUID.fromString("c3d4e5f6-a7b8-9012-cdef-123456789012");
 
@@ -107,6 +108,17 @@ public static WebhookCommand aFailedCommand() {
                 aFailedEventJson());
     }
 
+    public static WebhookCommand aChargeSucceededCommand() {
+        return new WebhookCommand(
+                EVENT_ID,
+                EVENT_TYPE_CHARGE_SUCCEEDED,
+                PSP_REFERENCE,
+                COLLECTION_ID,
+                new Money(new BigDecimal("1000.00"), "USD"),
+                "succeeded",
+                aSucceededEventJson());
+    }
+
     public static WebhookCommand aMismatchCommand() {
         return new WebhookCommand(
                 EVENT_ID,

phase3-integration-tests/src/test/java/com/stablecoin/payments/phase3/support/StripeWebhookSender.java

@@ -74,7 +74,7 @@ private String buildChargeSucceededPayload(String pspReference, long amount, Str
                 {
                     "id": "evt_%s",
                     "object": "event",
-                    "type": "payment_intent.succeeded",
+                    "type": "charge.succeeded",
                     "data": {
                         "object": {
                             "id": "%s",