From a0c0216d9e248de9c85c0630c8f21925ae087070 Mon Sep 17 00:00:00 2001 From: Shankar Singh C Date: Tue, 18 Jun 2024 16:33:13 +0530 Subject: [PATCH 1/3] feat(router): add payment method type duplication check for google_pay --- crates/router/src/core/payments/tokenization.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/router/src/core/payments/tokenization.rs b/crates/router/src/core/payments/tokenization.rs index 2d5d216a8569..38021d38a324 100644 --- a/crates/router/src/core/payments/tokenization.rs +++ b/crates/router/src/core/payments/tokenization.rs @@ -517,6 +517,8 @@ where None => { let customer_apple_pay_saved_pm_id_option = if payment_method_type == Some(api_models::enums::PaymentMethodType::ApplePay) + || payment_method_type + == Some(api_models::enums::PaymentMethodType::GooglePay) { match state .store @@ -532,6 +534,10 @@ where .find(|payment_method| { payment_method.payment_method_type == Some(api_models::enums::PaymentMethodType::ApplePay) + || payment_method.payment_method_type + == Some( + api_models::enums::PaymentMethodType::GooglePay, + ) }) .map(|pm| pm.payment_method_id.clone())), Err(error) => { From 3f17fb222cc7572f69adf4d31fbb0ccf6412175c Mon Sep 17 00:00:00 2001 From: Shankar Singh C Date: Wed, 19 Jun 2024 12:48:51 +0530 Subject: [PATCH 2/3] address pr comments --- crates/router/src/core/payments/tokenization.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/crates/router/src/core/payments/tokenization.rs b/crates/router/src/core/payments/tokenization.rs index 38021d38a324..3f5071fce1cf 100644 --- a/crates/router/src/core/payments/tokenization.rs +++ b/crates/router/src/core/payments/tokenization.rs @@ -532,12 +532,7 @@ where Ok(customer_payment_methods) => Ok(customer_payment_methods .iter() .find(|payment_method| { - payment_method.payment_method_type - == Some(api_models::enums::PaymentMethodType::ApplePay) - || payment_method.payment_method_type - == Some( - api_models::enums::PaymentMethodType::GooglePay, - ) + payment_method.payment_method_type == payment_method_type }) .map(|pm| pm.payment_method_id.clone())), Err(error) => { From 6e24c1c1eb75c28926e2d272ae6319926c6451b8 Mon Sep 17 00:00:00 2001 From: Shankar Singh C Date: Wed, 19 Jun 2024 14:51:14 +0530 Subject: [PATCH 3/3] address pr comments --- crates/router/src/core/payments/tokenization.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/crates/router/src/core/payments/tokenization.rs b/crates/router/src/core/payments/tokenization.rs index 3f5071fce1cf..f05a81b223f9 100644 --- a/crates/router/src/core/payments/tokenization.rs +++ b/crates/router/src/core/payments/tokenization.rs @@ -515,7 +515,7 @@ where } }, None => { - let customer_apple_pay_saved_pm_id_option = if payment_method_type + let customer_saved_pm_id_option = if payment_method_type == Some(api_models::enums::PaymentMethodType::ApplePay) || payment_method_type == Some(api_models::enums::PaymentMethodType::GooglePay) @@ -553,10 +553,8 @@ where Ok(None) }?; - if let Some(customer_apple_pay_saved_pm_id) = - customer_apple_pay_saved_pm_id_option - { - resp.payment_method_id = customer_apple_pay_saved_pm_id; + if let Some(customer_saved_pm_id) = customer_saved_pm_id_option { + resp.payment_method_id = customer_saved_pm_id; } else { let pm_metadata = create_payment_method_metadata(None, connector_token)?;