From 28df946cfef6af5af81bae58bbeabb42359389c4 Mon Sep 17 00:00:00 2001
From: DEEPANSHU BANSAL <deepanshubansal515@gmail.com>
Date: Fri, 1 Dec 2023 16:23:12 +0530
Subject: [PATCH] feat(connector): [BOA/CYBERSOURCE] Fix Status Mapping for
 Terminal State of Payments

---
 .../router/src/connector/bankofamerica/transformers.rs | 10 ++++++++--
 .../router/src/connector/cybersource/transformers.rs   |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/crates/router/src/connector/bankofamerica/transformers.rs b/crates/router/src/connector/bankofamerica/transformers.rs
index 18ec8ceb89d9..e31a69669c6d 100644
--- a/crates/router/src/connector/bankofamerica/transformers.rs
+++ b/crates/router/src/connector/bankofamerica/transformers.rs
@@ -442,11 +442,18 @@ impl ForeignFrom<(BankofamericaPaymentStatus, bool)> for enums::AttemptStatus {
             | BankofamericaPaymentStatus::AuthorizedPendingReview => {
                 if auto_capture {
                     // Because BankOfAmerica will return Payment Status as Authorized even in AutoCapture Payment
-                    Self::Pending
+                    Self::Charged
                 } else {
                     Self::Authorized
                 }
             }
+            BankofamericaPaymentStatus::Pending => {
+                if auto_capture {
+                    Self::Charged
+                } else {
+                    Self::Pending
+                }
+            }
             BankofamericaPaymentStatus::Succeeded | BankofamericaPaymentStatus::Transmitted => {
                 Self::Charged
             }
@@ -456,7 +463,6 @@ impl ForeignFrom<(BankofamericaPaymentStatus, bool)> for enums::AttemptStatus {
             BankofamericaPaymentStatus::Failed | BankofamericaPaymentStatus::Declined => {
                 Self::Failure
             }
-            BankofamericaPaymentStatus::Pending => Self::Pending,
         }
     }
 }
diff --git a/crates/router/src/connector/cybersource/transformers.rs b/crates/router/src/connector/cybersource/transformers.rs
index 495e23e001ad..953f82c76a83 100644
--- a/crates/router/src/connector/cybersource/transformers.rs
+++ b/crates/router/src/connector/cybersource/transformers.rs
@@ -670,8 +670,9 @@ pub struct ApplicationInformation {
 
 fn get_payment_status(is_capture: bool, status: enums::AttemptStatus) -> enums::AttemptStatus {
     let is_authorized = matches!(status, enums::AttemptStatus::Authorized);
-    if is_capture && is_authorized {
-        return enums::AttemptStatus::Pending;
+    let is_pending = matches!(status, enums::AttemptStatus::Pending);
+    if is_capture && (is_authorized || is_pending) {
+        return enums::AttemptStatus::Charged;
     }
     status
 }