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

fix(connector): implement ConnectorErrorExt for error_stack::Result<T, ConnectorError> (#1382)

Browse Source 
Co-authored-by: Narayan Bhat <48803246+Narayanbhat166@users.noreply.github.com>
This commit is contained in:
Abhishek Marrivagu
2023-06-16 18:51:29 +05:30
committed by GitHub
parent a7ac4af5d9
commit 3ef1d2935e
12 changed files with 143 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/router/src/core/disputes.rs
View File

@ -129,7 +129,7 @@ pub async fn accept_dispute(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_dispute_failed_response()) .to_dispute_failed_response()
.attach_printable("Failed while calling accept dispute connector api")?; .attach_printable("Failed while calling accept dispute connector api")?;
let accept_dispute_response = let accept_dispute_response =
response response
@ -236,7 +236,7 @@ pub async fn submit_evidence(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_payment_failed_response()) .to_dispute_failed_response()
.attach_printable("Failed while calling submit evidence connector api")?; .attach_printable("Failed while calling submit evidence connector api")?;
let submit_evidence_response = let submit_evidence_response =
response response
@ -272,7 +272,7 @@ pub async fn submit_evidence(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_payment_failed_response()) .to_dispute_failed_response()
.attach_printable("Failed while calling defend dispute connector api")?; .attach_printable("Failed while calling defend dispute connector api")?;
let defend_dispute_response = defend_response.response.map_err(|err| { let defend_dispute_response = defend_response.response.map_err(|err| {
errors::ApiErrorResponse::ExternalConnectorError { errors::ApiErrorResponse::ExternalConnectorError {

48
crates/router/src/core/errors/utils.rs
View File

@ -43,20 +43,21 @@ impl<T> StorageErrorExt<T, errors::ApiErrorResponse>
} }
} }
pub trait ConnectorErrorExt { pub trait ConnectorErrorExt<T> {
#[track_caller] #[track_caller]
fn to_refund_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse>; fn to_refund_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse>;
#[track_caller] #[track_caller]
fn to_payment_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse>; fn to_payment_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse>;
#[track_caller] #[track_caller]
fn to_verify_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse>; fn to_verify_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse>;
#[track_caller] #[track_caller]
fn to_dispute_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse>; fn to_dispute_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse>;
} }
impl ConnectorErrorExt for error_stack::Report<errors::ConnectorError> { impl<T> ConnectorErrorExt<T> for error_stack::Result<T, errors::ConnectorError> {
fn to_refund_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse> { fn to_refund_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse> {
let data = match self.current_context() { self.map_err(|err| {
let data = match err.current_context() {
errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => { errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => {
let response_str = std::str::from_utf8(bytes); let response_str = std::str::from_utf8(bytes);
match response_str { match response_str {
@ -73,11 +74,13 @@ impl ConnectorErrorExt for error_stack::Report<errors::ConnectorError> {
} }
_ => None, _ => None,
}; };
self.change_context(errors::ApiErrorResponse::RefundFailed { data }) err.change_context(errors::ApiErrorResponse::RefundFailed { data })
})
} }
fn to_payment_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse> { fn to_payment_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse> {
let error = match self.current_context() { self.map_err(|err| {
let error = match err.current_context() {
errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => { errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => {
let response_str = std::str::from_utf8(bytes); let response_str = std::str::from_utf8(bytes);
let data = match response_str { let data = match response_str {
@ -120,17 +123,21 @@ impl ConnectorErrorExt for error_stack::Report<errors::ConnectorError> {
} }
_ => errors::ApiErrorResponse::InternalServerError, _ => errors::ApiErrorResponse::InternalServerError,
}; };
self.change_context(error) err.change_context(error)
})
} }
fn to_verify_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse> { fn to_verify_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse> {
let error = self.current_context(); self.map_err(|err| {
let error = err.current_context();
let data = match error { let data = match error {
errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => { errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => {
let response_str = std::str::from_utf8(bytes); let response_str = std::str::from_utf8(bytes);
let error_response = match response_str { let error_response = match response_str {
Ok(s) => serde_json::from_str(s) Ok(s) => serde_json::from_str(s)
.map_err(|err| logger::error!(%err, "Failed to convert response to JSON")) .map_err(
|err| logger::error!(%err, "Failed to convert response to JSON"),
)
.ok(), .ok(),
Err(err) => { Err(err) => {
logger::error!(%err, "Failed to convert response to UTF8 string"); logger::error!(%err, "Failed to convert response to UTF8 string");
@ -149,11 +156,13 @@ impl ConnectorErrorExt for error_stack::Report<errors::ConnectorError> {
errors::ApiErrorResponse::PaymentAuthorizationFailed { data: None } errors::ApiErrorResponse::PaymentAuthorizationFailed { data: None }
} }
}; };
self.change_context(data) err.change_context(data)
})
} }
fn to_dispute_failed_response(self) -> error_stack::Report<errors::ApiErrorResponse> { fn to_dispute_failed_response(self) -> error_stack::Result<T, errors::ApiErrorResponse> {
let error = match self.current_context() { self.map_err(|err| {
let error = match err.current_context() {
errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => { errors::ConnectorError::ProcessingStepFailed(Some(bytes)) => {
let response_str = std::str::from_utf8(bytes); let response_str = std::str::from_utf8(bytes);
let data = match response_str { let data = match response_str {
@ -179,7 +188,8 @@ impl ConnectorErrorExt for error_stack::Report<errors::ConnectorError> {
} }
_ => errors::ApiErrorResponse::InternalServerError, _ => errors::ApiErrorResponse::InternalServerError,
}; };
self.change_context(error) err.change_context(error)
})
} }
} }

2
crates/router/src/core/payments/customers.rs
View File

@ -48,7 +48,7 @@ pub async fn create_connector_customer<F: Clone, T: Clone>(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
metrics::CONNECTOR_CUSTOMER_CREATE.add( metrics::CONNECTOR_CUSTOMER_CREATE.add(
&metrics::CONTEXT, &metrics::CONTEXT,

6
crates/router/src/core/payments/flows/authorize_flow.rs
View File

@ -140,7 +140,7 @@ impl types::PaymentsAuthorizeRouterData {
connector_integration connector_integration
.execute_pretasks(self, state) .execute_pretasks(self, state)
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
metrics::EXECUTE_PRETASK_COUNT.add( metrics::EXECUTE_PRETASK_COUNT.add(
&metrics::CONTEXT, &metrics::CONTEXT,
@ -165,7 +165,7 @@ impl types::PaymentsAuthorizeRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
let pm_id = tokenization::save_payment_method( let pm_id = tokenization::save_payment_method(
state, state,
@ -266,7 +266,7 @@ pub async fn authorize_preprocessing_steps<F: Clone>(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
metrics::PREPROCESSING_STEPS_COUNT.add( metrics::PREPROCESSING_STEPS_COUNT.add(
&metrics::CONTEXT, &metrics::CONTEXT,

2
crates/router/src/core/payments/flows/cancel_flow.rs
View File

@ -96,7 +96,7 @@ impl types::PaymentsCancelRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
Ok(resp) Ok(resp)
} }

2
crates/router/src/core/payments/flows/capture_flow.rs
View File

@ -89,7 +89,7 @@ impl types::PaymentsCaptureRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
Ok(resp) Ok(resp)
} }

2
crates/router/src/core/payments/flows/complete_authorize_flow.rs
View File

@ -104,7 +104,7 @@ impl types::PaymentsCompleteAuthorizeRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
Ok(resp) Ok(resp)
} }

2
crates/router/src/core/payments/flows/psync_flow.rs
View File

@ -89,7 +89,7 @@ impl types::PaymentsSyncRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
Ok(resp) Ok(resp)
} }

2
crates/router/src/core/payments/flows/session_flow.rs
View File

@ -306,7 +306,7 @@ impl types::PaymentsSessionRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
Ok(resp) Ok(resp)
} }

2
crates/router/src/core/payments/flows/verify_flow.rs
View File

@ -133,7 +133,7 @@ impl types::VerifyRouterData {
call_connector_action, call_connector_action,
) )
.await .await
.map_err(|err| err.to_verify_failed_response())?; .to_verify_failed_response()?;
let pm_id = tokenization::save_payment_method( let pm_id = tokenization::save_payment_method(
state, state,

2
crates/router/src/core/payments/tokenization.rs
View File

@ -229,7 +229,7 @@ pub async fn add_payment_method_token<F: Clone, T: Clone>(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_payment_failed_response())?; .to_payment_failed_response()?;
metrics::CONNECTOR_PAYMENT_METHOD_TOKENIZATION.add( metrics::CONNECTOR_PAYMENT_METHOD_TOKENIZATION.add(
&metrics::CONTEXT, &metrics::CONTEXT,

4
crates/router/src/core/refunds.rs
View File

@ -191,7 +191,7 @@ pub async fn trigger_refund_to_gateway(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_refund_failed_response())? .to_refund_failed_response()?
} else { } else {
router_data router_data
}; };
@ -410,7 +410,7 @@ pub async fn sync_refund_with_gateway(
payments::CallConnectorAction::Trigger, payments::CallConnectorAction::Trigger,
) )
.await .await
.map_err(|error| error.to_refund_failed_response())? .to_refund_failed_response()?
} else { } else {
router_data router_data
}; };