rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 00:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(core): remove pament_method_status from payment_data (#4061)

Browse Source 
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
This commit is contained in:
Prajjwal Kumar
2024-03-15 15:18:30 +05:30
committed by GitHub
parent 3d4baa230c
commit 0f6c97c47d
15 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/router/src/core/payments.rs
View File

@ -2222,7 +2222,6 @@ where
pub authorizations: Vec<diesel_models::authorization::Authorization>,
pub authentication: Option<(storage::Authentication, AuthenticationData)>,
pub frm_metadata: Option<serde_json::Value>,
pub payment_method_status: Option<common_enums::PaymentMethodStatus>,
}
#[derive(Debug, Default, Clone)]

1
crates/router/src/core/payments/operations/payment_approve.rs
View File

@ -165,7 +165,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
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,

1
crates/router/src/core/payments/operations/payment_cancel.rs
View File

@ -175,7 +175,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
card_cvc: None,
creds_identifier,
pm_token: None,
payment_method_status: None,
connector_customer_id: None,
recurring_mandate_payment_data: None,
ephemeral_key: None,

1
crates/router/src/core/payments/operations/payment_capture.rs
View File

@ -218,7 +218,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
sessions_token: vec![],
card_cvc: None,
creds_identifier,
payment_method_status: None,
pm_token: None,
connector_customer_id: None,
recurring_mandate_payment_data: None,

1
crates/router/src/core/payments/operations/payment_complete_authorize.rs
View File

@ -285,7 +285,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
multiple_capture_data: None,
redirect_response,
surcharge_details: None,
payment_method_status: None,
frm_message: None,
payment_link_data: None,
incremental_authorization_details: None,

1
crates/router/src/core/payments/operations/payment_confirm.rs
View File

@ -609,7 +609,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
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,

1
crates/router/src/core/payments/operations/payment_create.rs
View File

@ -410,7 +410,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
connector_customer_id: None,
recurring_mandate_payment_data,
ephemeral_key,
payment_method_status: None,
multiple_capture_data: None,
redirect_response: None,
surcharge_details,

1
crates/router/src/core/payments/operations/payment_reject.rs
View File

@ -170,7 +170,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
surcharge_details: None,
frm_message: frm_response.ok(),
payment_link_data: None,
payment_method_status: None,
incremental_authorization_details: None,
authorizations: vec![],
authentication: None,

19
crates/router/src/core/payments/operations/payment_response.rs
View File

@ -441,7 +441,12 @@ async fn payment_response_update_tracker<F: Clone, T: types::Capturable>(
router_data: types::RouterData<F, T, types::PaymentsResponseData>,
storage_scheme: enums::MerchantStorageScheme,
) -> RouterResult<PaymentData<F>> {
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<F: Clone, T: types::Capturable>(
)?;
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<F: Clone>(
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),
};

1
crates/router/src/core/payments/operations/payment_session.rs
View File

@ -186,7 +186,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
sessions_token: vec![],
card_cvc: None,
creds_identifier,
payment_method_status: None,
pm_token: None,
connector_customer_id: None,
recurring_mandate_payment_data: None,

1
crates/router/src/core/payments/operations/payment_start.rs
View File

@ -181,7 +181,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
redirect_response: None,
surcharge_details: None,
frm_message: None,
payment_method_status: None,
payment_link_data: None,
incremental_authorization_details: None,
authorizations: vec![],

1
crates/router/src/core/payments/operations/payment_status.rs
View File

@ -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,

1
crates/router/src/core/payments/operations/payment_update.rs
View File

@ -421,7 +421,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
redirect_response: None,
surcharge_details,
frm_message: None,
payment_method_status: None,
payment_link_data: None,
incremental_authorization_details: None,
authorizations: vec![],

1
crates/router/src/core/payments/operations/payments_incremental_authorization.rs
View File

@ -134,7 +134,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve>
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,

6
crates/router/src/core/payments/transformers.rs
View File

@ -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,
))