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

fix(router): better positioning for mandatory customer id conditions (#364)

Browse Source
This commit is contained in:
ItsMeShashank
2023-01-13 01:20:19 +05:30
committed by GitHub
parent 5bb9e745d8
commit ba5c3efc86
4 changed files with 40 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/router/src/core/payments/helpers.rs
View File

@ -306,33 +306,19 @@ fn validate_new_mandate_request(req: api::MandateValidationFields) -> RouterResu
Ok(())
}
pub fn validate_customer_id_mandatory_cases_api(
shipping: &Option<api::Address>,
billing: &Option<api::Address>,
setup_future_usage: &Option<api_enums::FutureUsage>,
pub fn validate_customer_id_mandatory_cases(
has_shipping: bool,
has_billing: bool,
has_setup_future_usage: bool,
customer_id: &Option<String>,
) -> RouterResult<()> {
match (shipping, billing, setup_future_usage, customer_id) {
(Some(_), _, _, None) | (_, Some(_), _, None) | (_, _, Some(_), None) => {
Err(errors::ApiErrorResponse::PreconditionFailed {
message: "customer_id is mandatory when shipping or billing \
address is given or when setup_future_usage is given"
.to_string(),
})
.into_report()
}
_ => Ok(()),
}
}
pub fn validate_customer_id_mandatory_cases_storage(
shipping: &Option<storage::Address>,
billing: &Option<storage::Address>,
setup_future_usage: &Option<storage_enums::FutureUsage>,
customer_id: &Option<String>,
) -> RouterResult<()> {
match (shipping, billing, setup_future_usage, customer_id) {
(Some(_), _, _, None) | (_, Some(_), _, None) | (_, _, Some(_), None) => {
match (
has_shipping,
has_billing,
has_setup_future_usage,
customer_id,
) {
(true, _, _, None) | (_, true, _, None) | (_, _, true, None) => {
Err(errors::ApiErrorResponse::PreconditionFailed {
message: "customer_id is mandatory when shipping or billing \
address is given or when setup_future_usage is given"

22
crates/router/src/core/payments/operations/payment_confirm.rs
View File

@ -106,6 +106,16 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
currency = payment_attempt.currency.get_required_value("currency")?;
amount = payment_attempt.amount.into();
helpers::validate_customer_id_mandatory_cases(
request.shipping.is_some(),
request.billing.is_some(),
request.setup_future_usage.is_some(),
&payment_intent
.customer_id
.clone()
.or_else(|| request.customer_id.clone()),
)?;
let shipping_address = helpers::get_address_for_payment_request(
db,
request.shipping.as_ref(),
@ -123,18 +133,6 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
)
.await?;
helpers::validate_customer_id_mandatory_cases_storage(
&shipping_address,
&billing_address,
&payment_intent
.setup_future_usage
.or_else(|| request.setup_future_usage.map(ForeignInto::foreign_into)),
&payment_intent
.customer_id
.clone()
.or_else(|| request.customer_id.clone()),
)?;
connector_response = db
.find_connector_response_by_payment_id_merchant_id_attempt_id(
&payment_attempt.payment_id,

7
crates/router/src/core/payments/operations/payment_create.rs
View File

@ -378,6 +378,13 @@ impl<F: Send + Clone> ValidateRequest<F, api::PaymentsRequest> for PaymentCreate
&mandate_type,
&request.payment_token,
)?;
helpers::validate_customer_id_mandatory_cases(
request.shipping.is_some(),
request.billing.is_some(),
request.setup_future_usage.is_some(),
&request.customer_id,
)?;
}
Ok((

26
crates/router/src/core/payments/operations/payment_update.rs
View File

@ -93,6 +93,18 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
payment_intent.client_secret.as_ref(),
)?;
if request.confirm.unwrap_or(false) {
helpers::validate_customer_id_mandatory_cases(
request.shipping.is_some(),
request.billing.is_some(),
request.setup_future_usage.is_some(),
&payment_intent
.customer_id
.clone()
.or_else(|| request.customer_id.clone()),
)?;
}
let shipping_address = helpers::get_address_for_payment_request(
db,
request.shipping.as_ref(),
@ -114,20 +126,6 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
payment_intent.billing_address_id = billing_address.clone().map(|x| x.address_id);
payment_intent.return_url = request.return_url.clone();
if request.confirm.unwrap_or(false) {
helpers::validate_customer_id_mandatory_cases_storage(
&shipping_address,
&billing_address,
&payment_intent
.setup_future_usage
.or_else(|| request.setup_future_usage.map(ForeignInto::foreign_into)),
&payment_intent
.customer_id
.clone()
.or_else(|| request.customer_id.clone()),
)?;
}
let token = token.or_else(|| payment_attempt.payment_token.clone());
if request.confirm.unwrap_or(false) {