From c3e7343630f5e4f47ac3653a799985eb578f6ab8 Mon Sep 17 00:00:00 2001 From: "hyperswitch-bot[bot]" <148525504+hyperswitch-bot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 08:27:06 +0000 Subject: [PATCH] chore: run formatter --- crates/diesel_models/src/payment_attempt.rs | 24 +++++++++---------- .../src/connectors/bambora/transformers.rs | 4 ++-- .../connectors/bamboraapac/transformers.rs | 8 +++---- .../src/connectors/billwerk/transformers.rs | 2 +- .../src/connectors/cashtocode/transformers.rs | 2 +- .../connectors/deutschebank/transformers.rs | 8 +++---- .../src/connectors/dlocal/transformers.rs | 2 +- .../src/connectors/elavon/transformers.rs | 4 ++-- .../src/connectors/fiuu/transformers.rs | 18 +++++++------- .../src/connectors/globepay/transformers.rs | 4 ++-- .../connectors/multisafepay/transformers.rs | 2 +- .../src/connectors/nexixpay/transformers.rs | 4 ++-- .../src/connectors/novalnet/transformers.rs | 8 +++---- .../src/connectors/paybox/transformers.rs | 10 ++++---- .../src/connectors/prophetpay/transformers.rs | 6 ++--- .../src/connectors/rapyd/transformers.rs | 2 +- .../src/connectors/razorpay/transformers.rs | 2 +- .../src/connectors/tsys/transformers.rs | 4 ++-- .../src/connectors/volt/transformers.rs | 4 ++-- .../src/connectors/worldpay.rs | 4 ++-- .../src/connectors/zen/transformers.rs | 2 +- .../src/connectors/zsl/transformers.rs | 4 ++-- .../src/payments/payment_attempt.rs | 4 ++-- .../src/router_data.rs | 4 ++-- .../src/router_response_types.rs | 7 +++--- .../src/connector/adyen/transformers.rs | 5 +++- .../src/connector/globalpay/transformers.rs | 3 +-- .../src/connector/iatapay/transformers.rs | 2 +- .../src/connector/mifinity/transformers.rs | 10 ++++---- .../router/src/connector/nmi/transformers.rs | 14 +++++------ .../router/src/connector/noon/transformers.rs | 2 +- .../src/connector/nuvei/transformers.rs | 2 +- .../src/connector/payme/transformers.rs | 6 ++--- .../src/connector/plaid/transformers.rs | 2 +- .../src/connector/trustpay/transformers.rs | 4 ++-- .../payments/operations/payment_confirm.rs | 3 ++- .../payments/operations/payment_create.rs | 8 +++++-- .../payments/operations/payment_response.rs | 2 +- .../payments/operations/payment_update.rs | 12 ++++++---- crates/router/src/core/payments/retry.rs | 1 - crates/router/src/core/utils.rs | 1 - crates/router/tests/connectors/mifinity.rs | 1 - .../src/payments/payment_attempt.rs | 4 ++-- 43 files changed, 115 insertions(+), 110 deletions(-) diff --git a/crates/diesel_models/src/payment_attempt.rs b/crates/diesel_models/src/payment_attempt.rs index bd3df31f346..ea2ff63d9c9 100644 --- a/crates/diesel_models/src/payment_attempt.rs +++ b/crates/diesel_models/src/payment_attempt.rs @@ -1118,7 +1118,8 @@ impl PaymentAttemptUpdate { connector_mandate_detail: connector_mandate_detail.or(source.connector_mandate_detail), request_overcapture: request_overcapture.or(source.request_overcapture), overcapture_applied: overcapture_applied.or(source.overcapture_applied), - maximum_capturable_amount: maximum_capturable_amount.or(source.maximum_capturable_amount), + maximum_capturable_amount: maximum_capturable_amount + .or(source.maximum_capturable_amount), ..source } } @@ -2711,8 +2712,8 @@ impl From for PaymentAttemptUpdateInternal { order_tax_amount: None, connector_mandate_detail, request_overcapture: None, - overcapture_applied, - maximum_capturable_amount, + overcapture_applied, + maximum_capturable_amount, } } PaymentAttemptUpdate::ErrorUpdate { @@ -2787,9 +2788,8 @@ impl From for PaymentAttemptUpdateInternal { order_tax_amount: None, connector_mandate_detail: None, request_overcapture: None, - overcapture_applied: None, - maximum_capturable_amount: None, - + overcapture_applied: None, + maximum_capturable_amount: None, } } PaymentAttemptUpdate::StatusUpdate { status, updated_by } => Self { @@ -2982,8 +2982,8 @@ impl From for PaymentAttemptUpdateInternal { order_tax_amount: None, connector_mandate_detail: None, request_overcapture: None, - overcapture_applied: None, - maximum_capturable_amount: None, + overcapture_applied: None, + maximum_capturable_amount: None, } } PaymentAttemptUpdate::PreprocessingUpdate { @@ -3243,8 +3243,8 @@ impl From for PaymentAttemptUpdateInternal { order_tax_amount: None, connector_mandate_detail: None, request_overcapture: None, - overcapture_applied: None, - maximum_capturable_amount: None, + overcapture_applied: None, + maximum_capturable_amount: None, } } PaymentAttemptUpdate::IncrementalAuthorizationAmountUpdate { @@ -3436,8 +3436,8 @@ impl From for PaymentAttemptUpdateInternal { order_tax_amount: None, connector_mandate_detail: None, request_overcapture: None, - overcapture_applied: None, - maximum_capturable_amount: None, + overcapture_applied: None, + maximum_capturable_amount: None, } } PaymentAttemptUpdate::PostSessionTokensUpdate { diff --git a/crates/hyperswitch_connectors/src/connectors/bambora/transformers.rs b/crates/hyperswitch_connectors/src/connectors/bambora/transformers.rs index 97f940a23d2..cc328e40e82 100644 --- a/crates/hyperswitch_connectors/src/connectors/bambora/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/bambora/transformers.rs @@ -480,7 +480,7 @@ impl TryFrom TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -489,7 +489,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -637,7 +637,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -918,7 +918,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) diff --git a/crates/hyperswitch_connectors/src/connectors/billwerk/transformers.rs b/crates/hyperswitch_connectors/src/connectors/billwerk/transformers.rs index 23b61fbbc26..088b41c7dd6 100644 --- a/crates/hyperswitch_connectors/src/connectors/billwerk/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/billwerk/transformers.rs @@ -293,7 +293,7 @@ impl TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ) } diff --git a/crates/hyperswitch_connectors/src/connectors/deutschebank/transformers.rs b/crates/hyperswitch_connectors/src/connectors/deutschebank/transformers.rs index de4ab4446d8..aa3d0d1cae9 100644 --- a/crates/hyperswitch_connectors/src/connectors/deutschebank/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/deutschebank/transformers.rs @@ -353,7 +353,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), @@ -406,7 +406,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -620,7 +620,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -695,7 +695,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) diff --git a/crates/hyperswitch_connectors/src/connectors/dlocal/transformers.rs b/crates/hyperswitch_connectors/src/connectors/dlocal/transformers.rs index c6ac660f43a..c38767ae146 100644 --- a/crates/hyperswitch_connectors/src/connectors/dlocal/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/dlocal/transformers.rs @@ -337,7 +337,7 @@ impl TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) } } @@ -456,7 +456,7 @@ impl TryFrom> incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) } } diff --git a/crates/hyperswitch_connectors/src/connectors/fiuu/transformers.rs b/crates/hyperswitch_connectors/src/connectors/fiuu/transformers.rs index 35e83cc3836..57ae5117827 100644 --- a/crates/hyperswitch_connectors/src/connectors/fiuu/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/fiuu/transformers.rs @@ -759,7 +759,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), @@ -797,7 +797,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -855,7 +855,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) }; Ok(Self { @@ -903,7 +903,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) }; Self { @@ -924,7 +924,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }); Self { response, @@ -1197,7 +1197,7 @@ impl TryFrom> for PaymentsSy incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok(Self { status, @@ -1260,7 +1260,7 @@ impl TryFrom> for PaymentsSy incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok(Self { status, @@ -1431,7 +1431,7 @@ impl TryFrom> incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok(Self { status, @@ -1544,7 +1544,7 @@ impl TryFrom> incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok(Self { status, diff --git a/crates/hyperswitch_connectors/src/connectors/globepay/transformers.rs b/crates/hyperswitch_connectors/src/connectors/globepay/transformers.rs index d91219abc37..9d2f7709731 100644 --- a/crates/hyperswitch_connectors/src/connectors/globepay/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/globepay/transformers.rs @@ -222,7 +222,7 @@ impl TryFrom TryFrom TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -854,7 +854,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), diff --git a/crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs b/crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs index 3940f031302..eb3117b64cd 100644 --- a/crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/novalnet/transformers.rs @@ -603,7 +603,7 @@ impl TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -1093,7 +1093,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -1264,7 +1264,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) diff --git a/crates/hyperswitch_connectors/src/connectors/paybox/transformers.rs b/crates/hyperswitch_connectors/src/connectors/paybox/transformers.rs index e1c767e0227..bdb5b094002 100644 --- a/crates/hyperswitch_connectors/src/connectors/paybox/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/paybox/transformers.rs @@ -701,7 +701,7 @@ impl TryFrom TryFrom TryFrom TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), diff --git a/crates/hyperswitch_connectors/src/connectors/prophetpay/transformers.rs b/crates/hyperswitch_connectors/src/connectors/prophetpay/transformers.rs index acf087d432a..d1253e03a79 100644 --- a/crates/hyperswitch_connectors/src/connectors/prophetpay/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/prophetpay/transformers.rs @@ -415,7 +415,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -465,7 +465,7 @@ impl TryFrom TryFrom TryFrom TryFrom PaymentsResponseDa incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, } } @@ -279,7 +279,7 @@ fn get_payments_sync_response( incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, } } diff --git a/crates/hyperswitch_connectors/src/connectors/volt/transformers.rs b/crates/hyperswitch_connectors/src/connectors/volt/transformers.rs index 28cf5e33dcf..2b84e0f1488 100644 --- a/crates/hyperswitch_connectors/src/connectors/volt/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/volt/transformers.rs @@ -364,7 +364,7 @@ impl TryFrom TryFrom for Wo incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..data.clone() }) @@ -637,7 +637,7 @@ impl ConnectorIntegration fo incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..data.clone() }) diff --git a/crates/hyperswitch_connectors/src/connectors/zen/transformers.rs b/crates/hyperswitch_connectors/src/connectors/zen/transformers.rs index a0051a022e5..4b4d54e9db0 100644 --- a/crates/hyperswitch_connectors/src/connectors/zen/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/zen/transformers.rs @@ -951,7 +951,7 @@ fn get_zen_response( incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok((status, error, payment_response_data)) } diff --git a/crates/hyperswitch_connectors/src/connectors/zsl/transformers.rs b/crates/hyperswitch_connectors/src/connectors/zsl/transformers.rs index 1a23c825f9f..a5b5cb9bdbd 100644 --- a/crates/hyperswitch_connectors/src/connectors/zsl/transformers.rs +++ b/crates/hyperswitch_connectors/src/connectors/zsl/transformers.rs @@ -336,7 +336,7 @@ impl TryFrom TryFrom DieselPaymentAttemptUpdate::ConfirmUpdate { amount: net_amount.get_order_amount(), currency, @@ -1128,7 +1128,7 @@ impl PaymentAttemptUpdate { order_tax_amount: net_amount.get_order_tax_amount(), connector_mandate_detail, overcapture_applied, - maximum_capturable_amount + maximum_capturable_amount, }, Self::VoidUpdate { status, diff --git a/crates/hyperswitch_domain_models/src/router_data.rs b/crates/hyperswitch_domain_models/src/router_data.rs index b39f82264bf..be91e9e8f70 100644 --- a/crates/hyperswitch_domain_models/src/router_data.rs +++ b/crates/hyperswitch_domain_models/src/router_data.rs @@ -465,7 +465,7 @@ impl incremental_authorization_allowed, charge_id, overcapture_applied, - maximum_capturable_amount, + maximum_capturable_amount, } => { let attempt_status = self.status; let connector_payment_id = match resource_id { @@ -583,7 +583,7 @@ impl TrackerPostUpdateObjects { let attempt_status = self.status; let connector_payment_id = match resource_id { diff --git a/crates/hyperswitch_domain_models/src/router_response_types.rs b/crates/hyperswitch_domain_models/src/router_response_types.rs index f1816d7a65f..19fcfbda34b 100644 --- a/crates/hyperswitch_domain_models/src/router_response_types.rs +++ b/crates/hyperswitch_domain_models/src/router_response_types.rs @@ -167,7 +167,7 @@ impl PaymentsResponseData { incremental_authorization_allowed: auth_incremental_auth_allowed, charge_id: auth_charge_id, overcapture_applied: auth_overcapture_applied, - maximum_capturable_amount: auth_maximum_capturable_amount, + maximum_capturable_amount: auth_maximum_capturable_amount, }, Self::TransactionResponse { resource_id: capture_resource_id, @@ -179,7 +179,7 @@ impl PaymentsResponseData { incremental_authorization_allowed: capture_incremental_auth_allowed, charge_id: capture_charge_id, overcapture_applied: _, - maximum_capturable_amount: _, + maximum_capturable_amount: _, }, ) => Ok(Self::TransactionResponse { resource_id: capture_resource_id.clone(), @@ -205,8 +205,7 @@ impl PaymentsResponseData { incremental_authorization_allowed: (*capture_incremental_auth_allowed) .or(*auth_incremental_auth_allowed), charge_id: capture_charge_id.clone().or(auth_charge_id.clone()), - overcapture_applied: auth_overcapture_applied - .clone(), + overcapture_applied: auth_overcapture_applied.clone(), maximum_capturable_amount: auth_maximum_capturable_amount.clone(), }), _ => Err(ApiErrorResponse::NotSupported { diff --git a/crates/router/src/connector/adyen/transformers.rs b/crates/router/src/connector/adyen/transformers.rs index a30b803b620..fd20c9fb552 100644 --- a/crates/router/src/connector/adyen/transformers.rs +++ b/crates/router/src/connector/adyen/transformers.rs @@ -1555,7 +1555,10 @@ impl TryFrom<&AdyenRouterData<&types::PaymentsAuthorizeRouterData>> for AdyenPay fn try_from( item: &AdyenRouterData<&types::PaymentsAuthorizeRouterData>, ) -> Result { - println!("$$$$$4request_overcapture: {:?}", item.router_data.request_overcapture); + println!( + "$$$$$4request_overcapture: {:?}", + item.router_data.request_overcapture + ); match item .router_data .request diff --git a/crates/router/src/connector/globalpay/transformers.rs b/crates/router/src/connector/globalpay/transformers.rs index 1e5c3a4851a..2e7ec8fb182 100644 --- a/crates/router/src/connector/globalpay/transformers.rs +++ b/crates/router/src/connector/globalpay/transformers.rs @@ -283,8 +283,7 @@ fn get_payment_response( incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, - + maximum_capturable_amount: None, }), } } diff --git a/crates/router/src/connector/iatapay/transformers.rs b/crates/router/src/connector/iatapay/transformers.rs index 392da01b0d9..df2c27daedd 100644 --- a/crates/router/src/connector/iatapay/transformers.rs +++ b/crates/router/src/connector/iatapay/transformers.rs @@ -404,7 +404,7 @@ fn get_iatpay_response( incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }, }; diff --git a/crates/router/src/connector/mifinity/transformers.rs b/crates/router/src/connector/mifinity/transformers.rs index 0daa44c230a..9bd7f405864 100644 --- a/crates/router/src/connector/mifinity/transformers.rs +++ b/crates/router/src/connector/mifinity/transformers.rs @@ -270,7 +270,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -287,7 +287,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), @@ -358,7 +358,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }) @@ -375,7 +375,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), @@ -393,7 +393,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), diff --git a/crates/router/src/connector/nmi/transformers.rs b/crates/router/src/connector/nmi/transformers.rs index 2a6a94c6dd4..42ffa4da320 100644 --- a/crates/router/src/connector/nmi/transformers.rs +++ b/crates/router/src/connector/nmi/transformers.rs @@ -214,7 +214,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), enums::AttemptStatus::AuthenticationPending, ), @@ -370,7 +370,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), if let Some(diesel_models::enums::CaptureMethod::Automatic) = item.data.request.capture_method @@ -756,7 +756,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), enums::AttemptStatus::CaptureInitiated, ), @@ -853,7 +853,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), enums::AttemptStatus::Charged, ), @@ -912,7 +912,7 @@ impl TryFrom> incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), if let Some(diesel_models::enums::CaptureMethod::Automatic) = item.data.request.capture_method @@ -965,7 +965,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), enums::AttemptStatus::VoidInitiated, ), @@ -1018,7 +1018,7 @@ impl TryFrom incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) } }, diff --git a/crates/router/src/connector/nuvei/transformers.rs b/crates/router/src/connector/nuvei/transformers.rs index f5d03a79841..0eddb269dff 100644 --- a/crates/router/src/connector/nuvei/transformers.rs +++ b/crates/router/src/connector/nuvei/transformers.rs @@ -1628,7 +1628,7 @@ where incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) }, ..item.data diff --git a/crates/router/src/connector/payme/transformers.rs b/crates/router/src/connector/payme/transformers.rs index beb9bba5e39..23f94328125 100644 --- a/crates/router/src/connector/payme/transformers.rs +++ b/crates/router/src/connector/payme/transformers.rs @@ -261,7 +261,7 @@ impl TryFrom<&PaymePaySaleResponse> for types::PaymentsResponseData { incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) } } @@ -330,7 +330,7 @@ impl From<&SaleQuery> for types::PaymentsResponseData { incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, } } } @@ -552,7 +552,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }), ..item.data }), diff --git a/crates/router/src/connector/plaid/transformers.rs b/crates/router/src/connector/plaid/transformers.rs index c2a85f684e6..cfa3bf22076 100644 --- a/crates/router/src/connector/plaid/transformers.rs +++ b/crates/router/src/connector/plaid/transformers.rs @@ -316,7 +316,7 @@ impl incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }) }, ..item.data diff --git a/crates/router/src/connector/trustpay/transformers.rs b/crates/router/src/connector/trustpay/transformers.rs index d6670a01354..eac9d759971 100644 --- a/crates/router/src/connector/trustpay/transformers.rs +++ b/crates/router/src/connector/trustpay/transformers.rs @@ -768,7 +768,7 @@ fn handle_bank_redirects_response( incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok((status, error, payment_response_data)) } @@ -804,7 +804,7 @@ fn handle_bank_redirects_error_response( incremental_authorization_allowed: None, charge_id: None, overcapture_applied: None, - maximum_capturable_amount: None, + maximum_capturable_amount: None, }; Ok((status, error, payment_response_data)) } diff --git a/crates/router/src/core/payments/operations/payment_confirm.rs b/crates/router/src/core/payments/operations/payment_confirm.rs index 38d173eb360..35f215cc749 100644 --- a/crates/router/src/core/payments/operations/payment_confirm.rs +++ b/crates/router/src/core/payments/operations/payment_confirm.rs @@ -1442,7 +1442,8 @@ impl UpdateTracker, api::PaymentsRequest> for async move { m_db.update_payment_attempt_with_attempt_id( m_payment_data_payment_attempt, - storage::PaymentAttemptUpdate::ConfirmUpdate { // Should we remove todooo + storage::PaymentAttemptUpdate::ConfirmUpdate { + // Should we remove todooo currency: payment_data.currency, status: attempt_status, payment_method, diff --git a/crates/router/src/core/payments/operations/payment_create.rs b/crates/router/src/core/payments/operations/payment_create.rs index ce5fa5573d0..a5344a75bb3 100644 --- a/crates/router/src/core/payments/operations/payment_create.rs +++ b/crates/router/src/core/payments/operations/payment_create.rs @@ -542,7 +542,9 @@ impl GetTracker, api::PaymentsRequest> } let amount = payment_attempt.get_total_amount().into(); - payment_attempt.request_overcapture = request.request_overcapture.or(Some(business_profile.always_request_overcapture)); // todoooo + payment_attempt.request_overcapture = request + .request_overcapture + .or(Some(business_profile.always_request_overcapture)); // todoooo payment_attempt.connector_mandate_detail = Some(DieselConnectorMandateReferenceId::foreign_from( @@ -1142,7 +1144,9 @@ impl PaymentCreate { .transpose()? .flatten(); - let request_overcapture = request.request_overcapture.or(Some(business_profile.always_request_overcapture)); + let request_overcapture = request + .request_overcapture + .or(Some(business_profile.always_request_overcapture)); if additional_pm_data.is_none() { // If recurring payment is made using payment_method_id, then fetch payment_method_data from retrieved payment_method object diff --git a/crates/router/src/core/payments/operations/payment_response.rs b/crates/router/src/core/payments/operations/payment_response.rs index 8208b45def0..164baa7bf0e 100644 --- a/crates/router/src/core/payments/operations/payment_response.rs +++ b/crates/router/src/core/payments/operations/payment_response.rs @@ -1533,7 +1533,7 @@ async fn payment_response_update_tracker( incremental_authorization_allowed, charge_id, overcapture_applied, - maximum_capturable_amount, + maximum_capturable_amount, .. } => { payment_data diff --git a/crates/router/src/core/payments/operations/payment_update.rs b/crates/router/src/core/payments/operations/payment_update.rs index d401c6dfe0a..78760f0e07f 100644 --- a/crates/router/src/core/payments/operations/payment_update.rs +++ b/crates/router/src/core/payments/operations/payment_update.rs @@ -442,8 +442,9 @@ impl GetTracker, api::PaymentsRequest> id: profile_id.get_string_repr().to_owned(), })?; - payment_attempt.request_overcapture = request.request_overcapture.or(Some(business_profile.always_request_overcapture)); - + payment_attempt.request_overcapture = request + .request_overcapture + .or(Some(business_profile.always_request_overcapture)); let surcharge_details = request.surcharge_details.map(|request_surcharge_details| { payments::types::SurchargeDetails::from((&request_surcharge_details, &payment_attempt)) @@ -801,7 +802,8 @@ impl UpdateTracker, api::PaymentsRequest> for .store .update_payment_attempt_with_attempt_id( payment_data.payment_attempt, - storage::PaymentAttemptUpdate::Update { //should we remove todooo + storage::PaymentAttemptUpdate::Update { + //should we remove todooo currency: payment_data.currency, status: get_attempt_status(), authentication_type: None, @@ -824,8 +826,8 @@ impl UpdateTracker, api::PaymentsRequest> for surcharge_amount, tax_amount, ), - maximum_capturable_amount: None, - overcapture_applied: None, + maximum_capturable_amount: None, + overcapture_applied: None, }, storage_scheme, ) diff --git a/crates/router/src/core/payments/retry.rs b/crates/router/src/core/payments/retry.rs index edc0bb80e39..63b5ffde45c 100644 --- a/crates/router/src/core/payments/retry.rs +++ b/crates/router/src/core/payments/retry.rs @@ -661,7 +661,6 @@ pub fn make_new_payment_attempt( request_overcapture: old_payment_attempt.request_overcapture, overcapture_applied: Default::default(), maximum_capturable_amount: Default::default(), - } } diff --git a/crates/router/src/core/utils.rs b/crates/router/src/core/utils.rs index 69c4dbaac2a..3831f029461 100644 --- a/crates/router/src/core/utils.rs +++ b/crates/router/src/core/utils.rs @@ -366,7 +366,6 @@ pub async fn construct_refund_router_data<'a, F>( split_refunds, integrity_object: None, refund_status: refund.refund_status, - }, response: Ok(types::RefundsResponseData { connector_refund_id: connector_refund_id.unwrap_or_default(), diff --git a/crates/router/tests/connectors/mifinity.rs b/crates/router/tests/connectors/mifinity.rs index a04480b63b4..89349be07bb 100644 --- a/crates/router/tests/connectors/mifinity.rs +++ b/crates/router/tests/connectors/mifinity.rs @@ -1,4 +1,3 @@ - use masking::Secret; use router::types::{self, domain, storage::enums}; use test_utils::connector_auth; diff --git a/crates/storage_impl/src/payments/payment_attempt.rs b/crates/storage_impl/src/payments/payment_attempt.rs index 5f8b00bc662..13815c4f633 100644 --- a/crates/storage_impl/src/payments/payment_attempt.rs +++ b/crates/storage_impl/src/payments/payment_attempt.rs @@ -565,8 +565,8 @@ impl PaymentAttemptInterface for KVRouterStore { profile_id: payment_attempt.profile_id.clone(), connector_mandate_detail: payment_attempt.connector_mandate_detail.clone(), request_overcapture: payment_attempt.request_overcapture, - overcapture_applied: payment_attempt.overcapture_applied, - maximum_capturable_amount: payment_attempt.maximum_capturable_amount, + overcapture_applied: payment_attempt.overcapture_applied, + maximum_capturable_amount: payment_attempt.maximum_capturable_amount, }; let field = format!("pa_{}", created_attempt.attempt_id);