Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(pm_list): add required fields for sofort #3192

Merged
merged 27 commits into from
Jan 30, 2024
Merged

feat(pm_list): add required fields for sofort #3192

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bd1c1dc
add dynamic fields for sofort aci
AkshayaFoiger Dec 21, 2023
b3d0f99
add dynamic field changes for sofort aci
AkshayaFoiger Dec 21, 2023
dd67fee
add dynamic field changes for sofort aci
AkshayaFoiger Dec 21, 2023
0bd5824
add globalpay and mollie dynamic fields for sofort
AkshayaFoiger Dec 21, 2023
588c6b3
add dynamic fields for sofort
AkshayaFoiger Dec 21, 2023
8679744
chore: run formatter
hyperswitch-bot[bot] Dec 21, 2023
eb36df4
docs(openapi): re-generate OpenAPI specification
hyperswitch-bot[bot] Dec 21, 2023
e790955
add mandate req field for stripe sofort
AkshayaFoiger Jan 1, 2024
678eb53
chore: run formatter
hyperswitch-bot[bot] Jan 1, 2024
4c4e0c0
Merge branch 'main' into dynamic_field/sofort
AkshayaFoiger Jan 9, 2024
bd59a2e
make fields manditory
AkshayaFoiger Jan 9, 2024
3f52d5f
Merge branch 'main' into dynamic_field/sofort
AkshayaFoiger Jan 11, 2024
51fc9a0
add mandate config and refactor stripe sofort
AkshayaFoiger Jan 11, 2024
4737bf5
refactor stripe transformer
AkshayaFoiger Jan 11, 2024
8749233
remove extra field
AkshayaFoiger Jan 11, 2024
28cb2cd
correct field path
AkshayaFoiger Jan 11, 2024
17ee23d
Update crates/router/src/connector/paypal/transformers.rs
AkshayaFoiger Jan 12, 2024
9bc80d4
Merge branch 'main' into dynamic_field/sofort
AkshayaFoiger Jan 12, 2024
1b7c138
fix clippy error
AkshayaFoiger Jan 12, 2024
2bc92a4
fix clippy error
AkshayaFoiger Jan 17, 2024
1717524
chore: run formatter
hyperswitch-bot[bot] Jan 17, 2024
6d65743
resolve comment: make stripe country req
AkshayaFoiger Jan 18, 2024
cb87d75
Update crates/router/src/configs/defaults.rs
AkshayaFoiger Jan 18, 2024
ea7eb37
add comment
AkshayaFoiger Jan 18, 2024
9c0af54
add re field for stripe
AkshayaFoiger Jan 18, 2024
5821804
chore: run formatter
hyperswitch-bot[bot] Jan 18, 2024
c0ccd99
Merge branch 'main' into dynamic_field/sofort
AkshayaFoiger Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/config.example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,8 @@ pay_later.klarna = { connector_list = "adyen" } # Mandate supported payment
bank_debit.ach = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
bank_debit.becs = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
bank_debit.sepa = { connector_list = "gocardless" } # Mandate supported payment method type and connector for bank_debit
bank_redirect.ideal = {connector_list = "stripe,adyen"} # Mandate supported payment method type and connector for bank_redirect
bank_redirect.ideal = {connector_list = "stripe,adyen,globalpay"} # Mandate supported payment method type and connector for bank_redirect
AkshayaFoiger marked this conversation as resolved.
Show resolved Hide resolved
bank_redirect.sofort = {connector_list = "stripe,adyen,globalpay"}


# Required fields info used while listing the payment_method_data
Expand Down
3 changes: 2 additions & 1 deletion config/development.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,8 @@ card.debit = { connector_list = "stripe,adyen,authorizedotnet,cybersource,global
bank_debit.ach = { connector_list = "gocardless"}
bank_debit.becs = { connector_list = "gocardless"}
bank_debit.sepa = { connector_list = "gocardless"}
bank_redirect.ideal = {connector_list = "stripe,adyen"}
bank_redirect.ideal = {connector_list = "stripe,adyen,globalpay"}
bank_redirect.sofort = {connector_list = "stripe,adyen,globalpay"}

[connector_request_reference_id_config]
merchant_ids_send_payment_id_as_connector_request_id = []
Expand Down
3 changes: 2 additions & 1 deletion config/docker_compose.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ card.debit = {connector_list = "stripe,adyen,authorizedotnet,cybersource,globalp
bank_debit.ach = { connector_list = "gocardless"}
bank_debit.becs = { connector_list = "gocardless"}
bank_debit.sepa = { connector_list = "gocardless"}
bank_redirect.ideal = {connector_list = "stripe,adyen"}
bank_redirect.ideal = {connector_list = "stripe,adyen,globalpay"}
bank_redirect.sofort = {connector_list = "stripe,adyen,globalpay"}

[connector_customer]
connector_list = "gocardless,stax,stripe"
Expand Down
6 changes: 3 additions & 3 deletions crates/api_models/src/payments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,15 +1270,15 @@ pub enum BankRedirectData {
},
Sofort {
/// The billing details for bank redirection
billing_details: BankRedirectBilling,
billing_details: Option<BankRedirectBilling>,

/// The country for bank payment
#[schema(value_type = CountryAlpha2, example = "US")]
country: api_enums::CountryAlpha2,
country: Option<api_enums::CountryAlpha2>,

/// The preferred language
#[schema(example = "en")]
preferred_language: String,
preferred_language: Option<String>,
},
Trustly {
/// The country for bank payment
Expand Down
275 changes: 273 additions & 2 deletions crates/router/src/configs/defaults.rs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion crates/router/src/connector/aci/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,11 @@ impl
api_models::payments::BankRedirectData::Sofort { country, .. } => {
Self::BankRedirect(Box::new(BankRedirectionPMData {
payment_brand: PaymentBrand::Sofortueberweisung,
bank_account_country: Some(country.to_owned()),
bank_account_country: Some(country.to_owned().ok_or(
errors::ConnectorError::MissingRequiredField {
field_name: "country",
},
)?),
bank_account_bank_name: None,
bank_account_bic: None,
bank_account_iban: None,
Expand Down
5 changes: 1 addition & 4 deletions crates/router/src/connector/adyen/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2751,10 +2751,7 @@ fn get_redirect_extra_details(
country,
preferred_language,
..
} => Ok((
Some(preferred_language.to_string()),
Some(country.to_owned()),
)),
} => Ok((preferred_language.clone(), *country)),
api_models::payments::BankRedirectData::OpenBankingUk { country, .. } => {
let country = country.ok_or(errors::ConnectorError::MissingRequiredField {
field_name: "country",
Expand Down
11 changes: 9 additions & 2 deletions crates/router/src/connector/paypal/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,15 @@ fn get_payment_source(
preferred_language: _,
billing_details,
} => Ok(PaymentSourceItem::Sofort(RedirectRequest {
name: billing_details.get_billing_name()?,
country_code: *country,
name: billing_details
.clone()
.ok_or(errors::ConnectorError::MissingRequiredField {
field_name: "sofort.billing_details",
})?
.get_billing_name()?,
country_code: country.ok_or(errors::ConnectorError::MissingRequiredField {
field_name: "sofort.billing_details.country",
})?,
experience_context: ContextStruct {
return_url: item.request.complete_authorize_url.clone(),
cancel_url: item.request.complete_authorize_url.clone(),
Expand Down
86 changes: 47 additions & 39 deletions crates/router/src/connector/stripe/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ pub struct StripeSofort {
#[serde(rename = "payment_method_data[type]")]
pub payment_method_data_type: StripePaymentMethodType,
#[serde(rename = "payment_method_options[sofort][preferred_language]")]
preferred_language: String,
preferred_language: Option<String>,
#[serde(rename = "payment_method_data[sofort][country]")]
country: api_enums::CountryAlpha2,
country: Option<api_enums::CountryAlpha2>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this not mandatory??

Copy link
Contributor Author

@AkshayaFoiger AkshayaFoiger Jan 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Country is not mandatory for stripe sofort

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as we checked , it is mandatory. make the necessary changes

}

#[derive(Debug, Eq, PartialEq, Serialize)]
Expand Down Expand Up @@ -1115,36 +1115,10 @@ impl TryFrom<(&payments::BankRedirectData, Option<bool>)> for StripeBillingAddre
}),
payments::BankRedirectData::Ideal {
billing_details, ..
} => {
let billing_name = billing_details
.clone()
.and_then(|billing_data| billing_data.billing_name.clone());

let billing_email = billing_details
.clone()
.and_then(|billing_data| billing_data.email.clone());
match is_customer_initiated_mandate_payment {
Some(true) => Ok(Self {
name: Some(billing_name.ok_or(
errors::ConnectorError::MissingRequiredField {
field_name: "billing_name",
},
)?),

email: Some(billing_email.ok_or(
errors::ConnectorError::MissingRequiredField {
field_name: "billing_email",
},
)?),
..Self::default()
}),
Some(false) | None => Ok(Self {
name: billing_name,
email: billing_email,
..Self::default()
}),
}
}
} => Ok(get_stripe_sepa_dd_mandate_billing_details(
billing_details,
is_customer_initiated_mandate_payment,
)?),
Comment on lines +1118 to +1121
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are ideal changes done in sofort pr?

Copy link
Contributor Author

@AkshayaFoiger AkshayaFoiger Jan 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recurring pay for Ideal and Sofort in stripe happens through SEPA Direct Debit payments. Therefore both requires same request body resulting in repeated code, hence I removed the redundancy by moving it into a function get_stripe_sepa_dd_mandate_billing_details

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can u please add the same comment in code to avoid confusion in future

payments::BankRedirectData::Przelewy24 {
billing_details, ..
} => Ok(Self {
Expand Down Expand Up @@ -1183,11 +1157,11 @@ impl TryFrom<(&payments::BankRedirectData, Option<bool>)> for StripeBillingAddre
}
payments::BankRedirectData::Sofort {
billing_details, ..
} => Ok(Self {
name: billing_details.billing_name.clone(),
email: billing_details.email.clone(),
..Self::default()
}),
} => Ok(get_stripe_sepa_dd_mandate_billing_details(
billing_details,
is_customer_initiated_mandate_payment,
)?),

payments::BankRedirectData::Bizum {}
| payments::BankRedirectData::Blik { .. }
| payments::BankRedirectData::Interac { .. }
Expand Down Expand Up @@ -1674,8 +1648,8 @@ impl TryFrom<&payments::BankRedirectData> for StripePaymentMethodData {
} => Ok(Self::BankRedirect(StripeBankRedirectData::StripeSofort(
Box::new(StripeSofort {
payment_method_data_type,
country: country.to_owned(),
preferred_language: preferred_language.to_owned(),
country: *country,
preferred_language: preferred_language.clone(),
}),
))),
payments::BankRedirectData::OnlineBankingFpx { .. } => {
Expand Down Expand Up @@ -3593,6 +3567,40 @@ pub struct Evidence {
pub submit: bool,
}

fn get_stripe_sepa_dd_mandate_billing_details(
billing_details: &Option<payments::BankRedirectBilling>,
is_customer_initiated_mandate_payment: Option<bool>,
) -> Result<StripeBillingAddress, errors::ConnectorError> {
let billing_name = billing_details
.clone()
.and_then(|billing_data| billing_data.billing_name.clone());

let billing_email = billing_details
.clone()
.and_then(|billing_data| billing_data.email.clone());
match is_customer_initiated_mandate_payment {
Some(true) => Ok(StripeBillingAddress {
name: Some(
billing_name.ok_or(errors::ConnectorError::MissingRequiredField {
field_name: "billing_name",
})?,
),

email: Some(
billing_email.ok_or(errors::ConnectorError::MissingRequiredField {
field_name: "billing_email",
})?,
),
..StripeBillingAddress::default()
}),
Some(false) | None => Ok(StripeBillingAddress {
name: billing_name,
email: billing_email,
..StripeBillingAddress::default()
}),
}
}

impl TryFrom<&types::SubmitEvidenceRouterData> for Evidence {
type Error = error_stack::Report<errors::ConnectorError>;
fn try_from(item: &types::SubmitEvidenceRouterData) -> Result<Self, Self::Error> {
Expand Down
3 changes: 2 additions & 1 deletion loadtest/config/development.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ card.debit = {connector_list = "stripe,adyen,authorizedotnet,cybersource,globalp
bank_debit.ach = { connector_list = "gocardless"}
bank_debit.becs = { connector_list = "gocardless"}
bank_debit.sepa = { connector_list = "gocardless"}
bank_redirect.ideal = {connector_list = "stripe,adyen"}
bank_redirect.ideal = {connector_list = "stripe,adyen,globalpay"}
bank_redirect.sofort = {connector_list = "stripe,adyen,globalpay"}

[analytics]
source = "sqlx"
Expand Down
14 changes: 9 additions & 5 deletions openapi/openapi_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3749,21 +3749,25 @@
"sofort": {
"type": "object",
"required": [
"billing_details",
"country",
"preferred_language"
"country"
],
"properties": {
"billing_details": {
"$ref": "#/components/schemas/BankRedirectBilling"
"allOf": [
{
"$ref": "#/components/schemas/BankRedirectBilling"
}
],
"nullable": true
},
"country": {
"$ref": "#/components/schemas/CountryAlpha2"
},
"preferred_language": {
"type": "string",
"description": "The preferred language",
"example": "en"
"example": "en",
"nullable": true
}
}
}
Expand Down
Loading