diff --git a/crates/common_utils/src/errors.rs b/crates/common_utils/src/errors.rs index 1f35907d9e..66ae55391d 100644 --- a/crates/common_utils/src/errors.rs +++ b/crates/common_utils/src/errors.rs @@ -1,8 +1,9 @@ //! Errors and error specific types for universal use -use crate::types::MinorUnit; use serde::Serialize; +use crate::types::MinorUnit; + /// Custom Result /// A custom datatype that wraps the error variant into a report, allowing /// error_stack::Report specific extendability diff --git a/crates/hyperswitch_domain_models/src/router_response_types.rs b/crates/hyperswitch_domain_models/src/router_response_types.rs index c5a240cc3f..5b50037b61 100644 --- a/crates/hyperswitch_domain_models/src/router_response_types.rs +++ b/crates/hyperswitch_domain_models/src/router_response_types.rs @@ -4,11 +4,6 @@ pub mod revenue_recovery; pub mod subscriptions; use std::collections::HashMap; -use crate::{ - errors::api_error_response::ApiErrorResponse, - router_request_types::{authentication::AuthNFlowType, ResponseId}, - vault::PaymentMethodVaultingData, -}; use api_models::payments::AddressDetails; use common_utils::{pii, request::Method, types::MinorUnit}; pub use disputes::{ @@ -17,6 +12,12 @@ pub use disputes::{ }; use serde::Serialize; +use crate::{ + errors::api_error_response::ApiErrorResponse, + router_request_types::{authentication::AuthNFlowType, ResponseId}, + vault::PaymentMethodVaultingData, +}; + #[derive(Debug, Clone)] pub struct RefundsResponseData { pub connector_refund_id: String, diff --git a/crates/router/src/core/unified_connector_service.rs b/crates/router/src/core/unified_connector_service.rs index 69c29ed9ff..77d7ac8eec 100644 --- a/crates/router/src/core/unified_connector_service.rs +++ b/crates/router/src/core/unified_connector_service.rs @@ -5,11 +5,9 @@ use api_models::admin; use base64::Engine; use common_enums::{connector_enums::Connector, AttemptStatus, GatewaySystem, PaymentMethodType}; use common_utils::{ - request::{Method, Request, RequestContent}, -}; -use common_utils::{ - errors::CustomResult, + errors::CustomResult, ext_traits::ValueExt, + request::{Method, Request, RequestContent}, }; use diesel_models::types::FeatureMetadata; use error_stack::ResultExt; @@ -952,11 +950,15 @@ pub async fn send_comparison_data( comparison_data: ComparisonData, ) -> RouterResult<()> { // Check if comparison service is enabled - let enabled = state.conf.comparison_service + let enabled = state + .conf + .comparison_service .as_ref() .map(|config| config.enabled) .unwrap_or_else(|| { - tracing::warn!("Comparison service configuration missing, skipping comparison data send"); + tracing::warn!( + "Comparison service configuration missing, skipping comparison data send" + ); false }); @@ -965,7 +967,12 @@ pub async fn send_comparison_data( } // Construct request - let url = match state.conf.comparison_service.as_ref().map(|config| &config.url) { + let url = match state + .conf + .comparison_service + .as_ref() + .map(|config| &config.url) + { Some(url) => url, None => { tracing::warn!("Comparison service URL missing, skipping comparison data send"); @@ -984,7 +991,9 @@ pub async fn send_comparison_data( request.set_body(RequestContent::Json(Box::new(comparison_data))); // Send with configurable timeout - don't block payment flow - let timeout = state.conf.comparison_service + let timeout = state + .conf + .comparison_service .as_ref() .and_then(|config| config.timeout_secs) .unwrap_or(2); diff --git a/crates/router/src/services/api.rs b/crates/router/src/services/api.rs index 26ec47758d..cf2574becd 100644 --- a/crates/router/src/services/api.rs +++ b/crates/router/src/services/api.rs @@ -63,8 +63,7 @@ use crate::{ core::{ api_locking, errors::{self, CustomResult}, - payments, unified_connector_service, - utils as core_utils, + payments, unified_connector_service, utils as core_utils, }, events::{ api_logs::{ApiEvent, ApiEventMetric, ApiEventsType},