Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
12 changes: 9 additions & 3 deletions crates/api_models/src/events/routing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ use crate::routing::{
LinkedRoutingConfigRetrieveResponse, MerchantRoutingAlgorithm, ProfileDefaultRoutingConfig,
RoutingAlgorithmId, RoutingConfigRequest, RoutingDictionaryRecord, RoutingKind,
RoutingLinkWrapper, RoutingPayloadWrapper, RoutingRetrieveLinkQuery,
RoutingRetrieveLinkQueryWrapper, RoutingRetrieveQuery, RoutingVolumeSplitWrapper,
SuccessBasedRoutingConfig, SuccessBasedRoutingPayloadWrapper, ToggleDynamicRoutingQuery,
ToggleDynamicRoutingWrapper,
RoutingRetrieveLinkQueryWrapper, RoutingRetrieveQuery, RoutingVolumeSplit,
RoutingVolumeSplitWrapper, SuccessBasedRoutingConfig, SuccessBasedRoutingPayloadWrapper,
ToggleDynamicRoutingQuery, ToggleDynamicRoutingWrapper,
};

impl ApiEventMetric for RoutingKind {
Expand Down Expand Up @@ -134,3 +134,9 @@ impl ApiEventMetric for RoutingVolumeSplitWrapper {
Some(ApiEventsType::Routing)
}
}

impl ApiEventMetric for RoutingVolumeSplit {
fn get_api_event_type(&self) -> Option<ApiEventsType> {
Some(ApiEventsType::Routing)
}
}
36 changes: 34 additions & 2 deletions crates/api_models/src/routing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub struct MerchantRoutingAlgorithm {
pub profile_id: common_utils::id_type::ProfileId,
pub name: String,
pub description: String,
pub algorithm: RoutingAlgorithm,
pub algorithm: RoutingAlgorithmWrapper,
pub created_at: i64,
pub modified_at: i64,
pub algorithm_for: TransactionType,
Expand Down Expand Up @@ -287,6 +287,19 @@ pub struct RoutingPayloadWrapper {
pub updated_config: Vec<RoutableConnectorChoice>,
pub profile_id: common_utils::id_type::ProfileId,
}
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(untagged)]
pub enum RoutingAlgorithmWrapper {
Static(RoutingAlgorithm),
Dynamic(RoutingAlgorithmDynamic),
}

#[derive(Debug, Clone, serde::Serialize)]
pub enum RoutingAlgorithmDynamic {
SuccessBasedAlgorithm(SuccessBasedRoutingConfig),
EliminationBasedAlgorithm(EliminationRoutingConfig),
ContractBasedAlgorithm(ContractBasedRoutingConfig),
}

#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, ToSchema)]
#[serde(
Expand All @@ -295,14 +308,33 @@ pub struct RoutingPayloadWrapper {
rename_all = "snake_case",
try_from = "RoutingAlgorithmSerde"
)]
/// Routing Algorithm kind
pub enum RoutingAlgorithm {
Single(Box<RoutableConnectorChoice>),
Priority(Vec<RoutableConnectorChoice>),
VolumeSplit(Vec<ConnectorVolumeSplit>),
#[schema(value_type=ProgramConnectorSelection)]
Advanced(ast::Program<ConnectorSelection>),
}
impl<'de> Deserialize<'de> for RoutingAlgorithmDynamic {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: serde::Deserializer<'de>,
{
let val: serde_json::Value = serde_json::Value::deserialize(deserializer)?;

if let Ok(v) = serde_json::from_value::<SuccessBasedRoutingConfig>(val.clone()) {
Ok(Self::SuccessBasedAlgorithm(v))
} else if let Ok(v) = serde_json::from_value::<EliminationRoutingConfig>(val.clone()) {
Ok(Self::EliminationBasedAlgorithm(v))
} else if let Ok(v) = serde_json::from_value::<ContractBasedRoutingConfig>(val.clone()) {
Ok(Self::ContractBasedAlgorithm(v))
} else {
Err(serde::de::Error::custom(
"Unrecognized dynamic routing algorithm",
))
}
}
}

#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[serde(tag = "type", content = "data", rename_all = "snake_case")]
Expand Down
2 changes: 1 addition & 1 deletion crates/router/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license.workspace = true

[features]
default = ["common_default", "v1"]
common_default = ["kv_store", "stripe", "oltp", "olap", "accounts_cache", "dummy_connector", "payouts", "payout_retry", "retry", "frm", "tls", "partial-auth", "km_forward_x_request_id"]
common_default = ["dynamic_routing", "kv_store", "stripe", "oltp", "olap", "accounts_cache", "dummy_connector", "payouts", "payout_retry", "retry", "frm", "tls", "partial-auth", "km_forward_x_request_id"]
olap = ["hyperswitch_domain_models/olap", "storage_impl/olap", "scheduler/olap", "api_models/olap", "dep:analytics"]
tls = ["actix-web/rustls-0_22"]
email = ["external_services/email", "scheduler/email", "olap"]
Expand Down
4 changes: 2 additions & 2 deletions crates/router/src/core/routing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@ pub async fn configure_dynamic_routing_volume_split(
merchant_context: domain::MerchantContext,
profile_id: common_utils::id_type::ProfileId,
routing_info: routing::RoutingVolumeSplit,
) -> RouterResponse<()> {
) -> RouterResponse<routing::RoutingVolumeSplit> {
metrics::ROUTING_CREATE_REQUEST_RECEIVED.add(
1,
router_env::metric_attributes!(("profile_id", profile_id.clone())),
Expand Down Expand Up @@ -1472,7 +1472,7 @@ pub async fn configure_dynamic_routing_volume_split(
)
.await?;

Ok(service_api::ApplicationResponse::StatusOk)
Ok(service_api::ApplicationResponse::Json(routing_info))
}

#[cfg(all(feature = "v1", feature = "dynamic_routing"))]
Expand Down
26 changes: 20 additions & 6 deletions crates/router/src/core/routing/transformers.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use api_models::routing::{
MerchantRoutingAlgorithm, RoutingAlgorithm as Algorithm, RoutingAlgorithmKind,
RoutingDictionaryRecord,
MerchantRoutingAlgorithm, RoutingAlgorithmDynamic, RoutingAlgorithmKind,
RoutingAlgorithmWrapper, RoutingDictionaryRecord,
};
#[cfg(feature = "v1")]
use api_models::{
Expand Down Expand Up @@ -59,15 +59,29 @@ impl ForeignTryFrom<RoutingAlgorithm> for MerchantRoutingAlgorithm {
type Error = error_stack::Report<errors::ParsingError>;

fn foreign_try_from(value: RoutingAlgorithm) -> Result<Self, Self::Error> {
let algorithm: RoutingAlgorithmWrapper = match value.kind {
diesel_models::enums::RoutingAlgorithmKind::Dynamic => {
// Use custom deserializer for dynamic variants
value
.algorithm_data
.parse_value::<RoutingAlgorithmDynamic>("RoutingAlgorithmDynamic")
.map(RoutingAlgorithmWrapper::Dynamic)?
}
_ => {
// Use standard tagged deserializer
let parsed = value
.algorithm_data
.parse_value::<api_models::routing::RoutingAlgorithm>("RoutingAlgorithm")?;
RoutingAlgorithmWrapper::Static(parsed)
}
};

Ok(Self {
id: value.algorithm_id,
name: value.name,

profile_id: value.profile_id,
description: value.description.unwrap_or_default(),
algorithm: value
.algorithm_data
.parse_value::<Algorithm>("RoutingAlgorithm")?,
algorithm,
created_at: value.created_at.assume_utc().unix_timestamp(),
modified_at: value.modified_at.assume_utc().unix_timestamp(),
algorithm_for: value.algorithm_for,
Expand Down
Loading