Merge branch 'main' into collection-update

juspay · Sep 30, 2023 · 4c8b317 · 4c8b317
2 parents a59392c + 14fec5c
commit 4c8b317
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/config/docker_compose.toml b/config/docker_compose.toml
@@ -302,3 +302,7 @@ payout_connector_list = "wise"
 
 [multiple_api_version_supported_connectors]
 supported_connectors = "braintree"
+
+[lock_settings]
+redis_lock_expiry_seconds = 180 # 3 * 60 seconds
+delay_between_retries_in_milliseconds = 500
diff --git a/crates/router/src/connector/gocardless/transformers.rs b/crates/router/src/connector/gocardless/transformers.rs
@@ -259,26 +259,34 @@ impl TryFrom<&BankDebitData> for CustomerBankAccount {
     fn try_from(item: &BankDebitData) -> Result<Self, Self::Error> {
         match item {
             BankDebitData::AchBankDebit {
-                billing_details,
+                //billing_details,
                 account_number,
                 routing_number,
-                bank_type,
-                bank_account_holder_name,
+                // bank_type,
+                //bank_account_holder_name,
+                card_holder_name,
                 ..
             } => {
-                let bank_type = bank_type.ok_or_else(utils::missing_field_err("bank_type"))?;
-                let country_code = billing_details.get_billing_country()?;
+                //let bank_type = bank_type.ok_or_else(utils::missing_field_err("bank_type"))?;
+                //let country_code = billing_details.get_billing_country()?;
+                //let account_holder_name =
+                //   bank_account_holder_name
+                //        .clone()
+                //      .ok_or_else(utils::missing_field_err(
+                //    "payment_method_data.bank_debit.ach_bank_debit.bank_account_holder_name",
+                //))?;
                 let account_holder_name =
-                    bank_account_holder_name
+                    card_holder_name
                         .clone()
                         .ok_or_else(utils::missing_field_err(
-                        "payment_method_data.bank_debit.ach_bank_debit.bank_account_holder_name",
-                    ))?;
+                            "payment_method_data.bank_debit.ach_bank_debit.card_holder_name",
+                        ))?;
                 let us_bank_account = USBankAccount {
-                    country_code,
+                    country_code: CountryAlpha2::US,
                     account_number: account_number.clone(),
                     bank_code: routing_number.clone(),
-                    account_type: AccountType::from(bank_type),
+                    //account_type: AccountType::from(bank_type),
+                    account_type: AccountType::Checking,
                     account_holder_name,
                 };
                 Ok(Self::USBankAccount(us_bank_account))