rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-11-02 12:06:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

build(deps): bump error-stack from version 0.3.1 to 0.4.1 (#4188)

Browse Source
This commit is contained in:
Sanchith Hegde
2024-04-01 12:31:17 +05:30
committed by GitHub
parent cb2000b088
commit ea730d4ffc
286 changed files with 1361 additions and 2397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/router/src/core/admin.rs
View File

@ -11,7 +11,7 @@ use common_utils::{
pii,
};
use diesel_models::configs;
use error_stack::{report, FutureExt, IntoReport, ResultExt};
use error_stack::{report, FutureExt, ResultExt};
use futures::future::try_join_all;
use masking::{PeekInterface, Secret};
use pm_auth::connector::plaid::transformers::PlaidAuthType;
@ -175,7 +175,7 @@ pub async fn create_merchant_account(
};
let mut merchant_account = async {
Ok(domain::MerchantAccount {
Ok::<_, error_stack::Report<common_utils::errors::CryptoError>>(domain::MerchantAccount {
merchant_id: req.merchant_id,
merchant_name: req
.merchant_name
@ -279,8 +279,7 @@ pub async fn create_merchant_account(
.ok();
Ok(service_api::ApplicationResponse::Json(
merchant_account
.try_into()
api::MerchantAccountResponse::try_from(merchant_account)
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed while generating response")?,
))
@ -300,11 +299,11 @@ pub async fn list_merchant_account(
let merchant_accounts = merchant_accounts
.into_iter()
.map(|merchant_account| {
merchant_account
.try_into()
.change_context(errors::ApiErrorResponse::InvalidDataValue {
api::MerchantAccountResponse::try_from(merchant_account).change_context(
errors::ApiErrorResponse::InvalidDataValue {
field_name: "merchant_account",
})
},
)
})
.collect::<Result<Vec<_>, _>>()?;
@ -330,8 +329,7 @@ pub async fn get_merchant_account(
.to_not_found_response(errors::ApiErrorResponse::MerchantAccountNotFound)?;
Ok(service_api::ApplicationResponse::Json(
merchant_account
.try_into()
api::MerchantAccountResponse::try_from(merchant_account)
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to construct response")?,
))
@ -609,8 +607,7 @@ pub async fn merchant_account_update(
// If there are any new business labels generated, create business profile
Ok(service_api::ApplicationResponse::Json(
response
.try_into()
api::MerchantAccountResponse::try_from(response)
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed while generating response")?,
))
@ -796,22 +793,21 @@ pub async fn create_payment_connector(
if req.connector_type != api_enums::ConnectorType::PaymentMethodAuth {
return Err(errors::ApiErrorResponse::InvalidRequestData {
message: "Invalid connector type given".to_string(),
})
.into_report();
}
.into());
}
} else if authentication_connector.is_some() {
if req.connector_type != api_enums::ConnectorType::AuthenticationProcessor {
return Err(errors::ApiErrorResponse::InvalidRequestData {
message: "Invalid connector type given".to_string(),
})
.into_report();
}
.into());
}
} else {
let routable_connector_option = req
.connector_name
.to_string()
.parse()
.into_report()
.parse::<api_enums::RoutableConnectors>()
.change_context(errors::ApiErrorResponse::InvalidRequestData {
message: "Invalid connector name given".to_string(),
})?;
@ -1047,7 +1043,6 @@ async fn validate_pm_auth(
profile_id: &Option<String>,
) -> RouterResponse<()> {
let config = serde_json::from_value::<api_models::pm_auth::PaymentMethodAuthConfig>(val)
.into_report()
.change_context(errors::ApiErrorResponse::InvalidRequestData {
message: "invalid data received for payment method auth config".to_string(),
})
@ -1071,15 +1066,14 @@ async fn validate_pm_auth(
.find(|mca| mca.merchant_connector_id == conn_choice.mca_id)
.ok_or(errors::ApiErrorResponse::GenericNotFoundError {
message: "payment method auth connector account not found".to_string(),
})
.into_report()?;
})?;
if &pm_auth_mca.profile_id != profile_id {
return Err(errors::ApiErrorResponse::GenericNotFoundError {
message: "payment method auth profile_id differs from connector profile_id"
.to_string(),
})
.into_report();
}
.into());
}
}
@ -1205,7 +1199,6 @@ pub async fn update_payment_connector(
let metadata = req.metadata.clone().or(mca.metadata.clone());
let connector_name = mca.connector_name.as_ref();
let connector_enum = api_models::enums::Connector::from_str(connector_name)
.into_report()
.change_context(errors::ApiErrorResponse::InvalidDataValue {
field_name: "connector",
})
@ -1297,7 +1290,6 @@ pub async fn update_payment_connector(
.profile_id
.clone()
.ok_or(errors::ApiErrorResponse::InternalServerError)
.into_report()
.attach_printable("Missing `profile_id` in merchant connector account")?;
let request_connector_label = req.connector_label;