fix(payment): Double idempotent capture called with auto capture beha… (#14073)

* fix(payment): Double idempotent capture called with auto capture behaviour

* Create sweet-peaches-dress.md

* naming

* feedback

* naming

packages/modules/payment/integration-tests/__tests__/services/payment-module/index.spec.ts

@@ -631,6 +631,62 @@ moduleIntegrationTestRunner<IPaymentModuleService>({
               })
             )
           })
+
+          it("should auto capture payment when provider returns captured status", async () => {
+            const collection = await service.createPaymentCollections({
+              amount: 200,
+              currency_code: "usd",
+            })
+
+            const session = await service.createPaymentSession(collection.id, {
+              provider_id: "pp_system_default",
+              amount: 100,
+              currency_code: "usd",
+              data: {},
+              context: {
+                customer: { id: "cus-id-1", email: "new@test.tsst" },
+              },
+            })
+
+            // Mock the provider to return CAPTURED status
+            const authorizePaymentMock = jest
+              .spyOn(
+                (service as any).paymentProviderService_,
+                "authorizePayment"
+              )
+              .mockResolvedValueOnce({
+                data: { payment_id: "external_payment_id" },
+                status: "captured",
+              })
+
+            const capturePaymentMock = jest.spyOn(
+              (service as any).paymentProviderService_,
+              "capturePayment"
+            )
+
+            const payment = await service.authorizePaymentSession(
+              session.id,
+              {}
+            )
+
+            expect(authorizePaymentMock).toHaveBeenCalledTimes(1)
+            expect(capturePaymentMock).not.toHaveBeenCalled()
+
+            expect(payment).toEqual(
+              expect.objectContaining({
+                id: expect.any(String),
+                amount: 100,
+                currency_code: "usd",
+                provider_id: "pp_system_default",
+                captured_at: expect.any(Date),
+                captures: [expect.objectContaining({})],
+                payment_session: expect.objectContaining({
+                  status: "authorized",
+                  authorized_at: expect.any(Date),
+                }),
+              })
+            )
+          })
         })
       })
 
@@ -780,6 +836,68 @@ moduleIntegrationTestRunner<IPaymentModuleService>({
               "The payment: pay-id-1 has been canceled."
             )
           })
+
+          it("should not call provider capturePayment for auto-captured payments", async () => {
+            const collection = await service.createPaymentCollections({
+              amount: 200,
+              currency_code: "usd",
+            })
+
+            const session = await service.createPaymentSession(collection.id, {
+              provider_id: "pp_system_default",
+              amount: 100,
+              currency_code: "usd",
+              data: {},
+              context: {
+                customer: { id: "cus-id-1", email: "new@test.tsst" },
+              },
+            })
+
+            // Mock the provider to return CAPTURED status for auto-capture
+            jest
+              .spyOn(
+                (service as any).paymentProviderService_,
+                "authorizePayment"
+              )
+              .mockResolvedValueOnce({
+                data: { payment_id: "external_payment_id" },
+                status: "captured",
+              })
+
+            const payment = await service.authorizePaymentSession(
+              session.id,
+              {}
+            )
+
+            // Spy on capturePayment provider method
+            const capturePaymentMock = jest.spyOn(
+              (service as any).paymentProviderService_,
+              "capturePayment"
+            )
+
+            // Try to capture the already auto-captured payment
+            const capturedPayment = await service.capturePayment({
+              amount: 100,
+              payment_id: payment.id,
+            })
+
+            // Provider's capturePayment should NOT be called since it was auto-captured
+            expect(capturePaymentMock).not.toHaveBeenCalled()
+
+            // Verify data consistency
+            expect(capturedPayment).toEqual(
+              expect.objectContaining({
+                id: payment.id,
+                amount: 100,
+                captured_at: expect.any(Date),
+                captures: [
+                  expect.objectContaining({
+                    amount: 100,
+                  }),
+                ],
+              })
+            )
+          })
         })
 
         describe("refund", () => {

packages/modules/payment/src/services/payment-module.ts

@@ -585,10 +585,10 @@ export default class PaymentModuleService
     status: PaymentSessionStatus,
     @MedusaContext() sharedContext?: Context
   ): Promise<InferEntityType<typeof Payment>> {
-    let autoCapture = false
+    let isCaptured = false
     if (status === PaymentSessionStatus.CAPTURED) {
       status = PaymentSessionStatus.AUTHORIZED
-      autoCapture = true
+      isCaptured = true
     }
 
     await this.paymentSessionService_.update(
@@ -617,9 +617,13 @@ export default class PaymentModuleService
       sharedContext
     )
 
-    if (autoCapture) {
+    if (isCaptured) {
       await this.capturePayment(
-        { payment_id: payment.id, amount: session.amount as BigNumberInput },
+        {
+          payment_id: payment.id,
+          amount: session.amount as BigNumberInput,
+          is_captured: isCaptured,
+        },
         sharedContext
       )
     }
@@ -646,8 +650,9 @@ export default class PaymentModuleService
     data: CreateCaptureDTO,
     @MedusaContext() sharedContext: Context = {}
   ): Promise<PaymentDTO> {
+    let { is_captured, ...data_ } = data
     const payment = await this.paymentService_.retrieve(
-      data.payment_id,
+      data_.payment_id,
       {
         select: [
           "id",
@@ -665,8 +670,14 @@ export default class PaymentModuleService
       sharedContext
     )
 
+    let isCaptured = is_captured
+    if (!isCaptured) {
+      const isAutoCaptured = !!payment?.captured_at
+      isCaptured = isAutoCaptured
+    }
+
     const { isFullyCaptured, capture } = await this.capturePayment_(
-      data,
+      data_,
       payment,
       sharedContext
     )
@@ -675,7 +686,7 @@ export default class PaymentModuleService
       await this.capturePaymentFromProvider_(
         payment,
         capture,
-        isFullyCaptured,
+        { isFullyCaptured, isCaptured },
         sharedContext
       )
     } catch (error) {
@@ -763,27 +774,44 @@ export default class PaymentModuleService
   protected async capturePaymentFromProvider_(
     payment: InferEntityType<typeof Payment>,
     capture: InferEntityType<typeof Capture> | undefined,
-    isFullyCaptured: boolean,
+    options: {
+      isFullyCaptured?: boolean
+      isCaptured?: boolean
+    } = {},
     @MedusaContext() sharedContext: Context = {}
   ) {
-    const paymentData = await this.paymentProviderService_.capturePayment(
-      payment.provider_id,
-      {
-        data: payment.data!,
-        context: {
-          idempotency_key: capture?.id,
-        },
-      }
-    )
+    if (!options.isCaptured) {
+      const paymentData = await this.paymentProviderService_.capturePayment(
+        payment.provider_id,
+        {
+          data: payment.data!,
+          context: {
+            idempotency_key: capture?.id,
+          },
+        }
+      )
 
-    await this.paymentService_.update(
-      {
-        id: payment.id,
-        data: paymentData.data,
-        captured_at: isFullyCaptured ? new Date() : undefined,
-      },
-      sharedContext
-    )
+      await this.paymentService_.update(
+        {
+          id: payment.id,
+          data: paymentData.data,
+          captured_at: options.isFullyCaptured ? new Date() : undefined,
+        },
+        sharedContext
+      )
+    } else if (options.isFullyCaptured && !payment.captured_at) {
+      /**
+       * In the case of auto capture, we need to update the payment to set the captured_at date
+       * only if fully captured.
+       */
+      await this.paymentService_.update(
+        {
+          id: payment.id,
+          captured_at: new Date(),
+        },
+        sharedContext
+      )
+    }
 
     return payment
   }