Skip to content

Commit 189696f

Browse files
chore: run formatter
1 parent faba10a commit 189696f

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

Diff for: crates/router/src/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,4 @@ pub const IRRELEVANT_PAYMENT_INTENT_ID: &str = "irrelevant_payment_intent_id";
240240
pub const IRRELEVANT_PAYMENT_ATTEMPT_ID: &str = "irrelevant_payment_attempt_id";
241241

242242
// Default payment method storing TTL in redis in seconds
243-
pub const DEFAULT_PAYMENT_METHOD_STORE_TTL: i64 = 86400; // 1 day
243+
pub const DEFAULT_PAYMENT_METHOD_STORE_TTL: i64 = 86400; // 1 day

Diff for: crates/router/src/core/payment_methods.rs

+22-21
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ use common_utils::{consts::DEFAULT_LOCALE, id_type};
3434
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
3535
use common_utils::{
3636
crypto::Encryptable,
37+
errors,
3738
ext_traits::{AsyncExt, Encode, ValueExt},
3839
fp_utils::when,
3940
generate_id, types as util_types,
40-
errors,
4141
};
4242
use diesel_models::{
4343
enums, GenericLinkNew, PaymentMethodCollectLink, PaymentMethodCollectLinkData,
@@ -1890,11 +1890,12 @@ pub async fn retrieve_payment_method(
18901890
)
18911891
.await
18921892
.to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;
1893-
1893+
18941894
let payment_method_in_cache = get_single_use_token_from_store(
18951895
&state.clone(),
1896-
payment_method_data::SingleUseTokenKey::store_key(pm_id.clone().get_string_repr())
1897-
).await
1896+
payment_method_data::SingleUseTokenKey::store_key(pm_id.clone().get_string_repr()),
1897+
)
1898+
.await
18981899
.to_not_found_response(errors::ApiErrorResponse::GenericNotFoundError {
18991900
message: "payment methods session does not exist or has expired".to_string(),
19001901
})
@@ -2690,11 +2691,12 @@ async fn create_single_use_tokenization_flow(
26902691
payment_method_session: &domain::payment_methods::PaymentMethodSession,
26912692
) -> RouterResult<()> {
26922693
let customer_id = payment_method_create_request.customer_id.to_owned();
2693-
let connector_id = payment_method_create_request.get_tokenize_connector_id()
2694-
.change_context(errors::ApiErrorResponse::MissingRequiredField {
2695-
field_name: "psp_tokenization.connector_id",
2696-
})
2697-
.attach_printable("Failed to get tokenize connector id")?;
2694+
let connector_id = payment_method_create_request
2695+
.get_tokenize_connector_id()
2696+
.change_context(errors::ApiErrorResponse::MissingRequiredField {
2697+
field_name: "psp_tokenization.connector_id",
2698+
})
2699+
.attach_printable("Failed to get tokenize connector id")?;
26982700

26992701
let db = &state.store;
27002702

@@ -2717,7 +2719,9 @@ async fn create_single_use_tokenization_flow(
27172719
.change_context(errors::ApiErrorResponse::MissingRequiredField {
27182720
field_name: "card_cvc",
27192721
})
2720-
.attach_printable("Failed to convert type from Payment Method Create Data to Payment Method Data")?,
2722+
.attach_printable(
2723+
"Failed to convert type from Payment Method Create Data to Payment Method Data",
2724+
)?,
27212725
browser_info: None,
27222726
currency: api_models::enums::Currency::default(),
27232727
amount: None,
@@ -2807,17 +2811,17 @@ async fn create_single_use_tokenization_flow(
28072811
reason: err.reason,
28082812
})?;
28092813

2810-
let token = token_response
2811-
.ok_or(errors::ApiErrorResponse::GenericNotFoundError {
2812-
message: "No token recevied from the PSP".to_string(),
2813-
})?;
2814+
let token = token_response.ok_or(errors::ApiErrorResponse::GenericNotFoundError {
2815+
message: "No token recevied from the PSP".to_string(),
2816+
})?;
28142817

28152818
let value = payment_method_data::PaymentMethodTokenSingleUse::get_single_use_token_from_payment_method_token(
28162819
token.clone(),
28172820
connector_id.clone()
28182821
);
28192822

2820-
let key = payment_method_data::SingleUseTokenKey::store_key(payment_method.id.get_string_repr());
2823+
let key =
2824+
payment_method_data::SingleUseTokenKey::store_key(payment_method.id.get_string_repr());
28212825

28222826
add_single_use_token_to_store(&state, key, value).await?;
28232827

@@ -2852,10 +2856,7 @@ async fn add_single_use_token_to_store(
28522856
async fn get_single_use_token_from_store(
28532857
state: &SessionState,
28542858
key: payment_method_data::SingleUseTokenKey,
2855-
) -> CustomResult<
2856-
payment_method_data::PaymentMethodTokenSingleUse,
2857-
errors::StorageError,
2858-
>{
2859+
) -> CustomResult<payment_method_data::PaymentMethodTokenSingleUse, errors::StorageError> {
28592860
let redis_connection = state
28602861
.store
28612862
.get_redis_conn()
@@ -2865,9 +2866,9 @@ async fn get_single_use_token_from_store(
28652866
redis_connection
28662867
.get_and_deserialize_key::<payment_method_data::PaymentMethodTokenSingleUse>(
28672868
&payment_method_data::SingleUseTokenKey::get_store_key(&key).into(),
2868-
"PaymentMethodTokenSingleUse"
2869+
"PaymentMethodTokenSingleUse",
28692870
)
28702871
.await
28712872
.change_context(errors::StorageError::KVError)
28722873
.attach_printable("Failed to get payment method token from redis")
2873-
}
2874+
}

Diff for: crates/router/src/core/payment_methods/transformers.rs

+10-8
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use common_utils::{
66
request::RequestContent,
77
};
88
use error_stack::ResultExt;
9+
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
10+
use hyperswitch_domain_models::payment_method_data;
911
use josekit::jwe;
1012
use router_env::tracing_actix_web::RequestId;
1113
use serde::{Deserialize, Serialize};
@@ -21,8 +23,6 @@ use crate::{
2123
types::{api, domain},
2224
utils::OptionExt,
2325
};
24-
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
25-
use hyperswitch_domain_models::payment_method_data;
2626

2727
#[derive(Debug, Serialize)]
2828
#[serde(untagged)]
@@ -574,11 +574,11 @@ pub fn generate_payment_method_response(
574574
.map(transformers::ForeignFrom::foreign_from)
575575
.collect::<Vec<_>>()
576576
});
577-
577+
578578
if let Some(token) = single_use_token {
579-
connector_tokens.append(transformers::ForeignFrom::foreign_from(token.clone()));
580-
}
581-
579+
connector_tokens.append(transformers::ForeignFrom::foreign_from(token.clone()));
580+
}
581+
582582
let network_token_pmd = payment_method
583583
.network_token_payment_method_data
584584
.clone()
@@ -1123,7 +1123,9 @@ impl
11231123
}
11241124

11251125
#[cfg(feature = "v2")]
1126-
impl transformers::ForeignFrom<payment_method_data::PaymentMethodTokenSingleUse> for api_models::payment_methods::ConnectorTokenDetails {
1126+
impl transformers::ForeignFrom<payment_method_data::PaymentMethodTokenSingleUse>
1127+
for api_models::payment_methods::ConnectorTokenDetails
1128+
{
11271129
fn foreign_from(token: payment_method_data::PaymentMethodTokenSingleUse) -> Self {
11281130
Self {
11291131
connector_id: token.merchant_connector_id,
@@ -1136,4 +1138,4 @@ impl transformers::ForeignFrom<payment_method_data::PaymentMethodTokenSingleUse>
11361138
token: Secret::new(token.token),
11371139
}
11381140
}
1139-
}
1141+
}

Diff for: crates/router/src/core/payments/tokenization.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1355,9 +1355,7 @@ pub async fn add_token_for_payment_method(
13551355
state: SessionState,
13561356
merchant_connector_account_details: &hyperswitch_domain_models::merchant_connector_account::MerchantConnectorAccount,
13571357
) -> RouterResult<types::PaymentMethodTokenResult> {
1358-
let connector_id = merchant_connector_account_details
1359-
.id
1360-
.clone();
1358+
let connector_id = merchant_connector_account_details.id.clone();
13611359
let connector_data = api::ConnectorData::get_connector_by_name(
13621360
&(state.conf.connectors),
13631361
&merchant_connector_account_details

0 commit comments

Comments
 (0)