From 0f6c97c47ddd0980ace13840faadc4b6eefaa48e Mon Sep 17 00:00:00 2001 From: Prajjwal Kumar Date: Fri, 15 Mar 2024 15:18:30 +0530 Subject: [PATCH] refactor(core): remove pament_method_status from payment_data (#4061) Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com> --- crates/router/src/core/payments.rs | 1 - .../payments/operations/payment_approve.rs | 1 - .../payments/operations/payment_cancel.rs | 1 - .../payments/operations/payment_capture.rs | 1 - .../operations/payment_complete_authorize.rs | 1 - .../payments/operations/payment_confirm.rs | 1 - .../payments/operations/payment_create.rs | 1 - .../payments/operations/payment_reject.rs | 1 - .../payments/operations/payment_response.rs | 19 ++++++++++++++++--- .../payments/operations/payment_session.rs | 1 - .../core/payments/operations/payment_start.rs | 1 - .../payments/operations/payment_status.rs | 1 - .../payments/operations/payment_update.rs | 1 - .../payments_incremental_authorization.rs | 1 - .../router/src/core/payments/transformers.rs | 6 ++++-- 15 files changed, 20 insertions(+), 18 deletions(-) diff --git a/crates/router/src/core/payments.rs b/crates/router/src/core/payments.rs index 4eb05fdbaf..de4fc30a9b 100644 --- a/crates/router/src/core/payments.rs +++ b/crates/router/src/core/payments.rs @@ -2222,7 +2222,6 @@ where pub authorizations: Vec, pub authentication: Option<(storage::Authentication, AuthenticationData)>, pub frm_metadata: Option, - pub payment_method_status: Option, } #[derive(Debug, Default, Clone)] diff --git a/crates/router/src/core/payments/operations/payment_approve.rs b/crates/router/src/core/payments/operations/payment_approve.rs index ba270e1d00..65b856364c 100644 --- a/crates/router/src/core/payments/operations/payment_approve.rs +++ b/crates/router/src/core/payments/operations/payment_approve.rs @@ -165,7 +165,6 @@ impl sessions_token: vec![], card_cvc: None, creds_identifier: None, - payment_method_status: None, pm_token: None, connector_customer_id: None, recurring_mandate_payment_data: None, diff --git a/crates/router/src/core/payments/operations/payment_cancel.rs b/crates/router/src/core/payments/operations/payment_cancel.rs index 8072984e20..b25c0e2b90 100644 --- a/crates/router/src/core/payments/operations/payment_cancel.rs +++ b/crates/router/src/core/payments/operations/payment_cancel.rs @@ -175,7 +175,6 @@ impl card_cvc: None, creds_identifier, pm_token: None, - payment_method_status: None, connector_customer_id: None, recurring_mandate_payment_data: None, ephemeral_key: None, diff --git a/crates/router/src/core/payments/operations/payment_capture.rs b/crates/router/src/core/payments/operations/payment_capture.rs index 9e6751757a..47d339f15b 100644 --- a/crates/router/src/core/payments/operations/payment_capture.rs +++ b/crates/router/src/core/payments/operations/payment_capture.rs @@ -218,7 +218,6 @@ impl sessions_token: vec![], card_cvc: None, creds_identifier, - payment_method_status: None, pm_token: None, connector_customer_id: None, recurring_mandate_payment_data: None, diff --git a/crates/router/src/core/payments/operations/payment_complete_authorize.rs b/crates/router/src/core/payments/operations/payment_complete_authorize.rs index 0f08d14e43..8a773904ea 100644 --- a/crates/router/src/core/payments/operations/payment_complete_authorize.rs +++ b/crates/router/src/core/payments/operations/payment_complete_authorize.rs @@ -285,7 +285,6 @@ impl multiple_capture_data: None, redirect_response, surcharge_details: None, - payment_method_status: None, frm_message: None, payment_link_data: None, incremental_authorization_details: None, diff --git a/crates/router/src/core/payments/operations/payment_confirm.rs b/crates/router/src/core/payments/operations/payment_confirm.rs index 3ecb98a9c9..97b1d8e981 100644 --- a/crates/router/src/core/payments/operations/payment_confirm.rs +++ b/crates/router/src/core/payments/operations/payment_confirm.rs @@ -609,7 +609,6 @@ impl card_cvc: request.card_cvc.clone(), creds_identifier, pm_token: None, - payment_method_status: None, connector_customer_id: None, recurring_mandate_payment_data, ephemeral_key: None, diff --git a/crates/router/src/core/payments/operations/payment_create.rs b/crates/router/src/core/payments/operations/payment_create.rs index 5efbee0bc6..7c85624265 100644 --- a/crates/router/src/core/payments/operations/payment_create.rs +++ b/crates/router/src/core/payments/operations/payment_create.rs @@ -410,7 +410,6 @@ impl connector_customer_id: None, recurring_mandate_payment_data, ephemeral_key, - payment_method_status: None, multiple_capture_data: None, redirect_response: None, surcharge_details, diff --git a/crates/router/src/core/payments/operations/payment_reject.rs b/crates/router/src/core/payments/operations/payment_reject.rs index b59e87b826..591ecb0a11 100644 --- a/crates/router/src/core/payments/operations/payment_reject.rs +++ b/crates/router/src/core/payments/operations/payment_reject.rs @@ -170,7 +170,6 @@ impl surcharge_details: None, frm_message: frm_response.ok(), payment_link_data: None, - payment_method_status: None, incremental_authorization_details: None, authorizations: vec![], authentication: None, diff --git a/crates/router/src/core/payments/operations/payment_response.rs b/crates/router/src/core/payments/operations/payment_response.rs index 447ca14b15..2afac8b613 100644 --- a/crates/router/src/core/payments/operations/payment_response.rs +++ b/crates/router/src/core/payments/operations/payment_response.rs @@ -441,7 +441,12 @@ async fn payment_response_update_tracker( router_data: types::RouterData, storage_scheme: enums::MerchantStorageScheme, ) -> RouterResult> { - payment_data.payment_method_status = router_data.payment_method_status; + router_data.payment_method_status.and_then(|status| { + payment_data + .payment_method_info + .as_mut() + .map(|info| info.status = status) + }); let (capture_update, mut payment_attempt_update) = match router_data.response.clone() { Err(err) => { let (capture_update, attempt_update) = match payment_data.multiple_capture_data { @@ -888,7 +893,12 @@ async fn payment_response_update_tracker( )?; payment_data.payment_intent = payment_intent; - payment_data.payment_method_status = router_data.payment_method_status; + router_data.payment_method_status.and_then(|status| { + payment_data + .payment_method_info + .as_mut() + .map(|info| info.status = status) + }); Ok(payment_data) } @@ -907,7 +917,10 @@ async fn update_payment_method_status( if pm.status != attempt_status.into() { let updated_pm_status = common_enums::PaymentMethodStatus::from(attempt_status); - payment_data.payment_method_status = Some(updated_pm_status); + payment_data + .payment_method_info + .as_mut() + .map(|info| info.status = updated_pm_status); let pm_update = storage::PaymentMethodUpdate::StatusUpdate { status: Some(updated_pm_status), }; diff --git a/crates/router/src/core/payments/operations/payment_session.rs b/crates/router/src/core/payments/operations/payment_session.rs index 7129645601..805b5fb363 100644 --- a/crates/router/src/core/payments/operations/payment_session.rs +++ b/crates/router/src/core/payments/operations/payment_session.rs @@ -186,7 +186,6 @@ impl sessions_token: vec![], card_cvc: None, creds_identifier, - payment_method_status: None, pm_token: None, connector_customer_id: None, recurring_mandate_payment_data: None, diff --git a/crates/router/src/core/payments/operations/payment_start.rs b/crates/router/src/core/payments/operations/payment_start.rs index ee85ffa8a5..520336be0e 100644 --- a/crates/router/src/core/payments/operations/payment_start.rs +++ b/crates/router/src/core/payments/operations/payment_start.rs @@ -181,7 +181,6 @@ impl redirect_response: None, surcharge_details: None, frm_message: None, - payment_method_status: None, payment_link_data: None, incremental_authorization_details: None, authorizations: vec![], diff --git a/crates/router/src/core/payments/operations/payment_status.rs b/crates/router/src/core/payments/operations/payment_status.rs index 60b2c80776..fd28fbd18d 100644 --- a/crates/router/src/core/payments/operations/payment_status.rs +++ b/crates/router/src/core/payments/operations/payment_status.rs @@ -467,7 +467,6 @@ async fn get_tracker_for_sync< card_cvc: None, creds_identifier, pm_token: None, - payment_method_status: None, connector_customer_id: None, recurring_mandate_payment_data: None, ephemeral_key: None, diff --git a/crates/router/src/core/payments/operations/payment_update.rs b/crates/router/src/core/payments/operations/payment_update.rs index 626b123a83..2a0b99bc54 100644 --- a/crates/router/src/core/payments/operations/payment_update.rs +++ b/crates/router/src/core/payments/operations/payment_update.rs @@ -421,7 +421,6 @@ impl redirect_response: None, surcharge_details, frm_message: None, - payment_method_status: None, payment_link_data: None, incremental_authorization_details: None, authorizations: vec![], diff --git a/crates/router/src/core/payments/operations/payments_incremental_authorization.rs b/crates/router/src/core/payments/operations/payments_incremental_authorization.rs index d60e56de66..ab7ab56d94 100644 --- a/crates/router/src/core/payments/operations/payments_incremental_authorization.rs +++ b/crates/router/src/core/payments/operations/payments_incremental_authorization.rs @@ -134,7 +134,6 @@ impl sessions_token: vec![], card_cvc: None, creds_identifier: None, - payment_method_status: None, pm_token: None, connector_customer_id: None, recurring_mandate_payment_data: None, diff --git a/crates/router/src/core/payments/transformers.rs b/crates/router/src/core/payments/transformers.rs index 73d780c096..caed1b3a12 100644 --- a/crates/router/src/core/payments/transformers.rs +++ b/crates/router/src/core/payments/transformers.rs @@ -148,7 +148,7 @@ where access_token: None, session_token: None, reference_id: None, - payment_method_status: payment_data.payment_method_status, + payment_method_status: payment_data.payment_method_info.map(|info| info.status), payment_method_token: payment_data.pm_token.map(types::PaymentMethodToken::Token), connector_customer: payment_data.connector_customer_id, recurring_mandate_payment_data: payment_data.recurring_mandate_payment_data, @@ -781,7 +781,9 @@ where payment_attempt.external_three_ds_authentication_attempted, ) .set_payment_method_id(payment_attempt.payment_method_id) - .set_payment_method_status(payment_data.payment_method_status) + .set_payment_method_status( + payment_data.payment_method_info.map(|info| info.status), + ) .to_owned(), headers, ))