From 40a36fd319ccdb495deb077005ffcaea9cdf2427 Mon Sep 17 00:00:00 2001 From: sweta-sharma <77436883+Sweta-Kumari-Sharma@users.noreply.github.com> Date: Wed, 12 Feb 2025 13:18:11 +0530 Subject: [PATCH] refactor(connector): [Adyen] Removed deprecated PMTs from Ayden (Giropay, Sofort) (#7100) Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com> --- config/config.example.toml | 4 +- config/deployments/integration_test.toml | 4 +- config/deployments/production.toml | 4 +- config/deployments/sandbox.toml | 4 +- config/development.toml | 4 +- config/docker_compose.toml | 4 +- .../connector_configs/toml/development.toml | 4 -- crates/connector_configs/toml/production.toml | 4 -- crates/connector_configs/toml/sandbox.toml | 4 -- crates/router/src/connector/adyen.rs | 6 +-- .../src/connector/adyen/transformers.rs | 43 +++++-------------- loadtest/config/development.toml | 4 +- 12 files changed, 26 insertions(+), 63 deletions(-) diff --git a/config/config.example.toml b/config/config.example.toml index 15012c9240..05a0e069a1 100644 --- a/config/config.example.toml +++ b/config/config.example.toml @@ -463,11 +463,11 @@ bank_debit.becs = { connector_list = "gocardless" } bank_debit.bacs = { connector_list = "adyen" } # Mandate supported payment method type and connector for bank_debit bank_debit.sepa = { connector_list = "gocardless,adyen" } # Mandate supported payment method type and connector for bank_debit bank_redirect.ideal = { connector_list = "stripe,adyen,globalpay" } # Mandate supported payment method type and connector for bank_redirect -bank_redirect.sofort = { connector_list = "stripe,adyen,globalpay" } +bank_redirect.sofort = { connector_list = "stripe,globalpay" } wallet.apple_pay = { connector_list = "stripe,adyen,cybersource,noon,bankofamerica" } wallet.samsung_pay = { connector_list = "cybersource" } wallet.google_pay = { connector_list = "bankofamerica" } -bank_redirect.giropay = { connector_list = "adyen,globalpay" } +bank_redirect.giropay = { connector_list = "globalpay" } [mandates.update_mandate_supported] diff --git a/config/deployments/integration_test.toml b/config/deployments/integration_test.toml index bc46dda1fc..e5badf2cec 100644 --- a/config/deployments/integration_test.toml +++ b/config/deployments/integration_test.toml @@ -184,8 +184,8 @@ wallet.twint.connector_list = "adyen" wallet.vipps.connector_list = "adyen" bank_redirect.ideal.connector_list = "stripe,adyen,globalpay,multisafepay,nexinets" -bank_redirect.sofort.connector_list = "stripe,adyen,globalpay" -bank_redirect.giropay.connector_list = "adyen,globalpay,multisafepay,nexinets" +bank_redirect.sofort.connector_list = "stripe,globalpay" +bank_redirect.giropay.connector_list = "globalpay,multisafepay,nexinets" bank_redirect.bancontact_card.connector_list="adyen,stripe" bank_redirect.trustly.connector_list="adyen" bank_redirect.open_banking_uk.connector_list="adyen" diff --git a/config/deployments/production.toml b/config/deployments/production.toml index 07ca70b9af..32638988f6 100644 --- a/config/deployments/production.toml +++ b/config/deployments/production.toml @@ -184,8 +184,8 @@ wallet.twint.connector_list = "adyen" wallet.vipps.connector_list = "adyen" bank_redirect.ideal.connector_list = "stripe,adyen,globalpay,multisafepay,nexinets" -bank_redirect.sofort.connector_list = "stripe,adyen,globalpay" -bank_redirect.giropay.connector_list = "adyen,globalpay,multisafepay,nexinets" +bank_redirect.sofort.connector_list = "stripe,globalpay" +bank_redirect.giropay.connector_list = "globalpay,multisafepay,nexinets" bank_redirect.bancontact_card.connector_list="adyen,stripe" bank_redirect.trustly.connector_list="adyen" bank_redirect.open_banking_uk.connector_list="adyen" diff --git a/config/deployments/sandbox.toml b/config/deployments/sandbox.toml index b044641f88..f91cba9d99 100644 --- a/config/deployments/sandbox.toml +++ b/config/deployments/sandbox.toml @@ -184,8 +184,8 @@ wallet.twint.connector_list = "adyen" wallet.vipps.connector_list = "adyen" bank_redirect.ideal.connector_list = "stripe,adyen,globalpay,multisafepay,nexinets" -bank_redirect.sofort.connector_list = "stripe,adyen,globalpay" -bank_redirect.giropay.connector_list = "adyen,globalpay,multisafepay,nexinets" +bank_redirect.sofort.connector_list = "stripe,globalpay" +bank_redirect.giropay.connector_list = "globalpay,multisafepay,nexinets" bank_redirect.bancontact_card.connector_list="adyen,stripe" bank_redirect.trustly.connector_list="adyen" bank_redirect.open_banking_uk.connector_list="adyen" diff --git a/config/development.toml b/config/development.toml index 0cc3193a29..c2f284bea2 100644 --- a/config/development.toml +++ b/config/development.toml @@ -698,8 +698,8 @@ wallet.twint.connector_list = "adyen" wallet.vipps.connector_list = "adyen" bank_redirect.ideal.connector_list = "stripe,adyen,globalpay,multisafepay,nexinets" -bank_redirect.sofort.connector_list = "stripe,adyen,globalpay" -bank_redirect.giropay.connector_list = "adyen,globalpay,multisafepay,nexinets" +bank_redirect.sofort.connector_list = "stripe,globalpay" +bank_redirect.giropay.connector_list = "globalpay,multisafepay,nexinets" bank_redirect.bancontact_card.connector_list = "adyen,stripe" bank_redirect.trustly.connector_list = "adyen" bank_redirect.open_banking_uk.connector_list = "adyen" diff --git a/config/docker_compose.toml b/config/docker_compose.toml index cf5d83e4da..83e64ddc57 100644 --- a/config/docker_compose.toml +++ b/config/docker_compose.toml @@ -539,8 +539,8 @@ bank_debit.becs = { connector_list = "gocardless" } bank_debit.bacs = { connector_list = "adyen" } bank_debit.sepa = { connector_list = "gocardless,adyen" } bank_redirect.ideal = { connector_list = "stripe,adyen,globalpay" } -bank_redirect.sofort = { connector_list = "stripe,adyen,globalpay" } -bank_redirect.giropay = { connector_list = "adyen,globalpay" } +bank_redirect.sofort = { connector_list = "stripe,globalpay" } +bank_redirect.giropay = { connector_list = "globalpay" } [mandates.update_mandate_supported] card.credit = { connector_list = "cybersource" } diff --git a/crates/connector_configs/toml/development.toml b/crates/connector_configs/toml/development.toml index 8a0b2038c3..72272b425d 100644 --- a/crates/connector_configs/toml/development.toml +++ b/crates/connector_configs/toml/development.toml @@ -119,10 +119,6 @@ merchant_secret="Source verification key" payment_method_type = "sepa" [[adyen.bank_redirect]] payment_method_type = "ideal" -[[adyen.bank_redirect]] - payment_method_type = "giropay" -[[adyen.bank_redirect]] - payment_method_type = "sofort" [[adyen.bank_redirect]] payment_method_type = "eps" [[adyen.bank_redirect]] diff --git a/crates/connector_configs/toml/production.toml b/crates/connector_configs/toml/production.toml index 63cf2756fa..13f0409ebf 100644 --- a/crates/connector_configs/toml/production.toml +++ b/crates/connector_configs/toml/production.toml @@ -106,10 +106,6 @@ merchant_secret="Source verification key" payment_method_type = "bacs" [[adyen.bank_redirect]] payment_method_type = "ideal" -[[adyen.bank_redirect]] - payment_method_type = "giropay" -[[adyen.bank_redirect]] - payment_method_type = "sofort" [[adyen.bank_redirect]] payment_method_type = "eps" [[adyen.wallet]] diff --git a/crates/connector_configs/toml/sandbox.toml b/crates/connector_configs/toml/sandbox.toml index 4c28f29550..70895d48c8 100644 --- a/crates/connector_configs/toml/sandbox.toml +++ b/crates/connector_configs/toml/sandbox.toml @@ -119,10 +119,6 @@ merchant_secret="Source verification key" payment_method_type = "sepa" [[adyen.bank_redirect]] payment_method_type = "ideal" -[[adyen.bank_redirect]] - payment_method_type = "giropay" -[[adyen.bank_redirect]] - payment_method_type = "sofort" [[adyen.bank_redirect]] payment_method_type = "eps" [[adyen.bank_redirect]] diff --git a/crates/router/src/connector/adyen.rs b/crates/router/src/connector/adyen.rs index 91e6575957..7067592771 100644 --- a/crates/router/src/connector/adyen.rs +++ b/crates/router/src/connector/adyen.rs @@ -192,8 +192,6 @@ impl ConnectorValidation for Adyen { | PaymentMethodType::Alfamart | PaymentMethodType::Indomaret | PaymentMethodType::FamilyMart - | PaymentMethodType::Sofort - | PaymentMethodType::Giropay | PaymentMethodType::Seicomart | PaymentMethodType::PayEasy | PaymentMethodType::MiniStop @@ -228,10 +226,12 @@ impl ConnectorValidation for Adyen { | PaymentMethodType::Pse | PaymentMethodType::LocalBankTransfer | PaymentMethodType::Efecty + | PaymentMethodType::Giropay | PaymentMethodType::PagoEfectivo | PaymentMethodType::PromptPay | PaymentMethodType::RedCompra | PaymentMethodType::RedPagos + | PaymentMethodType::Sofort | PaymentMethodType::CryptoCurrency | PaymentMethodType::Evoucher | PaymentMethodType::Cashapp @@ -274,9 +274,7 @@ impl ConnectorValidation for Adyen { PaymentMethodDataType::VippsRedirect, PaymentMethodDataType::KlarnaRedirect, PaymentMethodDataType::Ideal, - PaymentMethodDataType::Sofort, PaymentMethodDataType::OpenBankingUk, - PaymentMethodDataType::Giropay, PaymentMethodDataType::Trustly, PaymentMethodDataType::BancontactCard, PaymentMethodDataType::AchBankDebit, diff --git a/crates/router/src/connector/adyen/transformers.rs b/crates/router/src/connector/adyen/transformers.rs index 69749500da..465730cca6 100644 --- a/crates/router/src/connector/adyen/transformers.rs +++ b/crates/router/src/connector/adyen/transformers.rs @@ -551,7 +551,6 @@ pub enum AdyenPaymentMethod<'a> { Eps(Box>), #[serde(rename = "gcash")] Gcash(Box), - Giropay(Box), Gpay(Box), #[serde(rename = "gopay_wallet")] GoPay(Box), @@ -585,8 +584,6 @@ pub enum AdyenPaymentMethod<'a> { PayBright, #[serde(rename = "doku_permata_lite_atm")] PermataBankTransfer(Box), - #[serde(rename = "directEbanking")] - Sofort, #[serde(rename = "trustly")] Trustly, #[serde(rename = "walley")] @@ -1310,7 +1307,6 @@ pub enum PaymentType { Dana, Eps, Gcash, - Giropay, Googlepay, #[serde(rename = "gopay_wallet")] GoPay, @@ -1346,8 +1342,6 @@ pub enum PaymentType { PayBright, Paypal, Scheme, - #[serde(rename = "directEbanking")] - Sofort, #[serde(rename = "networkToken")] NetworkToken, Trustly, @@ -2075,13 +2069,11 @@ impl TryFrom<&storage_enums::PaymentMethodType> for PaymentType { | storage_enums::PaymentMethodType::BancontactCard | storage_enums::PaymentMethodType::Blik | storage_enums::PaymentMethodType::Eps - | storage_enums::PaymentMethodType::Giropay | storage_enums::PaymentMethodType::Ideal | storage_enums::PaymentMethodType::OnlineBankingCzechRepublic | storage_enums::PaymentMethodType::OnlineBankingFinland | storage_enums::PaymentMethodType::OnlineBankingPoland | storage_enums::PaymentMethodType::OnlineBankingSlovakia - | storage_enums::PaymentMethodType::Sofort | storage_enums::PaymentMethodType::Trustly | storage_enums::PaymentMethodType::GooglePay | storage_enums::PaymentMethodType::AliPay @@ -2458,11 +2450,6 @@ impl ), }), )), - domain::BankRedirectData::Giropay { .. } => { - Ok(AdyenPaymentMethod::Giropay(Box::new(PmdForPaymentType { - payment_type: PaymentType::Giropay, - }))) - } domain::BankRedirectData::Ideal { bank_name, .. } => { let issuer = if test_mode.unwrap_or(true) { Some( @@ -2533,11 +2520,12 @@ impl }, })), ), - domain::BankRedirectData::Sofort { .. } => Ok(AdyenPaymentMethod::Sofort), domain::BankRedirectData::Trustly { .. } => Ok(AdyenPaymentMethod::Trustly), - domain::BankRedirectData::Interac { .. } + domain::BankRedirectData::Giropay { .. } + | domain::BankRedirectData::Interac { .. } | domain::BankRedirectData::LocalBankRedirect {} - | domain::BankRedirectData::Przelewy24 { .. } => { + | domain::BankRedirectData::Przelewy24 { .. } + | domain::BankRedirectData::Sofort { .. } => { Err(errors::ConnectorError::NotImplemented( utils::get_unimplemented_payment_method_error_message("Adyen"), ) @@ -3220,20 +3208,13 @@ fn get_redirect_extra_details( ) -> errors::CustomResult<(Option, Option), errors::ConnectorError> { match item.request.payment_method_data { - domain::PaymentMethodData::BankRedirect(ref redirect_data) => match redirect_data { - domain::BankRedirectData::Sofort { - preferred_language, .. - } => { - let country = item.get_optional_billing_country(); - Ok((preferred_language.clone(), country)) - } + domain::PaymentMethodData::BankRedirect( domain::BankRedirectData::Trustly { .. } - | domain::BankRedirectData::OpenBankingUk { .. } => { - let country = item.get_optional_billing_country(); - Ok((None, country)) - } - _ => Ok((None, None)), - }, + | domain::BankRedirectData::OpenBankingUk { .. }, + ) => { + let country = item.get_optional_billing_country(); + Ok((None, country)) + } _ => Ok((None, None)), } } @@ -4074,7 +4055,6 @@ pub fn get_wait_screen_metadata( | PaymentType::Dana | PaymentType::Eps | PaymentType::Gcash - | PaymentType::Giropay | PaymentType::Googlepay | PaymentType::GoPay | PaymentType::Ideal @@ -4094,7 +4074,6 @@ pub fn get_wait_screen_metadata( | PaymentType::PayBright | PaymentType::Paypal | PaymentType::Scheme - | PaymentType::Sofort | PaymentType::NetworkToken | PaymentType::Trustly | PaymentType::TouchNGo @@ -4191,7 +4170,6 @@ pub fn get_present_to_shopper_metadata( | PaymentType::Dana | PaymentType::Eps | PaymentType::Gcash - | PaymentType::Giropay | PaymentType::Googlepay | PaymentType::GoPay | PaymentType::Ideal @@ -4213,7 +4191,6 @@ pub fn get_present_to_shopper_metadata( | PaymentType::PayBright | PaymentType::Paypal | PaymentType::Scheme - | PaymentType::Sofort | PaymentType::NetworkToken | PaymentType::Trustly | PaymentType::TouchNGo diff --git a/loadtest/config/development.toml b/loadtest/config/development.toml index c2cc8833f8..a57007f0d3 100644 --- a/loadtest/config/development.toml +++ b/loadtest/config/development.toml @@ -355,8 +355,8 @@ wallet.twint.connector_list = "adyen" wallet.vipps.connector_list = "adyen" bank_redirect.ideal.connector_list = "stripe,adyen,globalpay,multisafepay,nexinets" -bank_redirect.sofort.connector_list = "stripe,adyen,globalpay" -bank_redirect.giropay.connector_list = "adyen,globalpay,multisafepay,nexinets" +bank_redirect.sofort.connector_list = "stripe,globalpay" +bank_redirect.giropay.connector_list = "globalpay,multisafepay,nexinets" bank_redirect.bancontact_card.connector_list="adyen,stripe" bank_redirect.trustly.connector_list="adyen" bank_redirect.open_banking_uk.connector_list="adyen"