rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 00:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(connector): [BOA/CYB] Make state,zip optional for Non US CA Txns (#4915)

Browse Source 
Co-authored-by: Deepanshu Bansal <deepanshu.bansal@Deepanshu-Bansal-K3PYF02LFW.local>
This commit is contained in:
DEEPANSHU BANSAL
2024-06-07 19:08:52 +05:30
committed by GitHub
parent d0fd7095cd
commit 2f12cca7ae
2 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/router/src/connector/bankofamerica/transformers.rs
View File

@ -264,8 +264,10 @@ pub struct BillTo {
last_name: Secret<String>, last_name: Secret<String>,
address1: Secret<String>, address1: Secret<String>,
locality: Secret<String>, locality: Secret<String>,
administrative_area: Secret<String>, #[serde(skip_serializing_if = "Option::is_none")]
postal_code: Secret<String>, administrative_area: Option<Secret<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
postal_code: Option<Secret<String>>,
country: api_enums::CountryAlpha2, country: api_enums::CountryAlpha2,
email: pii::Email, email: pii::Email,
} }
@ -448,17 +450,37 @@ fn build_bill_to(
.address .address
.as_ref() .as_ref()
.ok_or_else(utils::missing_field_err("billing.address"))?; .ok_or_else(utils::missing_field_err("billing.address"))?;
let mut state = address.to_state_code()?.peek().clone();
state.truncate(20); let country = address.get_country()?.to_owned();
let first_name = address.get_first_name()?; let first_name = address.get_first_name()?;
let (administrative_area, postal_code) =
if country == api_enums::CountryAlpha2::US || country == api_enums::CountryAlpha2::CA {
let mut state = address.to_state_code()?.peek().clone();
state.truncate(20);
(
Some(Secret::from(state)),
Some(address.get_zip()?.to_owned()),
)
} else {
let zip = address.zip.clone();
let mut_state = address.state.clone().map(|state| state.expose());
match mut_state {
Some(mut state) => {
state.truncate(20);
(Some(Secret::from(state)), zip)
}
None => (None, zip),
}
};
Ok(BillTo { Ok(BillTo {
first_name: first_name.clone(), first_name: first_name.clone(),
last_name: address.get_last_name().unwrap_or(first_name).clone(), last_name: address.get_last_name().unwrap_or(first_name).clone(),
address1: address.get_line1()?.to_owned(), address1: address.get_line1()?.to_owned(),
locality: Secret::new(address.get_city()?.to_owned()), locality: Secret::new(address.get_city()?.to_owned()),
administrative_area: Secret::from(state), administrative_area,
postal_code: address.get_zip()?.to_owned(), postal_code,
country: address.get_country()?.to_owned(), country,
email, email,
}) })
} }

36
crates/router/src/connector/cybersource/transformers.rs
View File

@ -482,8 +482,10 @@ pub struct BillTo {
last_name: Secret<String>, last_name: Secret<String>,
address1: Secret<String>, address1: Secret<String>,
locality: String, locality: String,
administrative_area: Secret<String>, #[serde(skip_serializing_if = "Option::is_none")]
postal_code: Secret<String>, administrative_area: Option<Secret<String>>,
#[serde(skip_serializing_if = "Option::is_none")]
postal_code: Option<Secret<String>>,
country: api_enums::CountryAlpha2, country: api_enums::CountryAlpha2,
email: pii::Email, email: pii::Email,
} }
@ -868,17 +870,37 @@ fn build_bill_to(
.address .address
.as_ref() .as_ref()
.ok_or_else(utils::missing_field_err("billing.address"))?; .ok_or_else(utils::missing_field_err("billing.address"))?;
let mut state = address.to_state_code()?.peek().clone();
state.truncate(20); let country = address.get_country()?.to_owned();
let first_name = address.get_first_name()?; let first_name = address.get_first_name()?;
let (administrative_area, postal_code) =
if country == api_enums::CountryAlpha2::US || country == api_enums::CountryAlpha2::CA {
let mut state = address.to_state_code()?.peek().clone();
state.truncate(20);
(
Some(Secret::from(state)),
Some(address.get_zip()?.to_owned()),
)
} else {
let zip = address.zip.clone();
let mut_state = address.state.clone().map(|state| state.expose());
match mut_state {
Some(mut state) => {
state.truncate(20);
(Some(Secret::from(state)), zip)
}
None => (None, zip),
}
};
Ok(BillTo { Ok(BillTo {
first_name: first_name.clone(), first_name: first_name.clone(),
last_name: address.get_last_name().unwrap_or(first_name).clone(), last_name: address.get_last_name().unwrap_or(first_name).clone(),
address1: address.get_line1()?.to_owned(), address1: address.get_line1()?.to_owned(),
locality: address.get_city()?.to_owned(), locality: address.get_city()?.to_owned(),
administrative_area: Secret::from(state), administrative_area,
postal_code: address.get_zip()?.to_owned(), postal_code,
country: address.get_country()?.to_owned(), country,
email, email,
}) })
} }