Add files using upload-large-folder tool
Browse filesThis view is limited to 50 files because it contains too many changes. See raw diff
- diffs/pr_10015/4fd2c01/diff.json +8 -0
- diffs/pr_10015/941dd24/diff.json +24 -0
- diffs/pr_10015/d9fc61f/diff.json +0 -0
- diffs/pr_10018/18fee86/diff.json +6 -0
- diffs/pr_10019/044a3b7/diff.json +0 -0
- diffs/pr_10019/22d6d9b/diff.json +24 -0
- diffs/pr_10019/43c619e/diff.json +0 -0
- diffs/pr_10019/5391004/diff.json +0 -0
- diffs/pr_10019/64dbbab/diff.json +85 -0
- diffs/pr_10019/79215df/diff.json +39 -0
- diffs/pr_10019/d1f4a64/diff.json +24 -0
- diffs/pr_10041/eec1a55/diff.json +39 -0
- diffs/pr_10070/13de2ae/diff.json +19 -0
- diffs/pr_10070/1be98ac/diff.json +24 -0
- diffs/pr_10070/273f614/diff.json +24 -0
- diffs/pr_10070/4503eb3/diff.json +39 -0
- diffs/pr_10070/4b7760a/diff.json +8 -0
- diffs/pr_10070/562849e/diff.json +6 -0
- diffs/pr_10070/664ca38/diff.json +6 -0
- diffs/pr_10070/7a0acd4/diff.json +19 -0
- diffs/pr_10070/7e39881/diff.json +24 -0
- diffs/pr_10070/9236686/diff.json +24 -0
- diffs/pr_10070/9ca7294/diff.json +34 -0
- diffs/pr_10070/b01da97/diff.json +19 -0
- diffs/pr_10070/b616b3c/diff.json +8 -0
- diffs/pr_10070/bbc4d49/diff.json +24 -0
- diffs/pr_10070/c2b7da1/diff.json +8 -0
- diffs/pr_10070/c4646a3/diff.json +39 -0
- diffs/pr_10070/e91546c/diff.json +0 -0
- diffs/pr_10070/fd3ef8b/diff.json +19 -0
- diffs/pr_10070/fdff489/diff.json +19 -0
- diffs/pr_10125/734f4de/diff.json +24 -0
- diffs/pr_10125/80d1695/diff.json +0 -0
- diffs/pr_10125/8c33c96/diff.json +148 -0
- diffs/pr_10125/9e12d42/diff.json +24 -0
- diffs/pr_10133/07bb55b/diff.json +39 -0
- diffs/pr_10133/291e6d9/diff.json +40 -0
- diffs/pr_10133/2e6d515/diff.json +24 -0
- diffs/pr_10133/3f33c88/diff.json +75 -0
- diffs/pr_10133/56af8c9/diff.json +24 -0
- diffs/pr_10133/66cfd7d/diff.json +95 -0
- diffs/pr_10133/7bec6af/diff.json +55 -0
- diffs/pr_10236/2eac084/diff.json +69 -0
- diffs/pr_10643/ecf5c83/diff.json +142 -0
- diffs/pr_6759/f47b37f/diff.json +197 -0
- diffs/pr_6776/bc7ac66/diff.json +33 -0
- diffs/pr_6820/169f1a6/diff.json +6 -0
- diffs/pr_6826/e3a8a15/diff.json +0 -0
- diffs/pr_8014/14c3c54/diff.json +0 -0
- diffs/pr_8056/5916603/diff.json +0 -0
diffs/pr_10015/4fd2c01/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4fd2c0124a4f1322155eedd14cdff6944cf27bcd",
|
| 3 |
+
"pr_number": 10015,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/subscriptions/src/core.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10015/941dd24/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "941dd24187ef3be4dc38873c00cb169bd50f6d22",
|
| 3 |
+
"pr_number": 10015,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/subscription.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/subscription.rs::enum::ResumeOption",
|
| 10 |
+
"file": "crates/api_models/src/subscription.rs",
|
| 11 |
+
"kind": "enum_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub enum ResumeOption {\n /// Pause immediately\n Immediately,\n /// Pause on a specific date,\n SpecificDate,\n}",
|
| 16 |
+
"after_code": "pub enum ResumeOption {\n /// Resume immediately\n Immediately,\n /// Resume on a specific date,\n SpecificDate,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "pub enum ResumeOption {\n /// Pause immediately\n Immediately,\n /// Pause on a specific date,\n SpecificDate,\n}",
|
| 19 |
+
"after": "pub enum ResumeOption {\n /// Resume immediately\n Immediately,\n /// Resume on a specific date,\n SpecificDate,\n}"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "941dd24187ef3be4dc38873c00cb169bd50f6d22"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10015/d9fc61f/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10018/18fee86/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "18fee8652cbe5aee9fcf7f2c8a02fd4a800bfe0b",
|
| 3 |
+
"pr_number": 10018,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10019/044a3b7/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10019/22d6d9b/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "22d6d9bfc2fd02f94b4bae63bb6a7f856356ec6a",
|
| 3 |
+
"pr_number": 10019,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::process_webhook_business_logic",
|
| 10 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to serialize shadow webhook payload to bytes\"\n );\n None\n }\n }\n });\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
|
| 16 |
+
"after_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> =\n shadow_ucs_data.as_ref().and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> =\n shadow_event_object.as_ref().and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to serialize shadow webhook payload to bytes\"\n );\n None\n }\n }\n });\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))",
|
| 19 |
+
"after": "\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> =\n shadow_ucs_data.as_ref().and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> =\n shadow_event_object.as_ref().and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "22d6d9bfc2fd02f94b4bae63bb6a7f856356ec6a"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10019/43c619e/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10019/5391004/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10019/64dbbab/diff.json
ADDED
|
@@ -0,0 +1,85 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "64dbbabbb23ee85a3eb07505b99756612f4779b4",
|
| 3 |
+
"pr_number": 10019,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs",
|
| 6 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::process_shadow_ucs_webhook_transform",
|
| 11 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "async fn process_shadow_ucs_webhook_transform<'a>(\n state: &'a SessionState,\n merchant_context: &'a domain::MerchantContext,\n connector: &'a ConnectorEnum,\n connector_name: &'a str,\n body: &'a actix_web::web::Bytes,\n request_details: &'a IncomingWebhookRequestDetails<'a>,\n merchant_connector_account: Option<&'a domain::MerchantConnectorAccount>,\n) -> errors::RouterResult<WebhookProcessingResult<'a>> {\n // Execute UCS path\n let ucs_result = unified_connector_service::call_unified_connector_service_for_webhook(\n state,\n merchant_context,\n connector_name,\n body,\n request_details,\n merchant_connector_account,\n )\n .await;\n\n // Execute Direct path for comparison\n let direct_result = async {\n // Decode body for direct processing\n let decoded_body = connector\n .decode_webhook_body(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.and_then(|mca| mca.connector_webhook_details.clone()),\n connector_name,\n )\n .await\n .switch()\n .attach_printable(\n \"There was an error in incoming webhook body decoding for shadow processing\",\n )?;\n\n // Reuse existing process_non_ucs_webhook function\n process_non_ucs_webhook(\n state,\n merchant_context,\n connector,\n connector_name,\n decoded_body.into(),\n request_details,\n )\n .await\n }\n .await;\n\n // Handle results and comparison\n match (ucs_result, direct_result) {\n (\n Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)),\n Ok(mut direct_processing_result),\n ) => {\n // Create ShadowUcsData with UCS results \n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,\n ucs_event_type,\n ucs_transform_data: Box::new(ucs_transform_data),\n request_details,\n webhook_details: None,\n };\n\n // Return Direct result as primary with UCS data in shadow_ucs_data\n direct_processing_result.shadow_ucs_data = Some(shadow_ucs_data);\n Ok(direct_processing_result)\n }\n (Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)\n }\n (Err(ucs_error), Ok(direct_processing_result)) => {\n // In shadow mode, if UCS fails, fall back to Direct result\n Ok(direct_processing_result)\n }\n (Err(ucs_error), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)\n }\n }\n}",
|
| 17 |
+
"after_code": "async fn process_shadow_ucs_webhook_transform<'a>(\n state: &'a SessionState,\n merchant_context: &'a domain::MerchantContext,\n connector: &'a ConnectorEnum,\n connector_name: &'a str,\n body: &'a actix_web::web::Bytes,\n request_details: &'a IncomingWebhookRequestDetails<'a>,\n merchant_connector_account: Option<&'a domain::MerchantConnectorAccount>,\n) -> errors::RouterResult<WebhookProcessingResult<'a>> {\n // Execute UCS path\n let ucs_result = unified_connector_service::call_unified_connector_service_for_webhook(\n state,\n merchant_context,\n connector_name,\n body,\n request_details,\n merchant_connector_account,\n )\n .await;\n\n // Execute Direct path for comparison\n let direct_result = async {\n // Decode body for direct processing\n let decoded_body = connector\n .decode_webhook_body(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.and_then(|mca| mca.connector_webhook_details.clone()),\n connector_name,\n )\n .await\n .switch()\n .attach_printable(\n \"There was an error in incoming webhook body decoding for shadow processing\",\n )?;\n\n // Reuse existing process_non_ucs_webhook function\n process_non_ucs_webhook(\n state,\n merchant_context,\n connector,\n connector_name,\n decoded_body.into(),\n request_details,\n )\n .await\n }\n .await;\n\n // Handle results and comparison\n match (ucs_result, direct_result) {\n (\n Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)),\n Ok(mut direct_processing_result),\n ) => {\n // Create ShadowUcsData with UCS results\n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,\n ucs_event_type,\n ucs_transform_data: Box::new(ucs_transform_data),\n request_details,\n webhook_details: None,\n };\n\n // Return Direct result as primary with UCS data in shadow_ucs_data\n direct_processing_result.shadow_ucs_data = Some(shadow_ucs_data);\n Ok(direct_processing_result)\n }\n (Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)\n }\n (Err(ucs_error), Ok(direct_processing_result)) => {\n // In shadow mode, if UCS fails, fall back to Direct result\n Ok(direct_processing_result)\n }\n (Err(ucs_error), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)\n }\n }\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " Ok(mut direct_processing_result),\n ) => {\n // Create ShadowUcsData with UCS results \n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,",
|
| 20 |
+
"after": " Ok(mut direct_processing_result),\n ) => {\n // Create ShadowUcsData with UCS results\n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "64dbbabbb23ee85a3eb07505b99756612f4779b4"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::incoming_webhooks_core",
|
| 26 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_context: domain::MerchantContext,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> errors::RouterResult<(\n services::ApplicationResponse<serde_json::Value>,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n // Initial setup and metrics\n metrics::WEBHOOK_INCOMING_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n\n let request_details = IncomingWebhookRequestDetails {\n method: req.method().clone(),\n uri: req.uri().clone(),\n headers: req.headers(),\n query_params: req.query_string().to_string(),\n body: &body,\n };\n\n // Fetch the merchant connector account to get the webhooks source secret\n let (merchant_connector_account, connector, connector_name) =\n fetch_optional_mca_and_connector(&state, &merchant_context, connector_name_or_mca_id)\n .await?;\n\n // Determine webhook processing path (Direct vs UCS vs Shadow UCS) and handle event type extraction\n let execution_path =\n unified_connector_service::should_call_unified_connector_service_for_webhooks(\n &state,\n &merchant_context,\n &connector_name,\n )\n .await?;\n\n let webhook_processing_result = match execution_path {\n common_enums::ExecutionPath::UnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Unified Connector Service for webhook processing\",\n );\n process_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::ShadowUnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Shadow Unified Connector Service for webhook processing\",\n );\n process_shadow_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::Direct => {\n logger::info!(\n connector = connector_name,\n \"Using Direct connector processing for webhook\",\n );\n // DIRECT PATH: Need to decode body first\n let decoded_body = connector\n .decode_webhook_body(\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account\n .clone()\n .and_then(|mca| mca.connector_webhook_details.clone()),\n &connector_name,\n )\n .await\n .switch()\n .attach_printable(\"There was an error in incoming webhook body decoding\")?;\n\n process_non_ucs_webhook(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n decoded_body.into(),\n &request_details,\n )\n .await\n }\n };\n\n let mut webhook_processing_result = match webhook_processing_result {\n Ok(result) => result,\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((response, webhook_tracker, serialized_request)) => {\n return Ok((response, webhook_tracker, serialized_request));\n }\n Err(e) => return Err(e),\n }\n }\n };\n\n // if it is a setup webhook event, return ok status\n if webhook_processing_result.event_type == webhooks::IncomingWebhookEvent::SetupWebhook {\n return Ok((\n services::ApplicationResponse::StatusOk,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::default(),\n ));\n }\n\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details;\n let decoded_request_details;\n \n match &webhook_processing_result.decoded_body {\n Some(decoded_body) => {\n decoded_request_details = IncomingWebhookRequestDetails {\n method: request_details.method.clone(),\n uri: request_details.uri.clone(),\n headers: request_details.headers,\n query_params: request_details.query_params.clone(),\n body: decoded_body,\n };\n final_request_details = &decoded_request_details;\n }\n None => {\n final_request_details = &request_details; // Use original request details for UCS\n }\n };\n\n logger::info!(event_type=?webhook_processing_result.event_type);\n\n // Check if webhook should be processed further\n let is_webhook_event_supported = !matches!(\n webhook_processing_result.event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_context.get_merchant_account().get_id(),\n &webhook_processing_result.event_type,\n )\n .await;\n let flow_type: api::WebhookFlow = webhook_processing_result.event_type.into();\n let process_webhook_further = is_webhook_event_enabled\n && is_webhook_event_supported\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse);\n logger::info!(process_webhook=?process_webhook_further);\n let mut event_object: Box<dyn masking::ErasedMaskSerialize> = Box::new(serde_json::Value::Null);\n\n let webhook_effect = match process_webhook_further {\n true => {\n let business_logic_result = process_webhook_business_logic(\n &state,\n req_state,\n &merchant_context,\n &connector,\n &connector_name,\n webhook_processing_result.event_type,\n webhook_processing_result.source_verified,\n &webhook_processing_result.transform_data,\n &mut webhook_processing_result.shadow_ucs_data,\n &final_request_details,\n is_relay_webhook,\n )\n .await;\n\n match business_logic_result {\n Ok(response) => {\n // Extract event object for serialization\n event_object = extract_webhook_event_object(\n &webhook_processing_result.transform_data,\n &connector,\n &final_request_details,\n )?;\n response\n }\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &final_request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((_, webhook_tracker, _)) => webhook_tracker,\n Err(e) => return Err(e),\n }\n }\n }\n }\n false => {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n WebhookResponseTracker::NoEffect\n }\n };\n\n // Generate response\n let response = connector\n .get_webhook_api_response(&final_request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;\n\n let serialized_request = event_object\n .masked_serialize()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n\n Ok((response, webhook_effect, serialized_request))\n}",
|
| 32 |
+
"after_code": "async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_context: domain::MerchantContext,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> errors::RouterResult<(\n services::ApplicationResponse<serde_json::Value>,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n // Initial setup and metrics\n metrics::WEBHOOK_INCOMING_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n\n let request_details = IncomingWebhookRequestDetails {\n method: req.method().clone(),\n uri: req.uri().clone(),\n headers: req.headers(),\n query_params: req.query_string().to_string(),\n body: &body,\n };\n\n // Fetch the merchant connector account to get the webhooks source secret\n let (merchant_connector_account, connector, connector_name) =\n fetch_optional_mca_and_connector(&state, &merchant_context, connector_name_or_mca_id)\n .await?;\n\n // Determine webhook processing path (Direct vs UCS vs Shadow UCS) and handle event type extraction\n let execution_path =\n unified_connector_service::should_call_unified_connector_service_for_webhooks(\n &state,\n &merchant_context,\n &connector_name,\n )\n .await?;\n\n let webhook_processing_result = match execution_path {\n common_enums::ExecutionPath::UnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Unified Connector Service for webhook processing\",\n );\n process_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::ShadowUnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Shadow Unified Connector Service for webhook processing\",\n );\n process_shadow_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::Direct => {\n logger::info!(\n connector = connector_name,\n \"Using Direct connector processing for webhook\",\n );\n // DIRECT PATH: Need to decode body first\n let decoded_body = connector\n .decode_webhook_body(\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account\n .clone()\n .and_then(|mca| mca.connector_webhook_details.clone()),\n &connector_name,\n )\n .await\n .switch()\n .attach_printable(\"There was an error in incoming webhook body decoding\")?;\n\n process_non_ucs_webhook(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n decoded_body.into(),\n &request_details,\n )\n .await\n }\n };\n\n let mut webhook_processing_result = match webhook_processing_result {\n Ok(result) => result,\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((response, webhook_tracker, serialized_request)) => {\n return Ok((response, webhook_tracker, serialized_request));\n }\n Err(e) => return Err(e),\n }\n }\n };\n\n // if it is a setup webhook event, return ok status\n if webhook_processing_result.event_type == webhooks::IncomingWebhookEvent::SetupWebhook {\n return Ok((\n services::ApplicationResponse::StatusOk,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::default(),\n ));\n }\n\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details;\n let decoded_request_details;\n\n match &webhook_processing_result.decoded_body {\n Some(decoded_body) => {\n decoded_request_details = IncomingWebhookRequestDetails {\n method: request_details.method.clone(),\n uri: request_details.uri.clone(),\n headers: request_details.headers,\n query_params: request_details.query_params.clone(),\n body: decoded_body,\n };\n final_request_details = &decoded_request_details;\n }\n None => {\n final_request_details = &request_details; // Use original request details for UCS\n }\n };\n\n logger::info!(event_type=?webhook_processing_result.event_type);\n\n // Check if webhook should be processed further\n let is_webhook_event_supported = !matches!(\n webhook_processing_result.event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_context.get_merchant_account().get_id(),\n &webhook_processing_result.event_type,\n )\n .await;\n let flow_type: api::WebhookFlow = webhook_processing_result.event_type.into();\n let process_webhook_further = is_webhook_event_enabled\n && is_webhook_event_supported\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse);\n logger::info!(process_webhook=?process_webhook_further);\n let mut event_object: Box<dyn masking::ErasedMaskSerialize> = Box::new(serde_json::Value::Null);\n\n let webhook_effect = match process_webhook_further {\n true => {\n let business_logic_result = process_webhook_business_logic(\n &state,\n req_state,\n &merchant_context,\n &connector,\n &connector_name,\n webhook_processing_result.event_type,\n webhook_processing_result.source_verified,\n &webhook_processing_result.transform_data,\n &mut webhook_processing_result.shadow_ucs_data,\n &final_request_details,\n is_relay_webhook,\n )\n .await;\n\n match business_logic_result {\n Ok(response) => {\n // Extract event object for serialization\n event_object = extract_webhook_event_object(\n &webhook_processing_result.transform_data,\n &connector,\n &final_request_details,\n )?;\n response\n }\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &final_request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((_, webhook_tracker, _)) => webhook_tracker,\n Err(e) => return Err(e),\n }\n }\n }\n }\n false => {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n WebhookResponseTracker::NoEffect\n }\n };\n\n // Generate response\n let response = connector\n .get_webhook_api_response(&final_request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;\n\n let serialized_request = event_object\n .masked_serialize()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n\n Ok((response, webhook_effect, serialized_request))\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "\n let mut webhook_processing_result = match webhook_processing_result {\n Ok(result) => result,\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((response, webhook_tracker, serialized_request)) => {\n return Ok((response, webhook_tracker, serialized_request));\n }\n Err(e) => return Err(e),\n }\n }\n };\n\n // if it is a setup webhook event, return ok status\n if webhook_processing_result.event_type == webhooks::IncomingWebhookEvent::SetupWebhook {\n return Ok((\n services::ApplicationResponse::StatusOk,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::default(),\n ));\n }\n\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details;\n let decoded_request_details;\n \n match &webhook_processing_result.decoded_body {\n Some(decoded_body) => {",
|
| 35 |
+
"after": "\n let mut webhook_processing_result = match webhook_processing_result {\n Ok(result) => result,\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((response, webhook_tracker, serialized_request)) => {\n return Ok((response, webhook_tracker, serialized_request));\n }\n Err(e) => return Err(e),\n }\n }\n };\n\n // if it is a setup webhook event, return ok status\n if webhook_processing_result.event_type == webhooks::IncomingWebhookEvent::SetupWebhook {\n return Ok((\n services::ApplicationResponse::StatusOk,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::default(),\n ));\n }\n\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details;\n let decoded_request_details;\n\n match &webhook_processing_result.decoded_body {\n Some(decoded_body) => {"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "64dbbabbb23ee85a3eb07505b99756612f4779b4"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::payments_incoming_webhook_flow",
|
| 41 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "async fn payments_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n event_type: webhooks::IncomingWebhookEvent,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &Option<ShadowUcsData<'_>>,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n let consume_or_trigger_flow = if source_verified {\n // Determine the appropriate action based on UCS availability\n let resource_object = webhook_details.resource_object;\n\n match webhook_transform_data.as_ref() {\n Some(transform_data) => {\n match transform_data.webhook_transformation_status {\n unified_connector_service::WebhookTransformationStatus::Complete => {\n // Consume response from UCS\n payments::CallConnectorAction::UCSConsumeResponse(resource_object)\n }\n unified_connector_service::WebhookTransformationStatus::Incomplete => {\n // Make a second call to UCS\n payments::CallConnectorAction::UCSHandleResponse(resource_object)\n }\n }\n }\n None => payments::CallConnectorAction::HandleResponse(resource_object),\n }\n } else {\n payments::CallConnectorAction::Trigger\n };\n\n // Determine shadow UCS call connector action based on shadow UCS data\n let shadow_ucs_call_connector_action = shadow_ucs_data.as_ref().and_then(|shadow_data| {\n if shadow_data.ucs_source_verified {\n // Proceed with the match case of webhook_transformation_status\n shadow_data.webhook_details.as_ref().map(|webhook_details| {\n match shadow_data.ucs_transform_data.webhook_transformation_status {\n unified_connector_service::WebhookTransformationStatus::Complete => {\n payments::CallConnectorAction::UCSConsumeResponse(webhook_details.resource_object.clone())\n }\n unified_connector_service::WebhookTransformationStatus::Incomplete => {\n payments::CallConnectorAction::UCSHandleResponse(webhook_details.resource_object.clone())\n }\n }\n })\n } else {\n // If ucs_source_verified is not true, use Trigger action\n Some(payments::CallConnectorAction::Trigger)\n }\n });\n \n let payments_response = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PaymentId(ref id) => {\n let payment_id = get_payment_id(\n state.store.as_ref(),\n id,\n merchant_context.get_merchant_account().get_id(),\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await?;\n\n let lock_action = api_locking::LockAction::Hold {\n input: api_locking::LockingInput {\n unique_locking_key: payment_id.get_string_repr().to_owned(),\n api_identifier: lock_utils::ApiIdentifier::Payments,\n override_lock_retries: None,\n },\n };\n\n lock_action\n .clone()\n .perform_locking_action(\n &state,\n merchant_context.get_merchant_account().get_id().to_owned(),\n )\n .await?;\n\n let response = Box::pin(payments::payments_core::<\n api::PSync,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData<api::PSync>,\n >(\n state.clone(),\n req_state,\n merchant_context.clone(),\n None,\n payments::operations::PaymentStatus,\n api::PaymentsRetrieveRequest {\n resource_id: id.clone(),\n merchant_id: Some(merchant_context.get_merchant_account().get_id().clone()),\n force_sync: true,\n connector: None,\n param: None,\n merchant_connector_details: None,\n client_secret: None,\n expand_attempts: None,\n expand_captures: None,\n all_keys_required: None,\n },\n services::AuthFlow::Merchant,\n consume_or_trigger_flow.clone(),\n shadow_ucs_call_connector_action,\n None,\n HeaderPayload::default(),\n ))\n .await;\n // When mandate details are present in successful webhooks, and consuming webhooks are skipped during payment sync if the payment status is already updated to charged, this function is used to update the connector mandate details.\n if should_update_connector_mandate_details(source_verified, event_type) {\n update_connector_mandate_details(\n &state,\n &merchant_context,\n webhook_details.object_reference_id.clone(),\n connector,\n request_details,\n )\n .await?\n };\n lock_action\n .free_lock_action(\n &state,\n merchant_context.get_merchant_account().get_id().to_owned(),\n )\n .await?;\n\n match response {\n Ok(value) => value,\n Err(err)\n if matches!(\n err.current_context(),\n &errors::ApiErrorResponse::PaymentNotFound\n ) && state\n .conf\n .webhooks\n .ignore_error\n .payment_not_found\n .unwrap_or(true) =>\n {\n metrics::WEBHOOK_PAYMENT_NOT_FOUND.add(\n 1,\n router_env::metric_attributes!((\n \"merchant_id\",\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n return Ok(WebhookResponseTracker::NoEffect);\n }\n error @ Err(_) => error?,\n }\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n };\n\n match payments_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let status = payments_response.status;\n\n let event_type: Option<enums::EventType> = payments_response.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n };\n\n let response = WebhookResponseTracker::Payment { payment_id, status };\n\n Ok(response)\n }\n\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received non-json response from payments core\")?,\n }\n}",
|
| 47 |
+
"after_code": "async fn payments_incoming_webhook_flow(\n state: SessionState,\n req_state: ReqState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n source_verified: bool,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n event_type: webhooks::IncomingWebhookEvent,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &Option<ShadowUcsData<'_>>,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n let consume_or_trigger_flow = if source_verified {\n // Determine the appropriate action based on UCS availability\n let resource_object = webhook_details.resource_object;\n\n match webhook_transform_data.as_ref() {\n Some(transform_data) => {\n match transform_data.webhook_transformation_status {\n unified_connector_service::WebhookTransformationStatus::Complete => {\n // Consume response from UCS\n payments::CallConnectorAction::UCSConsumeResponse(resource_object)\n }\n unified_connector_service::WebhookTransformationStatus::Incomplete => {\n // Make a second call to UCS\n payments::CallConnectorAction::UCSHandleResponse(resource_object)\n }\n }\n }\n None => payments::CallConnectorAction::HandleResponse(resource_object),\n }\n } else {\n payments::CallConnectorAction::Trigger\n };\n\n // Determine shadow UCS call connector action based on shadow UCS data\n let shadow_ucs_call_connector_action = shadow_ucs_data.as_ref().and_then(|shadow_data| {\n if shadow_data.ucs_source_verified {\n // Proceed with the match case of webhook_transformation_status\n shadow_data.webhook_details.as_ref().map(|webhook_details| {\n match shadow_data.ucs_transform_data.webhook_transformation_status {\n unified_connector_service::WebhookTransformationStatus::Complete => {\n payments::CallConnectorAction::UCSConsumeResponse(\n webhook_details.resource_object.clone(),\n )\n }\n unified_connector_service::WebhookTransformationStatus::Incomplete => {\n payments::CallConnectorAction::UCSHandleResponse(\n webhook_details.resource_object.clone(),\n )\n }\n }\n })\n } else {\n // If ucs_source_verified is not true, use Trigger action\n Some(payments::CallConnectorAction::Trigger)\n }\n });\n\n let payments_response = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PaymentId(ref id) => {\n let payment_id = get_payment_id(\n state.store.as_ref(),\n id,\n merchant_context.get_merchant_account().get_id(),\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await?;\n\n let lock_action = api_locking::LockAction::Hold {\n input: api_locking::LockingInput {\n unique_locking_key: payment_id.get_string_repr().to_owned(),\n api_identifier: lock_utils::ApiIdentifier::Payments,\n override_lock_retries: None,\n },\n };\n\n lock_action\n .clone()\n .perform_locking_action(\n &state,\n merchant_context.get_merchant_account().get_id().to_owned(),\n )\n .await?;\n\n let response = Box::pin(payments::payments_core::<\n api::PSync,\n api::PaymentsResponse,\n _,\n _,\n _,\n payments::PaymentData<api::PSync>,\n >(\n state.clone(),\n req_state,\n merchant_context.clone(),\n None,\n payments::operations::PaymentStatus,\n api::PaymentsRetrieveRequest {\n resource_id: id.clone(),\n merchant_id: Some(merchant_context.get_merchant_account().get_id().clone()),\n force_sync: true,\n connector: None,\n param: None,\n merchant_connector_details: None,\n client_secret: None,\n expand_attempts: None,\n expand_captures: None,\n all_keys_required: None,\n },\n services::AuthFlow::Merchant,\n consume_or_trigger_flow.clone(),\n shadow_ucs_call_connector_action,\n None,\n HeaderPayload::default(),\n ))\n .await;\n // When mandate details are present in successful webhooks, and consuming webhooks are skipped during payment sync if the payment status is already updated to charged, this function is used to update the connector mandate details.\n if should_update_connector_mandate_details(source_verified, event_type) {\n update_connector_mandate_details(\n &state,\n &merchant_context,\n webhook_details.object_reference_id.clone(),\n connector,\n request_details,\n )\n .await?\n };\n lock_action\n .free_lock_action(\n &state,\n merchant_context.get_merchant_account().get_id().to_owned(),\n )\n .await?;\n\n match response {\n Ok(value) => value,\n Err(err)\n if matches!(\n err.current_context(),\n &errors::ApiErrorResponse::PaymentNotFound\n ) && state\n .conf\n .webhooks\n .ignore_error\n .payment_not_found\n .unwrap_or(true) =>\n {\n metrics::WEBHOOK_PAYMENT_NOT_FOUND.add(\n 1,\n router_env::metric_attributes!((\n \"merchant_id\",\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n return Ok(WebhookResponseTracker::NoEffect);\n }\n error @ Err(_) => error?,\n }\n }\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure).attach_printable(\n \"Did not get payment id as object reference id in webhook payments flow\",\n )?,\n };\n\n match payments_response {\n services::ApplicationResponse::JsonWithHeaders((payments_response, _)) => {\n let payment_id = payments_response.payment_id.clone();\n\n let status = payments_response.status;\n\n let event_type: Option<enums::EventType> = payments_response.status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let primary_object_created_at = payments_response.created;\n Box::pin(super::create_event_and_trigger_outgoing_webhook(\n state,\n merchant_context,\n business_profile,\n outgoing_event_type,\n enums::EventClass::Payments,\n payment_id.get_string_repr().to_owned(),\n enums::EventObjectType::PaymentDetails,\n api::OutgoingWebhookContent::PaymentDetails(Box::new(payments_response)),\n primary_object_created_at,\n ))\n .await?;\n };\n\n let response = WebhookResponseTracker::Payment { payment_id, status };\n\n Ok(response)\n }\n\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received non-json response from payments core\")?,\n }\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " match shadow_data.ucs_transform_data.webhook_transformation_status {\n unified_connector_service::WebhookTransformationStatus::Complete => {\n payments::CallConnectorAction::UCSConsumeResponse(webhook_details.resource_object.clone())\n }\n unified_connector_service::WebhookTransformationStatus::Incomplete => {\n payments::CallConnectorAction::UCSHandleResponse(webhook_details.resource_object.clone())\n }\n }\n })\n } else {\n // If ucs_source_verified is not true, use Trigger action\n Some(payments::CallConnectorAction::Trigger)\n }\n });\n \n let payments_response = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PaymentId(ref id) => {",
|
| 50 |
+
"after": " match shadow_data.ucs_transform_data.webhook_transformation_status {\n unified_connector_service::WebhookTransformationStatus::Complete => {\n payments::CallConnectorAction::UCSConsumeResponse(\n webhook_details.resource_object.clone(),\n )\n }\n unified_connector_service::WebhookTransformationStatus::Incomplete => {\n payments::CallConnectorAction::UCSHandleResponse(\n webhook_details.resource_object.clone(),\n )\n }\n }\n })\n } else {\n // If ucs_source_verified is not true, use Trigger action\n Some(payments::CallConnectorAction::Trigger)\n }\n });\n\n let payments_response = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::PaymentId(ref id) => {"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "64dbbabbb23ee85a3eb07505b99756612f4779b4"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::process_webhook_business_logic",
|
| 56 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .map(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data.ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\"Could not find resource object in shadow incoming webhook body\")\n });\n \n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(_) => None, // In case of error, assign None\n }\n })\n .flatten();\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object.as_ref().map(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n \n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(_) => None, // In case of serialization error, assign None\n }\n }).flatten();\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
|
| 62 |
+
"after_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .map(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(_) => None, // In case of error, assign None\n }\n })\n .flatten();\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .map(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(_) => None, // In case of serialization error, assign None\n }\n })\n .flatten();\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": " .map(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data.ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\"Could not find resource object in shadow incoming webhook body\")\n });\n \n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(_) => None, // In case of error, assign None\n }\n })\n .flatten();\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object.as_ref().map(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n \n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(_) => None, // In case of serialization error, assign None\n }\n }).flatten();\n\n // Assign shadow_webhook_details to shadow_ucs_data",
|
| 65 |
+
"after": " .map(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(_) => None, // In case of error, assign None\n }\n })\n .flatten();\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .map(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(_) => None, // In case of serialization error, assign None\n }\n })\n .flatten();\n\n // Assign shadow_webhook_details to shadow_ucs_data"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "64dbbabbb23ee85a3eb07505b99756612f4779b4"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 71 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 72 |
+
"kind": "function_item",
|
| 73 |
+
"status": "modified",
|
| 74 |
+
"code_changed": true,
|
| 75 |
+
"imports_changed": false,
|
| 76 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, PaymentsResponseData>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n) -> RouterResult<ExecutionPath>\nwhere\n D: OperationSessionGetters<F>,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let payment_method = router_data.payment_method.to_string();\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys\n let rollout_key = format!(\n \"{}_{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n payment_method,\n flow_name\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n let shadow_rollout_key = format!(\"{}_shadow\", rollout_key);\n\n let shadow_rollout_availability =\n if should_execute_based_on_rollout(state, &shadow_rollout_key).await? {\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n if shadow_ucs_call_connector_action.is_some() {\n (GatewaySystem::Direct, ExecutionPath::ShadowUnifiedConnectorService)\n }\n else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, payment_method={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n payment_method,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 77 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, PaymentsResponseData>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n) -> RouterResult<ExecutionPath>\nwhere\n D: OperationSessionGetters<F>,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let payment_method = router_data.payment_method.to_string();\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys\n let rollout_key = format!(\n \"{}_{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n payment_method,\n flow_name\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n let shadow_rollout_key = format!(\"{}_shadow\", rollout_key);\n\n let shadow_rollout_availability =\n if should_execute_based_on_rollout(state, &shadow_rollout_key).await? {\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n if shadow_ucs_call_connector_action.is_some() {\n (\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )\n } else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, payment_method={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n payment_method,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 78 |
+
"diff_span": {
|
| 79 |
+
"before": " );\n if shadow_ucs_call_connector_action.is_some() {\n (GatewaySystem::Direct, ExecutionPath::ShadowUnifiedConnectorService)\n }\n else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }",
|
| 80 |
+
"after": " );\n if shadow_ucs_call_connector_action.is_some() {\n (\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )\n } else {\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }"
|
| 81 |
+
},
|
| 82 |
+
"commit_sha": "64dbbabbb23ee85a3eb07505b99756612f4779b4"
|
| 83 |
+
}
|
| 84 |
+
]
|
| 85 |
+
}
|
diffs/pr_10019/79215df/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "79215df3752d09b3d8fda9af2c647a51e86c1d41",
|
| 3 |
+
"pr_number": 10019,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::incoming_webhooks_core",
|
| 10 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_context: domain::MerchantContext,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> errors::RouterResult<(\n services::ApplicationResponse<serde_json::Value>,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n // Initial setup and metrics\n metrics::WEBHOOK_INCOMING_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n\n let request_details = IncomingWebhookRequestDetails {\n method: req.method().clone(),\n uri: req.uri().clone(),\n headers: req.headers(),\n query_params: req.query_string().to_string(),\n body: &body,\n };\n\n // Fetch the merchant connector account to get the webhooks source secret\n let (merchant_connector_account, connector, connector_name) =\n fetch_optional_mca_and_connector(&state, &merchant_context, connector_name_or_mca_id)\n .await?;\n\n // Determine webhook processing path (Direct vs UCS vs Shadow UCS) and handle event type extraction\n let execution_path =\n unified_connector_service::should_call_unified_connector_service_for_webhooks(\n &state,\n &merchant_context,\n &connector_name,\n )\n .await?;\n\n let webhook_processing_result = match execution_path {\n common_enums::ExecutionPath::UnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Unified Connector Service for webhook processing\",\n );\n process_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::ShadowUnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Shadow Unified Connector Service for webhook processing\",\n );\n process_shadow_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::Direct => {\n logger::info!(\n connector = connector_name,\n \"Using Direct connector processing for webhook\",\n );\n // DIRECT PATH: Need to decode body first\n let decoded_body = connector\n .decode_webhook_body(\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account\n .clone()\n .and_then(|mca| mca.connector_webhook_details.clone()),\n &connector_name,\n )\n .await\n .switch()\n .attach_printable(\"There was an error in incoming webhook body decoding\")?;\n\n process_non_ucs_webhook(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n decoded_body.into(),\n &request_details,\n )\n .await\n }\n };\n\n let mut webhook_processing_result = match webhook_processing_result {\n Ok(result) => result,\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((response, webhook_tracker, serialized_request)) => {\n return Ok((response, webhook_tracker, serialized_request));\n }\n Err(e) => return Err(e),\n }\n }\n };\n\n // if it is a setup webhook event, return ok status\n if webhook_processing_result.event_type == webhooks::IncomingWebhookEvent::SetupWebhook {\n return Ok((\n services::ApplicationResponse::StatusOk,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::default(),\n ));\n }\n\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details;\n let decoded_request_details;\n\n match &webhook_processing_result.decoded_body {\n Some(decoded_body) => {\n decoded_request_details = IncomingWebhookRequestDetails {\n method: request_details.method.clone(),\n uri: request_details.uri.clone(),\n headers: request_details.headers,\n query_params: request_details.query_params.clone(),\n body: decoded_body,\n };\n final_request_details = &decoded_request_details;\n }\n None => {\n final_request_details = &request_details; // Use original request details for UCS\n }\n };\n\n logger::info!(event_type=?webhook_processing_result.event_type);\n\n // Check if webhook should be processed further\n let is_webhook_event_supported = !matches!(\n webhook_processing_result.event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_context.get_merchant_account().get_id(),\n &webhook_processing_result.event_type,\n )\n .await;\n let flow_type: api::WebhookFlow = webhook_processing_result.event_type.into();\n let process_webhook_further = is_webhook_event_enabled\n && is_webhook_event_supported\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse);\n logger::info!(process_webhook=?process_webhook_further);\n let mut event_object: Box<dyn masking::ErasedMaskSerialize> = Box::new(serde_json::Value::Null);\n\n let webhook_effect = match process_webhook_further {\n true => {\n let business_logic_result = process_webhook_business_logic(\n &state,\n req_state,\n &merchant_context,\n &connector,\n &connector_name,\n webhook_processing_result.event_type,\n webhook_processing_result.source_verified,\n &webhook_processing_result.transform_data,\n &mut webhook_processing_result.shadow_ucs_data,\n &final_request_details,\n is_relay_webhook,\n )\n .await;\n\n match business_logic_result {\n Ok(response) => {\n // Extract event object for serialization\n event_object = extract_webhook_event_object(\n &webhook_processing_result.transform_data,\n &connector,\n &final_request_details,\n )?;\n response\n }\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &final_request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((_, webhook_tracker, _)) => webhook_tracker,\n Err(e) => return Err(e),\n }\n }\n }\n }\n false => {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n WebhookResponseTracker::NoEffect\n }\n };\n\n // Generate response\n let response = connector\n .get_webhook_api_response(&final_request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;\n\n let serialized_request = event_object\n .masked_serialize()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n\n Ok((response, webhook_effect, serialized_request))\n}",
|
| 16 |
+
"after_code": "async fn incoming_webhooks_core<W: types::OutgoingWebhookType>(\n state: SessionState,\n req_state: ReqState,\n req: &actix_web::HttpRequest,\n merchant_context: domain::MerchantContext,\n connector_name_or_mca_id: &str,\n body: actix_web::web::Bytes,\n is_relay_webhook: bool,\n) -> errors::RouterResult<(\n services::ApplicationResponse<serde_json::Value>,\n WebhookResponseTracker,\n serde_json::Value,\n)> {\n // Initial setup and metrics\n metrics::WEBHOOK_INCOMING_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n\n let request_details = IncomingWebhookRequestDetails {\n method: req.method().clone(),\n uri: req.uri().clone(),\n headers: req.headers(),\n query_params: req.query_string().to_string(),\n body: &body,\n };\n\n // Fetch the merchant connector account to get the webhooks source secret\n let (merchant_connector_account, connector, connector_name) =\n fetch_optional_mca_and_connector(&state, &merchant_context, connector_name_or_mca_id)\n .await?;\n\n // Determine webhook processing path (Direct vs UCS vs Shadow UCS) and handle event type extraction\n let execution_path =\n unified_connector_service::should_call_unified_connector_service_for_webhooks(\n &state,\n &merchant_context,\n &connector_name,\n )\n .await?;\n\n let webhook_processing_result = match execution_path {\n common_enums::ExecutionPath::UnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Unified Connector Service for webhook processing\",\n );\n process_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::ShadowUnifiedConnectorService => {\n logger::info!(\n connector = connector_name,\n \"Using Shadow Unified Connector Service for webhook processing\",\n );\n process_shadow_ucs_webhook_transform(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n &body,\n &request_details,\n merchant_connector_account.as_ref(),\n )\n .await\n }\n common_enums::ExecutionPath::Direct => {\n logger::info!(\n connector = connector_name,\n \"Using Direct connector processing for webhook\",\n );\n // DIRECT PATH: Need to decode body first\n let decoded_body = connector\n .decode_webhook_body(\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account\n .clone()\n .and_then(|mca| mca.connector_webhook_details.clone()),\n &connector_name,\n )\n .await\n .switch()\n .attach_printable(\"There was an error in incoming webhook body decoding\")?;\n\n process_non_ucs_webhook(\n &state,\n &merchant_context,\n &connector,\n &connector_name,\n decoded_body.into(),\n &request_details,\n )\n .await\n }\n };\n\n let mut webhook_processing_result = match webhook_processing_result {\n Ok(result) => result,\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((response, webhook_tracker, serialized_request)) => {\n return Ok((response, webhook_tracker, serialized_request));\n }\n Err(e) => return Err(e),\n }\n }\n };\n\n // if it is a setup webhook event, return ok status\n if webhook_processing_result.event_type == webhooks::IncomingWebhookEvent::SetupWebhook {\n return Ok((\n services::ApplicationResponse::StatusOk,\n WebhookResponseTracker::NoEffect,\n serde_json::Value::default(),\n ));\n }\n\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details = match &webhook_processing_result.decoded_body {\n Some(decoded_body) => &IncomingWebhookRequestDetails {\n method: request_details.method.clone(),\n uri: request_details.uri.clone(),\n headers: request_details.headers,\n query_params: request_details.query_params.clone(),\n body: decoded_body,\n },\n None => &request_details, // Use original request details for UCS\n };\n\n logger::info!(event_type=?webhook_processing_result.event_type);\n\n // Check if webhook should be processed further\n let is_webhook_event_supported = !matches!(\n webhook_processing_result.event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_context.get_merchant_account().get_id(),\n &webhook_processing_result.event_type,\n )\n .await;\n let flow_type: api::WebhookFlow = webhook_processing_result.event_type.into();\n let process_webhook_further = is_webhook_event_enabled\n && is_webhook_event_supported\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse);\n logger::info!(process_webhook=?process_webhook_further);\n let mut event_object: Box<dyn masking::ErasedMaskSerialize> = Box::new(serde_json::Value::Null);\n\n let webhook_effect = match process_webhook_further {\n true => {\n let business_logic_result = process_webhook_business_logic(\n &state,\n req_state,\n &merchant_context,\n &connector,\n &connector_name,\n webhook_processing_result.event_type,\n webhook_processing_result.source_verified,\n &webhook_processing_result.transform_data,\n &mut webhook_processing_result.shadow_ucs_data,\n final_request_details,\n is_relay_webhook,\n )\n .await;\n\n match business_logic_result {\n Ok(response) => {\n // Extract event object for serialization\n event_object = extract_webhook_event_object(\n &webhook_processing_result.transform_data,\n &connector,\n final_request_details,\n )?;\n response\n }\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n final_request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((_, webhook_tracker, _)) => webhook_tracker,\n Err(e) => return Err(e),\n }\n }\n }\n }\n false => {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n WebhookResponseTracker::NoEffect\n }\n };\n\n // Generate response\n let response = connector\n .get_webhook_api_response(final_request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;\n\n let serialized_request = event_object\n .masked_serialize()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Could not convert webhook effect to string\")?;\n\n Ok((response, webhook_effect, serialized_request))\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details;\n let decoded_request_details;\n\n match &webhook_processing_result.decoded_body {\n Some(decoded_body) => {\n decoded_request_details = IncomingWebhookRequestDetails {\n method: request_details.method.clone(),\n uri: request_details.uri.clone(),\n headers: request_details.headers,\n query_params: request_details.query_params.clone(),\n body: decoded_body,\n };\n final_request_details = &decoded_request_details;\n }\n None => {\n final_request_details = &request_details; // Use original request details for UCS\n }\n };\n\n logger::info!(event_type=?webhook_processing_result.event_type);\n\n // Check if webhook should be processed further\n let is_webhook_event_supported = !matches!(\n webhook_processing_result.event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_context.get_merchant_account().get_id(),\n &webhook_processing_result.event_type,\n )\n .await;\n let flow_type: api::WebhookFlow = webhook_processing_result.event_type.into();\n let process_webhook_further = is_webhook_event_enabled\n && is_webhook_event_supported\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse);\n logger::info!(process_webhook=?process_webhook_further);\n let mut event_object: Box<dyn masking::ErasedMaskSerialize> = Box::new(serde_json::Value::Null);\n\n let webhook_effect = match process_webhook_further {\n true => {\n let business_logic_result = process_webhook_business_logic(\n &state,\n req_state,\n &merchant_context,\n &connector,\n &connector_name,\n webhook_processing_result.event_type,\n webhook_processing_result.source_verified,\n &webhook_processing_result.transform_data,\n &mut webhook_processing_result.shadow_ucs_data,\n &final_request_details,\n is_relay_webhook,\n )\n .await;\n\n match business_logic_result {\n Ok(response) => {\n // Extract event object for serialization\n event_object = extract_webhook_event_object(\n &webhook_processing_result.transform_data,\n &connector,\n &final_request_details,\n )?;\n response\n }\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n &final_request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((_, webhook_tracker, _)) => webhook_tracker,\n Err(e) => return Err(e),\n }\n }\n }\n }\n false => {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n WebhookResponseTracker::NoEffect\n }\n };\n\n // Generate response\n let response = connector\n .get_webhook_api_response(&final_request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;",
|
| 19 |
+
"after": "\n // Update request_details with the appropriate body (decoded for non-UCS, raw for UCS)\n let final_request_details = match &webhook_processing_result.decoded_body {\n Some(decoded_body) => &IncomingWebhookRequestDetails {\n method: request_details.method.clone(),\n uri: request_details.uri.clone(),\n headers: request_details.headers,\n query_params: request_details.query_params.clone(),\n body: decoded_body,\n },\n None => &request_details, // Use original request details for UCS\n };\n\n logger::info!(event_type=?webhook_processing_result.event_type);\n\n // Check if webhook should be processed further\n let is_webhook_event_supported = !matches!(\n webhook_processing_result.event_type,\n webhooks::IncomingWebhookEvent::EventNotSupported\n );\n let is_webhook_event_enabled = !utils::is_webhook_event_disabled(\n &*state.clone().store,\n connector_name.as_str(),\n merchant_context.get_merchant_account().get_id(),\n &webhook_processing_result.event_type,\n )\n .await;\n let flow_type: api::WebhookFlow = webhook_processing_result.event_type.into();\n let process_webhook_further = is_webhook_event_enabled\n && is_webhook_event_supported\n && !matches!(flow_type, api::WebhookFlow::ReturnResponse);\n logger::info!(process_webhook=?process_webhook_further);\n let mut event_object: Box<dyn masking::ErasedMaskSerialize> = Box::new(serde_json::Value::Null);\n\n let webhook_effect = match process_webhook_further {\n true => {\n let business_logic_result = process_webhook_business_logic(\n &state,\n req_state,\n &merchant_context,\n &connector,\n &connector_name,\n webhook_processing_result.event_type,\n webhook_processing_result.source_verified,\n &webhook_processing_result.transform_data,\n &mut webhook_processing_result.shadow_ucs_data,\n final_request_details,\n is_relay_webhook,\n )\n .await;\n\n match business_logic_result {\n Ok(response) => {\n // Extract event object for serialization\n event_object = extract_webhook_event_object(\n &webhook_processing_result.transform_data,\n &connector,\n final_request_details,\n )?;\n response\n }\n Err(error) => {\n let error_result = handle_incoming_webhook_error(\n error,\n &connector,\n connector_name.as_str(),\n final_request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match error_result {\n Ok((_, webhook_tracker, _)) => webhook_tracker,\n Err(e) => return Err(e),\n }\n }\n }\n }\n false => {\n metrics::WEBHOOK_INCOMING_FILTERED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n WebhookResponseTracker::NoEffect\n }\n };\n\n // Generate response\n let response = connector\n .get_webhook_api_response(final_request_details, None)\n .switch()\n .attach_printable(\"Could not get incoming webhook api response from connector\")?;"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "79215df3752d09b3d8fda9af2c647a51e86c1d41"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::process_webhook_business_logic",
|
| 25 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .map(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(_) => None, // In case of error, assign None\n }\n })\n .flatten();\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .map(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(_) => None, // In case of serialization error, assign None\n }\n })\n .flatten();\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
|
| 31 |
+
"after_code": "async fn process_webhook_business_logic(\n state: &SessionState,\n req_state: ReqState,\n merchant_context: &domain::MerchantContext,\n connector: &ConnectorEnum,\n connector_name: &str,\n event_type: webhooks::IncomingWebhookEvent,\n source_verified_via_ucs: bool,\n webhook_transform_data: &Option<Box<unified_connector_service::WebhookTransformData>>,\n shadow_ucs_data: &mut Option<ShadowUcsData<'_>>,\n request_details: &IncomingWebhookRequestDetails<'_>,\n is_relay_webhook: bool,\n) -> errors::RouterResult<WebhookResponseTracker> {\n let object_ref_id = connector\n .get_webhook_object_reference_id(request_details)\n .switch()\n .attach_printable(\"Could not find object reference id in incoming webhook body\")?;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n let connectors_with_source_verification_call = &state.conf.webhook_source_verification_call;\n\n let merchant_connector_account = match Box::pin(helper_utils::get_mca_from_object_reference_id(\n state,\n object_ref_id.clone(),\n merchant_context,\n connector_name,\n ))\n .await\n {\n Ok(mca) => mca,\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => return Ok(webhook_tracker),\n Err(e) => return Err(e),\n }\n }\n };\n\n let source_verified = if source_verified_via_ucs {\n // If UCS handled verification, use that result\n source_verified_via_ucs\n } else {\n // Fall back to traditional source verification\n if connectors_with_source_verification_call\n .connectors_with_webhook_source_verification_call\n .contains(&connector_enum)\n {\n verify_webhook_source_verification_call(\n connector.clone(),\n state,\n merchant_context,\n merchant_connector_account.clone(),\n connector_name,\n request_details,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n } else {\n connector\n .clone()\n .verify_webhook_source(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.connector_webhook_details.clone(),\n merchant_connector_account.connector_account_details.clone(),\n connector_name,\n )\n .await\n .or_else(|error| match error.current_context() {\n errors::ConnectorError::WebhookSourceVerificationFailed => {\n logger::error!(?error, \"Source Verification Failed\");\n Ok(false)\n }\n _ => Err(error),\n })\n .switch()\n .attach_printable(\"There was an issue in incoming webhook source verification\")?\n }\n };\n\n if source_verified {\n metrics::WEBHOOK_SOURCE_VERIFIED_COUNT.add(\n 1,\n router_env::metric_attributes!((\n MERCHANT_ID,\n merchant_context.get_merchant_account().get_id().clone()\n )),\n );\n } else if connector.is_webhook_source_verification_mandatory() {\n // if webhook consumption is mandatory for connector, fail webhook\n // so that merchant can retrigger it after updating merchant_secret\n return Err(errors::ApiErrorResponse::WebhookAuthenticationFailed.into());\n }\n\n logger::info!(source_verified=?source_verified);\n\n let event_object: Box<dyn masking::ErasedMaskSerialize> = match webhook_transform_data {\n Some(webhook_transform_data) => {\n // Extract resource_object from UCS webhook content\n webhook_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")\n })?\n }\n None => {\n // Use traditional connector extraction\n connector\n .get_webhook_resource_object(request_details)\n .switch()\n .attach_printable(\"Could not find resource object in incoming webhook body\")?\n }\n };\n\n let webhook_details = api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object: serde_json::to_vec(&event_object)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the incoming webhook body to bytes\",\n )?,\n };\n\n // Create shadow_event_object and shadow_webhook_details using shadow UCS data\n let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to serialize shadow webhook payload to bytes\"\n );\n None\n }\n }\n });\n\n // Assign shadow_webhook_details to shadow_ucs_data\n if let Some(shadow_data) = shadow_ucs_data.as_mut() {\n shadow_data.webhook_details = shadow_webhook_details;\n }\n\n let profile_id = &merchant_connector_account.profile_id;\n let key_manager_state = &(state).into();\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n profile_id,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })?;\n\n // If the incoming webhook is a relay webhook, then we need to trigger the relay webhook flow\n let result_response = if is_relay_webhook {\n let relay_webhook_response = Box::pin(relay_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for relay failed\");\n\n // Using early return ensures unsupported webhooks are acknowledged to the connector\n if let Some(errors::ApiErrorResponse::NotSupported { .. }) = relay_webhook_response\n .as_ref()\n .err()\n .map(|a| a.current_context())\n {\n logger::error!(\n webhook_payload =? request_details.body,\n \"Failed while identifying the event type\",\n );\n\n let _response = connector\n .get_webhook_api_response(request_details, None)\n .switch()\n .attach_printable(\n \"Failed while early return in case of not supported event type in relay webhooks\",\n )?;\n\n return Ok(WebhookResponseTracker::NoEffect);\n };\n\n relay_webhook_response\n } else {\n let flow_type: api::WebhookFlow = event_type.into();\n match flow_type {\n api::WebhookFlow::Payment => Box::pin(payments_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n webhook_transform_data,\n shadow_ucs_data,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payments failed\"),\n\n api::WebhookFlow::Refund => Box::pin(refunds_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n connector_name,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for refunds failed\"),\n\n api::WebhookFlow::Dispute => Box::pin(disputes_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for disputes failed\"),\n\n api::WebhookFlow::BankTransfer => Box::pin(bank_transfer_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming bank-transfer webhook flow failed\"),\n\n api::WebhookFlow::ReturnResponse => Ok(WebhookResponseTracker::NoEffect),\n\n api::WebhookFlow::Mandate => Box::pin(mandates_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n event_type,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for mandates failed\"),\n\n api::WebhookFlow::ExternalAuthentication => {\n Box::pin(external_authentication_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n request_details,\n connector,\n object_ref_id,\n business_profile,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for external authentication failed\")\n }\n api::WebhookFlow::FraudCheck => Box::pin(frm_incoming_webhook_flow(\n state.clone(),\n req_state,\n merchant_context.clone(),\n source_verified,\n event_type,\n object_ref_id,\n business_profile,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for fraud check failed\"),\n\n #[cfg(feature = \"payouts\")]\n api::WebhookFlow::Payout => Box::pin(payouts_incoming_webhook_flow(\n state.clone(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n event_type,\n source_verified,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for payouts failed\"),\n\n api::WebhookFlow::Subscription => {\n Box::pin(subscriptions::webhooks::incoming_webhook_flow(\n state.clone().into(),\n merchant_context.clone(),\n business_profile,\n webhook_details,\n source_verified,\n connector,\n request_details,\n event_type,\n merchant_connector_account,\n ))\n .await\n .attach_printable(\"Incoming webhook flow for subscription failed\")\n }\n\n _ => Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unsupported Flow Type received in incoming webhooks\"),\n }\n };\n\n match result_response {\n Ok(response) => Ok(response),\n Err(error) => {\n let result = handle_incoming_webhook_error(\n error,\n connector,\n connector_name,\n request_details,\n merchant_context.get_merchant_account().get_id(),\n );\n match result {\n Ok((_, webhook_tracker, _)) => Ok(webhook_tracker),\n Err(e) => Err(e),\n }\n }\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .map(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(_) => None, // In case of error, assign None\n }\n })\n .flatten();\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .map(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(_) => None, // In case of serialization error, assign None\n }\n })\n .flatten();\n\n // Assign shadow_webhook_details to shadow_ucs_data",
|
| 34 |
+
"after": " let shadow_event_object: Option<Box<dyn masking::ErasedMaskSerialize>> = shadow_ucs_data\n .as_ref()\n .and_then(|shadow_data| {\n // Create shadow event object using UCS transform data and shadow request details\n let shadow_event_result = shadow_data\n .ucs_transform_data\n .webhook_content\n .as_ref()\n .map(|webhook_response_content| {\n get_ucs_webhook_resource_object(webhook_response_content)\n })\n .unwrap_or_else(|| {\n // Fall back to connector extraction using shadow request details\n connector\n .get_webhook_resource_object(shadow_data.request_details)\n .switch()\n .attach_printable(\n \"Could not find resource object in shadow incoming webhook body\",\n )\n });\n\n match shadow_event_result {\n Ok(shadow_obj) => Some(shadow_obj),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to create shadow event object from UCS transform data\"\n );\n None\n }\n }\n });\n\n let shadow_webhook_details: Option<api::IncomingWebhookDetails> = shadow_event_object\n .as_ref()\n .and_then(|shadow_obj| {\n let resource_object_result = serde_json::to_vec(shadow_obj)\n .change_context(errors::ParsingError::EncodeError(\"byte-vec\"))\n .attach_printable(\"Unable to convert shadow webhook payload to a value\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"There was an issue when encoding the shadow incoming webhook body to bytes\",\n );\n\n match resource_object_result {\n Ok(resource_object) => Some(api::IncomingWebhookDetails {\n object_reference_id: object_ref_id.clone(),\n resource_object,\n }),\n Err(error) => {\n logger::warn!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n error = ?error,\n \"Failed to serialize shadow webhook payload to bytes\"\n );\n None\n }\n }\n });\n\n // Assign shadow_webhook_details to shadow_ucs_data"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "79215df3752d09b3d8fda9af2c647a51e86c1d41"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10019/d1f4a64/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d1f4a642a13630cca6ed5637f29debca210ea02a",
|
| 3 |
+
"pr_number": 10019,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::process_shadow_ucs_webhook_transform",
|
| 10 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn process_shadow_ucs_webhook_transform<'a>(\n state: &'a SessionState,\n merchant_context: &'a domain::MerchantContext,\n connector: &'a ConnectorEnum,\n connector_name: &'a str,\n body: &'a actix_web::web::Bytes,\n request_details: &'a IncomingWebhookRequestDetails<'a>,\n merchant_connector_account: Option<&'a domain::MerchantConnectorAccount>,\n) -> errors::RouterResult<WebhookProcessingResult<'a>> {\n // Execute UCS path\n let ucs_result = unified_connector_service::call_unified_connector_service_for_webhook(\n state,\n merchant_context,\n connector_name,\n body,\n request_details,\n merchant_connector_account,\n )\n .await;\n\n // Execute Direct path for comparison\n let direct_result = async {\n // Decode body for direct processing\n let decoded_body = connector\n .decode_webhook_body(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.and_then(|mca| mca.connector_webhook_details.clone()),\n connector_name,\n )\n .await\n .switch()\n .attach_printable(\n \"There was an error in incoming webhook body decoding for shadow processing\",\n )?;\n\n // Reuse existing process_non_ucs_webhook function\n process_non_ucs_webhook(\n state,\n merchant_context,\n connector,\n connector_name,\n decoded_body.into(),\n request_details,\n )\n .await\n }\n .await;\n\n // Handle results and comparison\n match (ucs_result, direct_result) {\n (\n Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)),\n Ok(mut direct_processing_result),\n ) => {\n // Create ShadowUcsData with UCS results\n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,\n ucs_event_type,\n ucs_transform_data: Box::new(ucs_transform_data),\n request_details,\n webhook_details: None,\n };\n\n // Return Direct result as primary with UCS data in shadow_ucs_data\n direct_processing_result.shadow_ucs_data = Some(shadow_ucs_data);\n Ok(direct_processing_result)\n }\n (Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)\n }\n (Err(ucs_error), Ok(direct_processing_result)) => {\n // In shadow mode, if UCS fails, fall back to Direct result\n Ok(direct_processing_result)\n }\n (Err(ucs_error), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)\n }\n }\n}",
|
| 16 |
+
"after_code": "async fn process_shadow_ucs_webhook_transform<'a>(\n state: &'a SessionState,\n merchant_context: &'a domain::MerchantContext,\n connector: &'a ConnectorEnum,\n connector_name: &'a str,\n body: &'a actix_web::web::Bytes,\n request_details: &'a IncomingWebhookRequestDetails<'a>,\n merchant_connector_account: Option<&'a domain::MerchantConnectorAccount>,\n) -> errors::RouterResult<WebhookProcessingResult<'a>> {\n // Execute UCS path\n let ucs_result = unified_connector_service::call_unified_connector_service_for_webhook(\n state,\n merchant_context,\n connector_name,\n body,\n request_details,\n merchant_connector_account,\n )\n .await;\n\n // Execute Direct path for comparison\n let direct_result = async {\n // Decode body for direct processing\n let decoded_body = connector\n .decode_webhook_body(\n request_details,\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account.and_then(|mca| mca.connector_webhook_details.clone()),\n connector_name,\n )\n .await\n .switch()\n .attach_printable(\n \"There was an error in incoming webhook body decoding for shadow processing\",\n )?;\n\n // Reuse existing process_non_ucs_webhook function\n process_non_ucs_webhook(\n state,\n merchant_context,\n connector,\n connector_name,\n decoded_body.into(),\n request_details,\n )\n .await\n }\n .await;\n\n // Handle results and comparison\n match (ucs_result, direct_result) {\n (\n Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)),\n Ok(mut direct_processing_result),\n ) => {\n // Log both calls succeeded\n logger::info!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n \"Shadow UCS: Both UCS and Direct calls succeeded\"\n );\n\n // Create ShadowUcsData with UCS results\n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,\n ucs_event_type,\n ucs_transform_data: Box::new(ucs_transform_data),\n request_details,\n webhook_details: None,\n };\n\n // Return Direct result as primary with UCS data in shadow_ucs_data\n direct_processing_result.shadow_ucs_data = Some(shadow_ucs_data);\n Ok(direct_processing_result)\n }\n (Ok((_, _, _)), Err(direct_error)) => {\n // Log UCS call succeeded, direct call failed\n logger::info!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n direct_error = ?direct_error,\n \"Shadow UCS: UCS call succeeded, Direct call failed\"\n );\n\n // Return direct_result error as required\n Err(direct_error)\n }\n (Err(ucs_error), Ok(direct_processing_result)) => {\n // Log the UCS error and direct result succeeded\n logger::info!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n ucs_error = ?ucs_error,\n \"Shadow UCS: UCS call failed, Direct call succeeded\"\n );\n\n // In shadow mode, if UCS fails, fall back to Direct result\n Ok(direct_processing_result)\n }\n (Err(ucs_error), Err(direct_error)) => {\n // Log both the errors and both call failed\n logger::error!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n ucs_error = ?ucs_error,\n direct_error = ?direct_error,\n \"Shadow UCS: Both UCS and Direct calls failed\"\n );\n\n // Return direct_result error as required\n Err(direct_error)\n }\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " Ok(direct_processing_result)\n }\n (Ok((ucs_event_type, ucs_source_verified, ucs_transform_data)), Err(direct_error)) => {\n // Return direct_result error as required\n Err(direct_error)",
|
| 19 |
+
"after": " Ok(mut direct_processing_result),\n ) => {\n // Log both calls succeeded\n logger::info!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n \"Shadow UCS: Both UCS and Direct calls succeeded\"\n );\n\n // Create ShadowUcsData with UCS results\n let shadow_ucs_data = ShadowUcsData {\n ucs_source_verified,\n ucs_event_type,\n ucs_transform_data: Box::new(ucs_transform_data),\n request_details,\n webhook_details: None,\n };\n\n // Return Direct result as primary with UCS data in shadow_ucs_data\n direct_processing_result.shadow_ucs_data = Some(shadow_ucs_data);\n Ok(direct_processing_result)\n }\n (Ok((_, _, _)), Err(direct_error)) => {\n // Log UCS call succeeded, direct call failed\n logger::info!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n direct_error = ?direct_error,\n \"Shadow UCS: UCS call succeeded, Direct call failed\"\n );\n\n // Return direct_result error as required\n Err(direct_error)\n }\n (Err(ucs_error), Ok(direct_processing_result)) => {\n // Log the UCS error and direct result succeeded\n logger::info!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n ucs_error = ?ucs_error,\n \"Shadow UCS: UCS call failed, Direct call succeeded\"\n );\n\n // In shadow mode, if UCS fails, fall back to Direct result\n Ok(direct_processing_result)\n }\n (Err(ucs_error), Err(direct_error)) => {\n // Log both the errors and both call failed\n logger::error!(\n connector = connector_name,\n merchant_id = ?merchant_context.get_merchant_account().get_id(),\n ucs_error = ?ucs_error,\n direct_error = ?direct_error,\n \"Shadow UCS: Both UCS and Direct calls failed\"\n );\n\n // Return direct_result error as required\n Err(direct_error)"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "d1f4a642a13630cca6ed5637f29debca210ea02a"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10041/eec1a55/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "eec1a55d2a14aa83f25d6b7610003edd7f5deece",
|
| 3 |
+
"pr_number": 10041,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/configs/defaults/payout_required_fields.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/configs/defaults/payout_required_fields.rs::function::get_interac_fields",
|
| 10 |
+
"file": "crates/router/src/configs/defaults/payout_required_fields.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn get_interac_fields() -> HashMap<String, RequiredFieldInfo> {\n HashMap::from([(\n \"payout_method_data.bank_redirect.interac.email\".to_string(),\n RequiredFieldInfo {\n required_field: \"payout_method_data.bank_redirect.interac.email\".to_string(),\n display_name: \"email\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n )])\n}",
|
| 16 |
+
"after_code": "fn get_interac_fields() -> HashMap<String, RequiredFieldInfo> {\n HashMap::from([(\n \"payout_method_data.bank_redirect.email\".to_string(),\n RequiredFieldInfo {\n required_field: \"payout_method_data.bank_redirect.email\".to_string(),\n display_name: \"email\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n )])\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "fn get_interac_fields() -> HashMap<String, RequiredFieldInfo> {\n HashMap::from([(\n \"payout_method_data.bank_redirect.interac.email\".to_string(),\n RequiredFieldInfo {\n required_field: \"payout_method_data.bank_redirect.interac.email\".to_string(),\n display_name: \"email\".to_string(),\n field_type: FieldType::Text,",
|
| 19 |
+
"after": "fn get_interac_fields() -> HashMap<String, RequiredFieldInfo> {\n HashMap::from([(\n \"payout_method_data.bank_redirect.email\".to_string(),\n RequiredFieldInfo {\n required_field: \"payout_method_data.bank_redirect.email\".to_string(),\n display_name: \"email\".to_string(),\n field_type: FieldType::Text,"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "eec1a55d2a14aa83f25d6b7610003edd7f5deece"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/configs/defaults/payout_required_fields.rs::function::get_billing_details",
|
| 25 |
+
"file": "crates/router/src/configs/defaults/payout_required_fields.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "fn get_billing_details(connector: PayoutConnectors) -> HashMap<String, RequiredFieldInfo> {\n match connector {\n PayoutConnectors::Adyen => HashMap::from([\n (\n \"billing.address.line1\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.line1\".to_string(),\n display_name: \"billing_address_line1\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.line2\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.line2\".to_string(),\n display_name: \"billing_address_line2\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.city\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.city\".to_string(),\n display_name: \"billing_address_city\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.zip\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.zip\".to_string(),\n display_name: \"billing_address_zip\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.country\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.country\".to_string(),\n display_name: \"billing_address_country\".to_string(),\n field_type: FieldType::UserAddressCountry {\n options: get_countries_for_connector(connector)\n .iter()\n .map(|country| country.to_string())\n .collect::<Vec<String>>(),\n },\n value: None,\n },\n ),\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.last_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.last_name\".to_string(),\n display_name: \"billing_address_last_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n ]),\n PayoutConnectors::Wise => HashMap::from([\n (\n \"billing.address.line1\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.line1\".to_string(),\n display_name: \"billing_address_line1\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.city\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.city\".to_string(),\n display_name: \"billing_address_city\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.state\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.state\".to_string(),\n display_name: \"billing_address_state\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.zip\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.zip\".to_string(),\n display_name: \"billing_address_zip\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.country\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.country\".to_string(),\n display_name: \"billing_address_country\".to_string(),\n field_type: FieldType::UserAddressCountry {\n options: get_countries_for_connector(connector)\n .iter()\n .map(|country| country.to_string())\n .collect::<Vec<String>>(),\n },\n value: None,\n },\n ),\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n ]),\n PayoutConnectors::Loonio => HashMap::from([\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.last_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.last_name\".to_string(),\n display_name: \"billing_address_last_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n ]),\n PayoutConnectors::Gigadat => HashMap::from([\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.last_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.last_name\".to_string(),\n display_name: \"billing_address_last_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.phone.number\".to_string(),\n RequiredFieldInfo {\n required_field: \"payment_method_data.billing.phone.number\".to_string(),\n display_name: \"phone\".to_string(),\n field_type: FieldType::UserPhoneNumber,\n value: None,\n },\n ),\n (\n \"billing.phone.country_code\".to_string(),\n RequiredFieldInfo {\n required_field: \"payment_method_data.billing.phone.country_code\".to_string(),\n display_name: \"dialing_code\".to_string(),\n field_type: FieldType::UserPhoneNumberCountryCode,\n value: None,\n },\n ),\n ]),\n _ => HashMap::from([]),\n }\n}",
|
| 31 |
+
"after_code": "fn get_billing_details(connector: PayoutConnectors) -> HashMap<String, RequiredFieldInfo> {\n match connector {\n PayoutConnectors::Adyen => HashMap::from([\n (\n \"billing.address.line1\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.line1\".to_string(),\n display_name: \"billing_address_line1\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.line2\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.line2\".to_string(),\n display_name: \"billing_address_line2\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.city\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.city\".to_string(),\n display_name: \"billing_address_city\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.zip\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.zip\".to_string(),\n display_name: \"billing_address_zip\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.country\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.country\".to_string(),\n display_name: \"billing_address_country\".to_string(),\n field_type: FieldType::UserAddressCountry {\n options: get_countries_for_connector(connector)\n .iter()\n .map(|country| country.to_string())\n .collect::<Vec<String>>(),\n },\n value: None,\n },\n ),\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.last_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.last_name\".to_string(),\n display_name: \"billing_address_last_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n ]),\n PayoutConnectors::Wise => HashMap::from([\n (\n \"billing.address.line1\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.line1\".to_string(),\n display_name: \"billing_address_line1\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.city\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.city\".to_string(),\n display_name: \"billing_address_city\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.state\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.state\".to_string(),\n display_name: \"billing_address_state\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.zip\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.zip\".to_string(),\n display_name: \"billing_address_zip\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.country\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.country\".to_string(),\n display_name: \"billing_address_country\".to_string(),\n field_type: FieldType::UserAddressCountry {\n options: get_countries_for_connector(connector)\n .iter()\n .map(|country| country.to_string())\n .collect::<Vec<String>>(),\n },\n value: None,\n },\n ),\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n ]),\n PayoutConnectors::Loonio => HashMap::from([\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.last_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.last_name\".to_string(),\n display_name: \"billing_address_last_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n ]),\n PayoutConnectors::Gigadat => HashMap::from([\n (\n \"billing.address.first_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.first_name\".to_string(),\n display_name: \"billing_address_first_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.address.last_name\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.address.last_name\".to_string(),\n display_name: \"billing_address_last_name\".to_string(),\n field_type: FieldType::Text,\n value: None,\n },\n ),\n (\n \"billing.phone.number\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.phone.number\".to_string(),\n display_name: \"phone\".to_string(),\n field_type: FieldType::UserPhoneNumber,\n value: None,\n },\n ),\n (\n \"billing.phone.country_code\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.phone.country_code\".to_string(),\n display_name: \"dialing_code\".to_string(),\n field_type: FieldType::UserPhoneNumberCountryCode,\n value: None,\n },\n ),\n ]),\n _ => HashMap::from([]),\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " \"billing.phone.number\".to_string(),\n RequiredFieldInfo {\n required_field: \"payment_method_data.billing.phone.number\".to_string(),\n display_name: \"phone\".to_string(),\n field_type: FieldType::UserPhoneNumber,\n value: None,\n },\n ),\n (\n \"billing.phone.country_code\".to_string(),\n RequiredFieldInfo {\n required_field: \"payment_method_data.billing.phone.country_code\".to_string(),\n display_name: \"dialing_code\".to_string(),\n field_type: FieldType::UserPhoneNumberCountryCode,",
|
| 34 |
+
"after": " \"billing.phone.number\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.phone.number\".to_string(),\n display_name: \"phone\".to_string(),\n field_type: FieldType::UserPhoneNumber,\n value: None,\n },\n ),\n (\n \"billing.phone.country_code\".to_string(),\n RequiredFieldInfo {\n required_field: \"billing.phone.country_code\".to_string(),\n display_name: \"dialing_code\".to_string(),\n field_type: FieldType::UserPhoneNumberCountryCode,"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "eec1a55d2a14aa83f25d6b7610003edd7f5deece"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10070/13de2ae/diff.json
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "13de2ae2f58ea1e8f7966b8ce710e84494ff74a7",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "removed",
|
| 13 |
+
"before_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Try to parse as JSON first (new format), fallback to float (legacy format)\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n }\n }\n Err(_) => None,\n }\n}",
|
| 14 |
+
"after_code": null,
|
| 15 |
+
"diff_span": null,
|
| 16 |
+
"commit_sha": "13de2ae2f58ea1e8f7966b8ce710e84494ff74a7"
|
| 17 |
+
}
|
| 18 |
+
]
|
| 19 |
+
}
|
diffs/pr_10070/1be98ac/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1be98acc8e4930d8deff9587b2f6e089e4dc6465",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service_for_webhooks",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n \n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 16 |
+
"after_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n \n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {",
|
| 19 |
+
"after": "\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "1be98acc8e4930d8deff9587b2f6e089e4dc6465"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10070/273f614/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "273f61456f6f2f70f6e749698fb112b8dbc809ab",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service_for_webhooks",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 16 |
+
"after_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n state: &SessionState,\n merchant_context: &MerchantContext,\n connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n let flow_name = \"Webhooks\";\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n let rollout_key = format!(\n \"{}_{}_{}_{}\",\n consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n merchant_id,\n connector_name,\n flow_name\n );\n let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n let previous_gateway = None;\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n \n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Use the same decision logic as payments, with no call_connector_action to consider\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n } else {\n // UCS is enabled, use decide function with no previous gateway for webhooks\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n };\n\n router_env::logger::info!(\n \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n Ok(execution_path)\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );",
|
| 19 |
+
"after": "\n // Get shadow percentage to determine priority\n let (_shadow_key_exists, shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n \n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage.unwrap_or(0.0),\n \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n );"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "273f61456f6f2f70f6e749698fb112b8dbc809ab"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10070/4503eb3/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4503eb35249e20da42fe46cc14632bf1d1eee0a2",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_config_info",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage = match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}",
|
| 16 |
+
"after_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage = match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }",
|
| 19 |
+
"after": " Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "4503eb35249e20da42fe46cc14632bf1d1eee0a2"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 25 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"No rollout but shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key exists but percentage is 0.0 and no rollout - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0 and no rollout, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else {\n // Neither rollout nor shadow enabled - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, rollout_enabled = rollout_result.should_execute, shadow_exists = shadow_key_exists, \"Neither rollout nor shadow enabled, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 31 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"No rollout but shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key exists but percentage is 0.0 and no rollout - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0 and no rollout, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else {\n // Neither rollout nor shadow enabled - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, rollout_enabled = rollout_result.should_execute, shadow_exists = shadow_key_exists, \"Neither rollout nor shadow enabled, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison",
|
| 34 |
+
"after": " // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "4503eb35249e20da42fe46cc14632bf1d1eee0a2"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10070/4b7760a/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4b7760abe64483fde3f98b6dd84af18739494c4f",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10070/562849e/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "562849e08cfc48fbf972ac88b88f3aa4fa892494",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10070/664ca38/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "664ca38ac113bed22a136952d46647c14ef9a542",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10070/7a0acd4/diff.json
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7a0acd4df98a3200d03908b1b10c203eb281bec0",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "added",
|
| 13 |
+
"before_code": null,
|
| 14 |
+
"after_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Try to parse as JSON first (new format), fallback to float (legacy format)\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n }\n }\n Err(_) => None,\n }\n}",
|
| 15 |
+
"diff_span": null,
|
| 16 |
+
"commit_sha": "7a0acd4df98a3200d03908b1b10c203eb281bec0"
|
| 17 |
+
}
|
| 18 |
+
]
|
| 19 |
+
}
|
diffs/pr_10070/7e39881/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7e39881c14a4b70edf5a1dc6f6f1edc59747291a",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"No rollout but shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key exists but percentage is 0.0 and no rollout - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0 and no rollout, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else {\n // Neither rollout nor shadow enabled - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, rollout_enabled = rollout_result.should_execute, shadow_exists = shadow_key_exists, \"Neither rollout nor shadow enabled, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 16 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but disabled (0.0%), falling back to check rollout\" );\n // Shadow disabled, check rollout in next block\n if rollout_result.should_execute {\n ShadowRolloutAvailability::NotAvailable // Use rollout (primary UCS)\n } else {\n ShadowRolloutAvailability::NotAvailable // Use direct\n }\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"No rollout but shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key exists but percentage is 0.0 and no rollout - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0 and no rollout, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else {\n // Neither rollout nor shadow enabled - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, rollout_enabled = rollout_result.should_execute, shadow_exists = shadow_key_exists, \"Neither rollout nor shadow enabled, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n };",
|
| 19 |
+
"after": " let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but disabled (0.0%), falling back to check rollout\" );\n // Shadow disabled, check rollout in next block\n if rollout_result.should_execute {\n ShadowRolloutAvailability::NotAvailable // Use rollout (primary UCS)\n } else {\n ShadowRolloutAvailability::NotAvailable // Use direct\n }\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "7e39881c14a4b70edf5a1dc6f6f1edc59747291a"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10070/9236686/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9236686204f336a136a6e4da1b2088129a7ea97b",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but disabled (0.0%), falling back to check rollout\" );\n // Shadow disabled, check rollout in next block\n if rollout_result.should_execute {\n ShadowRolloutAvailability::NotAvailable // Use rollout (primary UCS)\n } else {\n ShadowRolloutAvailability::NotAvailable // Use direct\n }\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 16 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!(\n shadow_key = %shadow_rollout_key,\n shadow_percentage = shadow_percentage,\n rollout_enabled = rollout_result.should_execute,\n \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n );\n // Shadow disabled, result is the same regardless of rollout status\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but disabled (0.0%), falling back to check rollout\" );\n // Shadow disabled, check rollout in next block\n if rollout_result.should_execute {\n ShadowRolloutAvailability::NotAvailable // Use rollout (primary UCS)\n } else {\n ShadowRolloutAvailability::NotAvailable // Use direct\n }\n }\n } else if rollout_result.should_execute {",
|
| 19 |
+
"after": " ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!(\n shadow_key = %shadow_rollout_key,\n shadow_percentage = shadow_percentage,\n rollout_enabled = rollout_result.should_execute,\n \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n );\n // Shadow disabled, result is the same regardless of rollout status\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "9236686204f336a136a6e4da1b2088129a7ea97b"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10070/9ca7294/diff.json
ADDED
|
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9ca7294955a140d902a15590af0090884780eb73",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 16 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"No rollout but shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key exists but percentage is 0.0 and no rollout - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0 and no rollout, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else {\n // Neither rollout nor shadow enabled - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, rollout_enabled = rollout_result.should_execute, shadow_exists = shadow_key_exists, \"Neither rollout nor shadow enabled, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check both rollout keys to determine priority based on shadow percentage\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n // Get shadow percentage to determine priority\n let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n .await\n .unwrap_or(0.0);\n\n let shadow_rollout_availability =\n if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n // Shadow is present and percentage is non-zero, use shadow\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is present with non-zero percentage, using shadow\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else if rollout_result.should_execute {\n // Either shadow is 0.0 or not present, use rollout if available\n router_env::logger::debug!(\n shadow_percentage = shadow_percentage,\n \"Shadow rollout is 0.0 or not present, using rollout\"\n );\n ShadowRolloutAvailability::IsAvailable\n } else {\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching",
|
| 19 |
+
"after": " let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n let shadow_rollout_availability = if rollout_result.should_execute && shadow_key_exists {\n // Both rollout enabled and shadow key exists, check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key present with non-zero percentage - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key present but percentage is 0.0 - use rollout instead (primary UCS mode)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0, using rollout for primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else if rollout_result.should_execute && !shadow_key_exists {\n // Rollout enabled but no shadow key - primary UCS mode (no comparison)\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Rollout enabled but no shadow key, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else if !rollout_result.should_execute && shadow_key_exists {\n // No rollout but shadow key exists - check shadow percentage\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n // Shadow key with non-zero percentage but no rollout - enable shadow mode for comparison\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"No rollout but shadow key exists with non-zero percentage, enabling shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n // Shadow key exists but percentage is 0.0 and no rollout - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but percentage is 0.0 and no rollout, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n }\n } else {\n // Neither rollout nor shadow enabled - Direct mode only\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, rollout_enabled = rollout_result.should_execute, shadow_exists = shadow_key_exists, \"Neither rollout nor shadow enabled, using Direct mode only\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "9ca7294955a140d902a15590af0090884780eb73"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_config_info",
|
| 25 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "added",
|
| 28 |
+
"before_code": null,
|
| 29 |
+
"after_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage = match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}",
|
| 30 |
+
"diff_span": null,
|
| 31 |
+
"commit_sha": "9ca7294955a140d902a15590af0090884780eb73"
|
| 32 |
+
}
|
| 33 |
+
]
|
| 34 |
+
}
|
diffs/pr_10070/b01da97/diff.json
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "b01da9769c582decc9a75d3054f56673a23937d1",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "removed",
|
| 13 |
+
"before_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Try to parse as JSON first (new format), fallback to float (legacy format)\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n }\n }\n Err(_) => None,\n }\n}",
|
| 14 |
+
"after_code": null,
|
| 15 |
+
"diff_span": null,
|
| 16 |
+
"commit_sha": "b01da9769c582decc9a75d3054f56673a23937d1"
|
| 17 |
+
}
|
| 18 |
+
]
|
| 19 |
+
}
|
diffs/pr_10070/b616b3c/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "b616b3c36f9d7379899895fd952ad46b88c7a73e",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10070/bbc4d49/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "bbc4d491cfd4d440a7475ad8dbea701111e21e4c",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::decide_execution_path",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn decide_execution_path(\n connector_type: ConnectorIntegrationType,\n previous_gateway: Option<GatewaySystem>,\n shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n match (connector_type, previous_gateway, shadow_rollout_enabled) {\n // Case 1: DirectConnector with no previous gateway and no shadow rollout\n // This is a fresh payment request for a direct connector - use direct gateway\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n // Continue using the same direct gateway for consistency\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n // Migration scenario: UCS was used before, but now we're reverting to Direct\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n // Maintain Direct for backward compatibility - don't switch mid-transaction\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n // Use Direct as primary, but also execute UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n // Continue with Direct as primary, execute UCS in shadow mode for testing\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))\n }\n\n // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n // Fresh payment for a UCS-enabled connector - use UCS as primary\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n ))\n }\n\n // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n // Continue using UCS for consistency in the payment flow\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n _,\n ) => Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )),\n }\n}",
|
| 16 |
+
"after_code": "fn decide_execution_path(\n connector_type: ConnectorIntegrationType,\n previous_gateway: Option<GatewaySystem>,\n shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n match (connector_type, previous_gateway, shadow_rollout_enabled) {\n // Case 1: DirectConnector with no previous gateway and no shadow rollout\n // This is a fresh payment request for a direct connector - use direct gateway\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n // Continue using the same direct gateway for consistency\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n // Migration scenario: UCS was used before, but now we're reverting to Direct\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n // Maintain Direct for backward compatibility - don't switch mid-transaction\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::NotAvailable,\n ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n // Use Direct as primary, but also execute UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n None,\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n // Continue with Direct as primary, execute UCS in shadow mode for testing\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n (\n ConnectorIntegrationType::DirectConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::Direct),\n ShadowRolloutAvailability::IsAvailable,\n ) => Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n )),\n\n // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))\n }\n\n // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n // Fresh payment for a UCS-enabled connector - use UCS as primary\n (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n ))\n }\n\n // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n // Continue using UCS for consistency in the payment flow\n (\n ConnectorIntegrationType::UcsConnector,\n Some(GatewaySystem::UnifiedConnectorService),\n _,\n ) => Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )),\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))",
|
| 19 |
+
"after": " (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n Ok((\n GatewaySystem::Direct,\n ExecutionPath::ShadowUnifiedConnectorService,\n ))"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "bbc4d491cfd4d440a7475ad8dbea701111e21e4c"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10070/c2b7da1/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c2b7da1640bd5e9740fa4042c548eefa15667def",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_10070/c4646a3/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c4646a39e2033befd8d50330cba21c53953dbfa2",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_config_info",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage = match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}",
|
| 16 |
+
"after_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }\n Err(_) => (false, None), // Key doesn't exist\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage = match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }",
|
| 19 |
+
"after": " Ok(rollout_config) => {\n // Key exists, try to parse percentage\n let percentage =\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n };\n (true, percentage)\n }"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "c4646a39e2033befd8d50330cba21c53953dbfa2"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
|
| 25 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but disabled (0.0%), falling back to check rollout\" );\n // Shadow disabled, check rollout in next block\n if rollout_result.should_execute {\n ShadowRolloutAvailability::NotAvailable // Use rollout (primary UCS)\n } else {\n ShadowRolloutAvailability::NotAvailable // Use direct\n }\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 31 |
+
"after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n state: &SessionState,\n merchant_context: &MerchantContext,\n router_data: &RouterData<F, T, R>,\n payment_data: Option<&D>,\n call_connector_action: CallConnectorAction,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n D: OperationSessionGetters<F>,\n R: Send + Sync + Clone,\n{\n // Extract context information\n let merchant_id = merchant_context\n .get_merchant_account()\n .get_id()\n .get_string_repr();\n\n let connector_name = &router_data.connector;\n let connector_enum = Connector::from_str(connector_name)\n .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n let flow_name = get_flow_name::<F>()?;\n\n // Check UCS availability using idiomatic helper\n let ucs_availability = check_ucs_availability(state).await;\n\n let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n merchant_id,\n connector_name,\n &flow_name,\n router_data.payment_method,\n );\n\n // Determine connector integration type\n let connector_integration_type =\n determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n // Extract previous gateway from payment data\n let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n ShadowRolloutAvailability::IsAvailable\n } else {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key exists but disabled (0.0%), falling back to check rollout\" );\n // Shadow disabled, check rollout in next block\n if rollout_result.should_execute {\n ShadowRolloutAvailability::NotAvailable // Use rollout (primary UCS)\n } else {\n ShadowRolloutAvailability::NotAvailable // Use direct\n }\n }\n } else if rollout_result.should_execute {\n // Block 2: No shadow key, but rollout is enabled - use primary UCS\n router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n ShadowRolloutAvailability::NotAvailable\n } else {\n // Block 3: Neither shadow nor rollout enabled - use direct\n router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n ShadowRolloutAvailability::NotAvailable\n };\n\n // Single decision point using pattern matching\n let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n }\n CallConnectorAction::Avoid\n | CallConnectorAction::Trigger\n | CallConnectorAction::HandleResponse(_)\n | CallConnectorAction::StatusUpdate { .. } => {\n router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n }\n } else {\n match call_connector_action {\n CallConnectorAction::UCSConsumeResponse(_)\n | CallConnectorAction::UCSHandleResponse(_) => {\n router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n (\n GatewaySystem::UnifiedConnectorService,\n ExecutionPath::UnifiedConnectorService,\n )\n }\n CallConnectorAction::HandleResponse(_) => {\n router_env::logger::info!(\n \"CallConnectorAction HandleResponse received, using Direct gateway\"\n );\n (GatewaySystem::Direct, ExecutionPath::Direct)\n }\n CallConnectorAction::Trigger\n | CallConnectorAction::Avoid\n | CallConnectorAction::StatusUpdate { .. } => {\n // UCS is enabled, call decide function\n decide_execution_path(\n connector_integration_type,\n previous_gateway,\n shadow_rollout_availability,\n )?\n }\n }\n };\n\n router_env::logger::info!(\n \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n gateway_system,\n execution_path,\n merchant_id,\n connector_name,\n flow_name\n );\n\n // Handle proxy configuration for Shadow UCS flows\n let session_state = match execution_path {\n ExecutionPath::ShadowUnifiedConnectorService => {\n // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n match &rollout_result.proxy_override {\n Some(proxy_override) => {\n router_env::logger::debug!(\n proxy_override = ?proxy_override,\n \"Creating updated session state with proxy configuration for Shadow UCS\"\n );\n create_updated_session_state_with_proxy(state.clone(), proxy_override)\n }\n None => {\n router_env::logger::debug!(\n \"No proxy override available for Shadow UCS, using original state\"\n );\n state.clone()\n }\n }\n }\n _ => {\n // For Direct and UCS flows, use original state\n state.clone()\n }\n };\n\n Ok((execution_path, session_state))\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) = get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n \n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );",
|
| 34 |
+
"after": " // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n let (shadow_key_exists, _shadow_percentage) =\n get_rollout_config_info(state, &shadow_rollout_key).await;\n\n // Simplified decision logic: Shadow takes priority, then rollout, then direct\n let shadow_rollout_availability = if shadow_key_exists {\n // Block 1: Shadow key exists - check if it's enabled\n let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n if shadow_percentage != 0.0 {\n router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "c4646a39e2033befd8d50330cba21c53953dbfa2"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10070/e91546c/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10070/fd3ef8b/diff.json
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "fd3ef8b0b6434c5b6840d494526e141893dfbc3d",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "added",
|
| 13 |
+
"before_code": null,
|
| 14 |
+
"after_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Try to parse as JSON first (new format), fallback to float (legacy format)\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n }\n }\n Err(_) => None,\n }\n}",
|
| 15 |
+
"diff_span": null,
|
| 16 |
+
"commit_sha": "fd3ef8b0b6434c5b6840d494526e141893dfbc3d"
|
| 17 |
+
}
|
| 18 |
+
]
|
| 19 |
+
}
|
diffs/pr_10070/fdff489/diff.json
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "fdff489f0ba481db7ea8cf9990b2ff607d0624aa",
|
| 3 |
+
"pr_number": 10070,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/unified_connector_service.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
|
| 10 |
+
"file": "crates/router/src/core/unified_connector_service.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "removed",
|
| 13 |
+
"before_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n let db = state.store.as_ref();\n\n match db.find_config_by_key(config_key).await {\n Ok(rollout_config) => {\n // Try to parse as JSON first (new format), fallback to float (legacy format)\n match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n Ok(config) => Some(config.rollout_percent),\n Err(_) => {\n // Fallback to legacy format (simple float)\n rollout_config.config.parse::<f64>().ok()\n }\n }\n }\n Err(_) => None,\n }\n}",
|
| 14 |
+
"after_code": null,
|
| 15 |
+
"diff_span": null,
|
| 16 |
+
"commit_sha": "fdff489f0ba481db7ea8cf9990b2ff607d0624aa"
|
| 17 |
+
}
|
| 18 |
+
]
|
| 19 |
+
}
|
diffs/pr_10125/734f4de/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "734f4de3161ebaf5c561322867d6dcee0d152b67",
|
| 3 |
+
"pr_number": 10125,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/payments.rs::struct::InteracPaymentMethod",
|
| 10 |
+
"file": "crates/api_models/src/payments.rs",
|
| 11 |
+
"kind": "struct_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub struct InteracPaymentMethod {\n pub customer_info: Option<pii::SecretSerdeValue>,\n}",
|
| 16 |
+
"after_code": "pub struct InteracPaymentMethod {\n #[schema(value_type = Option<Object>)]\n pub customer_info: Option<pii::SecretSerdeValue>,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": "pub struct InteracPaymentMethod {\n #[schema(value_type = Option<Object>)]\n pub customer_info: Option<pii::SecretSerdeValue>,\n}"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "734f4de3161ebaf5c561322867d6dcee0d152b67"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10125/80d1695/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10125/8c33c96/diff.json
ADDED
|
@@ -0,0 +1,148 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02",
|
| 3 |
+
"pr_number": 10125,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/payments.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs",
|
| 7 |
+
"crates/hyperswitch_domain_models/src/router_data.rs",
|
| 8 |
+
"crates/router/src/core/payments/helpers.rs"
|
| 9 |
+
],
|
| 10 |
+
"diffs": [
|
| 11 |
+
{
|
| 12 |
+
"id": "crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs::struct::LoonioTransactionSyncResponse",
|
| 13 |
+
"file": "crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs",
|
| 14 |
+
"kind": "struct_item",
|
| 15 |
+
"status": "modified",
|
| 16 |
+
"code_changed": true,
|
| 17 |
+
"imports_changed": true,
|
| 18 |
+
"before_code": "pub struct LoonioTransactionSyncResponse {\n pub transaction_id: String,\n pub state: LoonioTransactionStatus,\n pub customer_bank_info: Option<serde_json::Value>,\n}",
|
| 19 |
+
"after_code": "pub struct LoonioTransactionSyncResponse {\n pub transaction_id: String,\n pub state: LoonioTransactionStatus,\n pub customer_bank_info: Option<pii::SecretSerdeValue>,\n}",
|
| 20 |
+
"diff_span": {
|
| 21 |
+
"before": " pub transaction_id: String,\n pub state: LoonioTransactionStatus,\n pub customer_bank_info: Option<serde_json::Value>,\n}",
|
| 22 |
+
"after": " pub transaction_id: String,\n pub state: LoonioTransactionStatus,\n pub customer_bank_info: Option<pii::SecretSerdeValue>,\n}"
|
| 23 |
+
},
|
| 24 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02",
|
| 25 |
+
"before_imports": [
|
| 26 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{self, PaymentsAuthorizeRequestData, RouterData as _},\n};",
|
| 27 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{BankRedirectData, PaymentMethodData},\n router_data::{\n AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n InteracCustomerInfo, RouterData,\n },\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
|
| 28 |
+
],
|
| 29 |
+
"after_imports": [
|
| 30 |
+
"use masking::Secret;",
|
| 31 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{self, PaymentsAuthorizeRequestData, RouterData as _},\n};",
|
| 32 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{BankRedirectData, PaymentMethodData},\n router_data::{\n AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n InteracCustomerInfo, RouterData,\n },\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
|
| 33 |
+
]
|
| 34 |
+
},
|
| 35 |
+
{
|
| 36 |
+
"id": "crates/api_models/src/payments.rs::struct::InteracPaymentMethod",
|
| 37 |
+
"file": "crates/api_models/src/payments.rs",
|
| 38 |
+
"kind": "struct_item",
|
| 39 |
+
"status": "modified",
|
| 40 |
+
"code_changed": true,
|
| 41 |
+
"imports_changed": true,
|
| 42 |
+
"before_code": "pub struct InteracPaymentMethod {\n pub customer_info: Option<serde_json::Value>,\n}",
|
| 43 |
+
"after_code": "pub struct InteracPaymentMethod {\n pub customer_info: Option<pii::SecretSerdeValue>,\n}",
|
| 44 |
+
"diff_span": {
|
| 45 |
+
"before": "pub struct InteracPaymentMethod {\n pub customer_info: Option<serde_json::Value>,\n}",
|
| 46 |
+
"after": "pub struct InteracPaymentMethod {\n pub customer_info: Option<pii::SecretSerdeValue>,\n}"
|
| 47 |
+
},
|
| 48 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02",
|
| 49 |
+
"before_imports": [
|
| 50 |
+
"use serde::{\n de::{self, Visitor},\n Deserializer,\n };",
|
| 51 |
+
"use common_types::primitive_wrappers::{\n ExtendedAuthorizationAppliedBool, RequestExtendedAuthorizationBool,\n};",
|
| 52 |
+
"use serde::{de, Deserializer};",
|
| 53 |
+
"use serde::de;",
|
| 54 |
+
"use common_utils::{\n consts::default_payments_list_limit,\n crypto,\n errors::ValidationError,\n ext_traits::{ConfigExt, Encode, ValueExt},\n hashing::HashedString,\n id_type,\n new_type::MaskedBankAccount,\n pii::{self, Email},\n types::{AmountConvertor, MinorUnit, StringMajorUnit},\n};"
|
| 55 |
+
],
|
| 56 |
+
"after_imports": [
|
| 57 |
+
"use serde::{\n de::{self, Visitor},\n Deserializer,\n };",
|
| 58 |
+
"use masking::{PeekInterface, Secret, WithType};",
|
| 59 |
+
"use common_types::primitive_wrappers::{\n ExtendedAuthorizationAppliedBool, RequestExtendedAuthorizationBool,\n};",
|
| 60 |
+
"use serde::{de, Deserializer};",
|
| 61 |
+
"use serde::de;",
|
| 62 |
+
"use common_utils::{\n consts::default_payments_list_limit,\n crypto,\n errors::ValidationError,\n ext_traits::{ConfigExt, Encode, ValueExt},\n hashing::HashedString,\n id_type,\n new_type::MaskedBankAccount,\n pii::{self, Email},\n types::{AmountConvertor, MinorUnit, StringMajorUnit},\n};"
|
| 63 |
+
]
|
| 64 |
+
},
|
| 65 |
+
{
|
| 66 |
+
"id": "crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs::struct::LoonioWebhookBody",
|
| 67 |
+
"file": "crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs",
|
| 68 |
+
"kind": "struct_item",
|
| 69 |
+
"status": "modified",
|
| 70 |
+
"code_changed": true,
|
| 71 |
+
"imports_changed": true,
|
| 72 |
+
"before_code": "pub struct LoonioWebhookBody {\n pub amount: FloatMajorUnit,\n pub api_transaction_id: String,\n pub signature: Option<String>,\n pub event_code: LoonioWebhookEventCode,\n pub id: i32,\n #[serde(rename = \"type\")]\n pub transaction_type: LoonioWebhookTransactionType,\n pub customer_info: Option<serde_json::Value>,\n}",
|
| 73 |
+
"after_code": "pub struct LoonioWebhookBody {\n pub amount: FloatMajorUnit,\n pub api_transaction_id: String,\n pub signature: Option<String>,\n pub event_code: LoonioWebhookEventCode,\n pub id: i32,\n #[serde(rename = \"type\")]\n pub transaction_type: LoonioWebhookTransactionType,\n pub customer_info: Option<pii::SecretSerdeValue>,\n}",
|
| 74 |
+
"diff_span": {
|
| 75 |
+
"before": " #[serde(rename = \"type\")]\n pub transaction_type: LoonioWebhookTransactionType,\n pub customer_info: Option<serde_json::Value>,\n}",
|
| 76 |
+
"after": " #[serde(rename = \"type\")]\n pub transaction_type: LoonioWebhookTransactionType,\n pub customer_info: Option<pii::SecretSerdeValue>,\n}"
|
| 77 |
+
},
|
| 78 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02",
|
| 79 |
+
"before_imports": [
|
| 80 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{self, PaymentsAuthorizeRequestData, RouterData as _},\n};",
|
| 81 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{BankRedirectData, PaymentMethodData},\n router_data::{\n AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n InteracCustomerInfo, RouterData,\n },\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
|
| 82 |
+
],
|
| 83 |
+
"after_imports": [
|
| 84 |
+
"use masking::Secret;",
|
| 85 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{self, PaymentsAuthorizeRequestData, RouterData as _},\n};",
|
| 86 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{BankRedirectData, PaymentMethodData},\n router_data::{\n AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n InteracCustomerInfo, RouterData,\n },\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
|
| 87 |
+
]
|
| 88 |
+
},
|
| 89 |
+
{
|
| 90 |
+
"id": "crates/router/src/core/payments/helpers.rs::function::create_webhook_url",
|
| 91 |
+
"file": "crates/router/src/core/payments/helpers.rs",
|
| 92 |
+
"kind": "function_item",
|
| 93 |
+
"status": "modified",
|
| 94 |
+
"code_changed": true,
|
| 95 |
+
"imports_changed": false,
|
| 96 |
+
"before_code": "pub fn create_webhook_url(\n router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n router_base_url,\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n )\n}",
|
| 97 |
+
"after_code": "pub fn create_webhook_url(\n _router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n \"https://638363b56a8e.ngrok-free.app\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n )\n}",
|
| 98 |
+
"diff_span": {
|
| 99 |
+
"before": "pub fn create_webhook_url(\n router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n router_base_url,\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,",
|
| 100 |
+
"after": "pub fn create_webhook_url(\n _router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n \"https://638363b56a8e.ngrok-free.app\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,"
|
| 101 |
+
},
|
| 102 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02"
|
| 103 |
+
},
|
| 104 |
+
{
|
| 105 |
+
"id": "crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs::struct::LoonioRefundRequest",
|
| 106 |
+
"file": "crates/hyperswitch_connectors/src/connectors/loonio/transformers.rs",
|
| 107 |
+
"kind": "struct_item",
|
| 108 |
+
"status": "modified",
|
| 109 |
+
"code_changed": false,
|
| 110 |
+
"imports_changed": true,
|
| 111 |
+
"before_code": "pub struct LoonioRefundRequest {\n pub amount: FloatMajorUnit,\n}",
|
| 112 |
+
"after_code": "pub struct LoonioRefundRequest {\n pub amount: FloatMajorUnit,\n}",
|
| 113 |
+
"diff_span": {
|
| 114 |
+
"before": "",
|
| 115 |
+
"after": ""
|
| 116 |
+
},
|
| 117 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02",
|
| 118 |
+
"before_imports": [
|
| 119 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{self, PaymentsAuthorizeRequestData, RouterData as _},\n};",
|
| 120 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{BankRedirectData, PaymentMethodData},\n router_data::{\n AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n InteracCustomerInfo, RouterData,\n },\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
|
| 121 |
+
],
|
| 122 |
+
"after_imports": [
|
| 123 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{self, PaymentsAuthorizeRequestData, RouterData as _},\n};",
|
| 124 |
+
"use common_utils::{\n id_type,\n pii::{self, Email},\n request::Method,\n types::FloatMajorUnit,\n};",
|
| 125 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{BankRedirectData, PaymentMethodData},\n router_data::{\n AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n InteracCustomerInfo, RouterData,\n },\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::ResponseId,\n router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n types::{PaymentsAuthorizeRouterData, RefundsRouterData},\n};"
|
| 126 |
+
]
|
| 127 |
+
},
|
| 128 |
+
{
|
| 129 |
+
"id": "crates/hyperswitch_domain_models/src/router_data.rs::struct::InteracCustomerInfo",
|
| 130 |
+
"file": "crates/hyperswitch_domain_models/src/router_data.rs",
|
| 131 |
+
"kind": "struct_item",
|
| 132 |
+
"status": "modified",
|
| 133 |
+
"code_changed": true,
|
| 134 |
+
"imports_changed": true,
|
| 135 |
+
"before_code": "pub struct InteracCustomerInfo {\n pub customer_info: Option<serde_json::Value>,\n}",
|
| 136 |
+
"after_code": "pub struct InteracCustomerInfo {\n pub customer_info: Option<common_utils::pii::SecretSerdeValue>,\n}",
|
| 137 |
+
"diff_span": {
|
| 138 |
+
"before": "pub struct InteracCustomerInfo {\n pub customer_info: Option<serde_json::Value>,\n}",
|
| 139 |
+
"after": "pub struct InteracCustomerInfo {\n pub customer_info: Option<common_utils::pii::SecretSerdeValue>,\n}"
|
| 140 |
+
},
|
| 141 |
+
"commit_sha": "8c33c96a39191176461dace28f8d360035102b02",
|
| 142 |
+
"before_imports": [],
|
| 143 |
+
"after_imports": [
|
| 144 |
+
"use masking::{ExposeInterface, Secret};"
|
| 145 |
+
]
|
| 146 |
+
}
|
| 147 |
+
]
|
| 148 |
+
}
|
diffs/pr_10125/9e12d42/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9e12d42387dd2201c2d42d064fcc213e304c0b23",
|
| 3 |
+
"pr_number": 10125,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/payments/helpers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/payments/helpers.rs::function::create_webhook_url",
|
| 10 |
+
"file": "crates/router/src/core/payments/helpers.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn create_webhook_url(\n _router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n \"https://638363b56a8e.ngrok-free.app\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n )\n}",
|
| 16 |
+
"after_code": "pub fn create_webhook_url(\n router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n router_base_url,\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,\n )\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "pub fn create_webhook_url(\n _router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n \"https://638363b56a8e.ngrok-free.app\",\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,",
|
| 19 |
+
"after": "pub fn create_webhook_url(\n router_base_url: &str,\n merchant_id: &id_type::MerchantId,\n merchant_connector_id_or_connector_name: &str,\n) -> String {\n format!(\n \"{}/webhooks/{}/{}\",\n router_base_url,\n merchant_id.get_string_repr(),\n merchant_connector_id_or_connector_name,"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "9e12d42387dd2201c2d42d064fcc213e304c0b23"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10133/07bb55b/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "07bb55bbdd4cf96dd1f4188afb8a49d06d30e8b1",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/routing.rs::SuccessBasedRoutingConfig::function::validate",
|
| 10 |
+
"file": "crates/api_models/src/routing.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }",
|
| 16 |
+
"after_code": "pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {",
|
| 19 |
+
"after": "pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "07bb55bbdd4cf96dd1f4188afb8a49d06d30e8b1"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/api_models/src/routing.rs::impl::SuccessBasedRoutingConfig",
|
| 25 |
+
"file": "crates/api_models/src/routing.rs",
|
| 26 |
+
"kind": "impl_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }\n}",
|
| 31 |
+
"after_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {",
|
| 34 |
+
"after": " pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "07bb55bbdd4cf96dd1f4188afb8a49d06d30e8b1"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10133/291e6d9/diff.json
ADDED
|
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "291e6d95226dd14386926f6a471f8caa95325d48",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs",
|
| 6 |
+
"crates/router/src/core/routing.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/api_models/src/routing.rs::DynamicRoutingAlgorithmRef::function::is_success_rate_routing_enabled",
|
| 11 |
+
"file": "crates/api_models/src/routing.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub fn is_success_rate_routing_enabled(&self) -> bool {\n self.success_based_algorithm\n .as_ref()\n .map(|success_based_routing| {\n success_based_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection\n || success_based_routing.enabled_feature == DynamicRoutingFeatures::Metrics\n })\n .unwrap_or_default()\n }",
|
| 17 |
+
"after_code": "pub fn is_success_rate_routing_enabled(&self) -> bool {\n self.success_based_algorithm\n .as_ref()\n .map(|success_based_routing| {\n if success_based_routing.algorithm_id_with_timestamp.algorithm_id.is_none() {\n return false;\n }\n success_based_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection\n || success_based_routing.enabled_feature == DynamicRoutingFeatures::Metrics\n })\n .unwrap_or_default()\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "",
|
| 20 |
+
"after": " .as_ref()\n .map(|success_based_routing| {\n if success_based_routing.algorithm_id_with_timestamp.algorithm_id.is_none() {\n return false;\n }\n success_based_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "291e6d95226dd14386926f6a471f8caa95325d48"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/router/src/core/routing.rs::function::link_routing_config",
|
| 26 |
+
"file": "crates/router/src/core/routing.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub async fn link_routing_config(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n authentication_profile_id: Option<common_utils::id_type::ProfileId>,\n algorithm_id: common_utils::id_type::RoutingId,\n transaction_type: enums::TransactionType,\n) -> RouterResponse<routing_types::RoutingDictionaryRecord> {\n metrics::ROUTING_LINK_CONFIG.add(1, &[]);\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n\n let routing_algorithm = db\n .find_routing_algorithm_by_algorithm_id_merchant_id(\n &algorithm_id,\n merchant_context.get_merchant_account().get_id(),\n )\n .await\n .change_context(errors::ApiErrorResponse::ResourceIdNotFound)?;\n\n let business_profile = core_utils::validate_and_get_business_profile(\n db,\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n Some(&routing_algorithm.profile_id),\n merchant_context.get_merchant_account().get_id(),\n )\n .await?\n .get_required_value(\"Profile\")\n .change_context(errors::ApiErrorResponse::ProfileNotFound {\n id: routing_algorithm.profile_id.get_string_repr().to_owned(),\n })?;\n\n core_utils::validate_profile_id_from_auth_layer(authentication_profile_id, &business_profile)?;\n\n match routing_algorithm.kind {\n diesel_models::enums::RoutingAlgorithmKind::Dynamic => {\n let mut dynamic_routing_ref: routing_types::DynamicRoutingAlgorithmRef =\n business_profile\n .dynamic_routing_algorithm\n .clone()\n .map(|val| val.parse_value(\"DynamicRoutingAlgorithmRef\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize Dynamic routing algorithm ref from business profile\",\n )?\n .unwrap_or_default();\n\n utils::when(\n matches!(\n dynamic_routing_ref.success_based_algorithm,\n Some(routing::SuccessBasedAlgorithm {\n algorithm_id_with_timestamp:\n routing_types::DynamicAlgorithmWithTimestamp {\n algorithm_id: Some(ref id),\n timestamp: _\n },\n enabled_feature: _\n }) if id == &algorithm_id\n ) || matches!(\n dynamic_routing_ref.elimination_routing_algorithm,\n Some(routing::EliminationRoutingAlgorithm {\n algorithm_id_with_timestamp:\n routing_types::DynamicAlgorithmWithTimestamp {\n algorithm_id: Some(ref id),\n timestamp: _\n },\n enabled_feature: _\n }) if id == &algorithm_id\n ) || matches!(\n dynamic_routing_ref.contract_based_routing,\n Some(routing::ContractRoutingAlgorithm {\n algorithm_id_with_timestamp:\n routing_types::DynamicAlgorithmWithTimestamp {\n algorithm_id: Some(ref id),\n timestamp: _\n },\n enabled_feature: _\n }) if id == &algorithm_id\n ),\n || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: \"Algorithm is already active\".to_string(),\n })\n },\n )?;\n\n if routing_algorithm.name == helpers::SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM {\n dynamic_routing_ref.update_algorithm_id(\n algorithm_id,\n dynamic_routing_ref\n .success_based_algorithm\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"missing success_based_algorithm in dynamic_algorithm_ref from business_profile table\",\n )?\n .enabled_feature,\n routing_types::DynamicRoutingType::SuccessRateBasedRouting,\n );\n\n // Call to DE here to update SR configs\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n {\n if state.conf.open_router.dynamic_routing_enabled {\n let existing_config = helpers::get_decision_engine_active_dynamic_routing_algorithm(\n &state,\n business_profile.get_id(),\n api_models::open_router::DecisionEngineDynamicAlgorithmType::SuccessRate,\n )\n .await;\n\n if let Ok(Some(_config)) = existing_config {\n update_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_algorithm.algorithm_data.clone(),\n routing_types::DynamicRoutingType::SuccessRateBasedRouting,\n &mut dynamic_routing_ref,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Failed to update the success rate routing config in Decision Engine\",\n )?;\n } else {\n let data: routing_types::SuccessBasedRoutingConfig =\n routing_algorithm.algorithm_data\n .clone()\n .parse_value(\"SuccessBasedRoutingConfig\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize SuccessBasedRoutingConfig from routing algorithm data\",\n )?;\n\n enable_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_types::DynamicRoutingType::SuccessRateBasedRouting,\n &mut dynamic_routing_ref,\n Some(routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(data)),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to setup decision engine dynamic routing\")?;\n }\n }\n }\n } else if routing_algorithm.name == helpers::ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM\n {\n dynamic_routing_ref.update_algorithm_id(\n algorithm_id,\n dynamic_routing_ref\n .elimination_routing_algorithm\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"missing elimination_routing_algorithm in dynamic_algorithm_ref from business_profile table\",\n )?\n .enabled_feature,\n routing_types::DynamicRoutingType::EliminationRouting,\n );\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n {\n if state.conf.open_router.dynamic_routing_enabled {\n let existing_config = helpers::get_decision_engine_active_dynamic_routing_algorithm(\n &state,\n business_profile.get_id(),\n api_models::open_router::DecisionEngineDynamicAlgorithmType::Elimination,\n )\n .await;\n\n if let Ok(Some(_config)) = existing_config {\n update_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_algorithm.algorithm_data.clone(),\n routing_types::DynamicRoutingType::EliminationRouting,\n &mut dynamic_routing_ref,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Failed to update the elimination routing config in Decision Engine\",\n )?;\n } else {\n let data: routing_types::EliminationRoutingConfig =\n routing_algorithm.algorithm_data\n .clone()\n .parse_value(\"EliminationRoutingConfig\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize EliminationRoutingConfig from routing algorithm data\",\n )?;\n\n enable_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_types::DynamicRoutingType::EliminationRouting,\n &mut dynamic_routing_ref,\n Some(\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(\n data,\n ),\n ),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to setup decision engine dynamic routing\")?;\n }\n }\n }\n } else if routing_algorithm.name == helpers::CONTRACT_BASED_DYNAMIC_ROUTING_ALGORITHM {\n dynamic_routing_ref.update_algorithm_id(\n algorithm_id,\n dynamic_routing_ref\n .contract_based_routing\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"missing contract_based_routing in dynamic_algorithm_ref from business_profile table\",\n )?\n .enabled_feature,\n routing_types::DynamicRoutingType::ContractBasedRouting,\n );\n }\n\n helpers::update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n business_profile.clone(),\n dynamic_routing_ref,\n )\n .await?;\n }\n diesel_models::enums::RoutingAlgorithmKind::Single\n | diesel_models::enums::RoutingAlgorithmKind::Priority\n | diesel_models::enums::RoutingAlgorithmKind::Advanced\n | diesel_models::enums::RoutingAlgorithmKind::VolumeSplit\n | diesel_models::enums::RoutingAlgorithmKind::ThreeDsDecisionRule => {\n let mut routing_ref: routing_types::RoutingAlgorithmRef = business_profile\n .routing_algorithm\n .clone()\n .map(|val| val.parse_value(\"RoutingAlgorithmRef\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize routing algorithm ref from business profile\",\n )?\n .unwrap_or_default();\n\n utils::when(routing_algorithm.algorithm_for != transaction_type, || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: format!(\n \"Cannot use {}'s routing algorithm for {} operation\",\n routing_algorithm.algorithm_for, transaction_type\n ),\n })\n })?;\n\n utils::when(\n routing_ref.algorithm_id == Some(algorithm_id.clone()),\n || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: \"Algorithm is already active\".to_string(),\n })\n },\n )?;\n routing_ref.update_algorithm_id(algorithm_id);\n helpers::update_profile_active_algorithm_ref(\n db,\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n business_profile.clone(),\n routing_ref,\n &transaction_type,\n )\n .await?;\n }\n };\n if let Some(euclid_routing_id) = routing_algorithm.decision_engine_routing_id.clone() {\n let routing_algo = ActivateRoutingConfigRequest {\n created_by: business_profile.get_id().get_string_repr().to_string(),\n routing_algorithm_id: euclid_routing_id,\n };\n let link_result = link_de_euclid_routing_algorithm(&state, routing_algo).await;\n match link_result {\n Ok(_) => {\n router_env::logger::info!(\n routing_flow=?\"link_routing_algorithm\",\n is_equal=?true,\n \"decision_engine_euclid\"\n );\n }\n Err(e) => {\n router_env::logger::info!(\n routing_flow=?\"link_routing_algorithm\",\n is_equal=?false,\n error=?e,\n \"decision_engine_euclid\"\n );\n }\n }\n }\n\n // redact cgraph cache on rule activation\n helpers::redact_cgraph_cache(\n &state,\n merchant_context.get_merchant_account().get_id(),\n business_profile.get_id(),\n )\n .await?;\n\n // redact routing cache on rule activation\n helpers::redact_routing_cache(\n &state,\n merchant_context.get_merchant_account().get_id(),\n business_profile.get_id(),\n )\n .await?;\n\n metrics::ROUTING_LINK_CONFIG_SUCCESS_RESPONSE.add(1, &[]);\n Ok(service_api::ApplicationResponse::Json(\n routing_algorithm.foreign_into(),\n ))\n}",
|
| 32 |
+
"after_code": "pub async fn link_routing_config(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n authentication_profile_id: Option<common_utils::id_type::ProfileId>,\n algorithm_id: common_utils::id_type::RoutingId,\n transaction_type: enums::TransactionType,\n) -> RouterResponse<routing_types::RoutingDictionaryRecord> {\n metrics::ROUTING_LINK_CONFIG.add(1, &[]);\n let db = state.store.as_ref();\n let key_manager_state = &(&state).into();\n\n let routing_algorithm = db\n .find_routing_algorithm_by_algorithm_id_merchant_id(\n &algorithm_id,\n merchant_context.get_merchant_account().get_id(),\n )\n .await\n .change_context(errors::ApiErrorResponse::ResourceIdNotFound)?;\n\n let business_profile = core_utils::validate_and_get_business_profile(\n db,\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n Some(&routing_algorithm.profile_id),\n merchant_context.get_merchant_account().get_id(),\n )\n .await?\n .get_required_value(\"Profile\")\n .change_context(errors::ApiErrorResponse::ProfileNotFound {\n id: routing_algorithm.profile_id.get_string_repr().to_owned(),\n })?;\n\n core_utils::validate_profile_id_from_auth_layer(authentication_profile_id, &business_profile)?;\n\n match routing_algorithm.kind {\n diesel_models::enums::RoutingAlgorithmKind::Dynamic => {\n let mut dynamic_routing_ref: routing_types::DynamicRoutingAlgorithmRef =\n business_profile\n .dynamic_routing_algorithm\n .clone()\n .map(|val| val.parse_value(\"DynamicRoutingAlgorithmRef\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize Dynamic routing algorithm ref from business profile\",\n )?\n .unwrap_or_default();\n\n utils::when(\n matches!(\n dynamic_routing_ref.success_based_algorithm,\n Some(routing::SuccessBasedAlgorithm {\n algorithm_id_with_timestamp:\n routing_types::DynamicAlgorithmWithTimestamp {\n algorithm_id: Some(ref id),\n timestamp: _\n },\n enabled_feature: _\n }) if id == &algorithm_id\n ) || matches!(\n dynamic_routing_ref.elimination_routing_algorithm,\n Some(routing::EliminationRoutingAlgorithm {\n algorithm_id_with_timestamp:\n routing_types::DynamicAlgorithmWithTimestamp {\n algorithm_id: Some(ref id),\n timestamp: _\n },\n enabled_feature: _\n }) if id == &algorithm_id\n ) || matches!(\n dynamic_routing_ref.contract_based_routing,\n Some(routing::ContractRoutingAlgorithm {\n algorithm_id_with_timestamp:\n routing_types::DynamicAlgorithmWithTimestamp {\n algorithm_id: Some(ref id),\n timestamp: _\n },\n enabled_feature: _\n }) if id == &algorithm_id\n ),\n || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: \"Algorithm is already active\".to_string(),\n })\n },\n )?;\n\n if routing_algorithm.name == helpers::SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM {\n dynamic_routing_ref.update_algorithm_id(\n algorithm_id,\n dynamic_routing_ref\n .success_based_algorithm\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"missing success_based_algorithm in dynamic_algorithm_ref from business_profile table\",\n )?\n .enabled_feature,\n routing_types::DynamicRoutingType::SuccessRateBasedRouting,\n );\n\n // Call to DE here to update SR configs\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n {\n if state.conf.open_router.dynamic_routing_enabled {\n let existing_config = helpers::get_decision_engine_active_dynamic_routing_algorithm(\n &state,\n business_profile.get_id(),\n api_models::open_router::DecisionEngineDynamicAlgorithmType::SuccessRate,\n )\n .await;\n\n if let Ok(Some(_config)) = existing_config {\n update_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_algorithm.algorithm_data.clone(),\n routing_types::DynamicRoutingType::SuccessRateBasedRouting,\n &mut dynamic_routing_ref,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Failed to update the success rate routing config in Decision Engine\",\n )?;\n } else {\n let data: routing_types::SuccessBasedRoutingConfig =\n routing_algorithm.algorithm_data\n .clone()\n .parse_value(\"SuccessBasedRoutingConfig\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize SuccessBasedRoutingConfig from routing algorithm data\",\n )?;\n\n enable_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_types::DynamicRoutingType::SuccessRateBasedRouting,\n &mut dynamic_routing_ref,\n Some(routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(data)),\n )\n .await\n .map_err(|err| match err.current_context() {\n errors::ApiErrorResponse::GenericNotFoundError {..}=> {\n err.change_context(errors::ApiErrorResponse::ConfigNotFound)\n .attach_printable(\"Decision engine config not found\")\n }\n _ => err\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to setup decision engine dynamic routing\"),\n })?;\n }\n }\n }\n } else if routing_algorithm.name == helpers::ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM\n {\n dynamic_routing_ref.update_algorithm_id(\n algorithm_id,\n dynamic_routing_ref\n .elimination_routing_algorithm\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"missing elimination_routing_algorithm in dynamic_algorithm_ref from business_profile table\",\n )?\n .enabled_feature,\n routing_types::DynamicRoutingType::EliminationRouting,\n );\n #[cfg(all(feature = \"dynamic_routing\", feature = \"v1\"))]\n {\n if state.conf.open_router.dynamic_routing_enabled {\n let existing_config = helpers::get_decision_engine_active_dynamic_routing_algorithm(\n &state,\n business_profile.get_id(),\n api_models::open_router::DecisionEngineDynamicAlgorithmType::Elimination,\n )\n .await;\n\n if let Ok(Some(_config)) = existing_config {\n update_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_algorithm.algorithm_data.clone(),\n routing_types::DynamicRoutingType::EliminationRouting,\n &mut dynamic_routing_ref,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Failed to update the elimination routing config in Decision Engine\",\n )?;\n } else {\n let data: routing_types::EliminationRoutingConfig =\n routing_algorithm.algorithm_data\n .clone()\n .parse_value(\"EliminationRoutingConfig\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize EliminationRoutingConfig from routing algorithm data\",\n )?;\n\n enable_decision_engine_dynamic_routing_setup(\n &state,\n business_profile.get_id(),\n routing_types::DynamicRoutingType::EliminationRouting,\n &mut dynamic_routing_ref,\n Some(\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(\n data,\n ),\n ),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to setup decision engine dynamic routing\")?;\n }\n }\n }\n } else if routing_algorithm.name == helpers::CONTRACT_BASED_DYNAMIC_ROUTING_ALGORITHM {\n dynamic_routing_ref.update_algorithm_id(\n algorithm_id,\n dynamic_routing_ref\n .contract_based_routing\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"missing contract_based_routing in dynamic_algorithm_ref from business_profile table\",\n )?\n .enabled_feature,\n routing_types::DynamicRoutingType::ContractBasedRouting,\n );\n }\n\n helpers::update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n business_profile.clone(),\n dynamic_routing_ref,\n )\n .await?;\n }\n diesel_models::enums::RoutingAlgorithmKind::Single\n | diesel_models::enums::RoutingAlgorithmKind::Priority\n | diesel_models::enums::RoutingAlgorithmKind::Advanced\n | diesel_models::enums::RoutingAlgorithmKind::VolumeSplit\n | diesel_models::enums::RoutingAlgorithmKind::ThreeDsDecisionRule => {\n let mut routing_ref: routing_types::RoutingAlgorithmRef = business_profile\n .routing_algorithm\n .clone()\n .map(|val| val.parse_value(\"RoutingAlgorithmRef\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"unable to deserialize routing algorithm ref from business profile\",\n )?\n .unwrap_or_default();\n\n utils::when(routing_algorithm.algorithm_for != transaction_type, || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: format!(\n \"Cannot use {}'s routing algorithm for {} operation\",\n routing_algorithm.algorithm_for, transaction_type\n ),\n })\n })?;\n\n utils::when(\n routing_ref.algorithm_id == Some(algorithm_id.clone()),\n || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: \"Algorithm is already active\".to_string(),\n })\n },\n )?;\n routing_ref.update_algorithm_id(algorithm_id);\n helpers::update_profile_active_algorithm_ref(\n db,\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n business_profile.clone(),\n routing_ref,\n &transaction_type,\n )\n .await?;\n }\n };\n if let Some(euclid_routing_id) = routing_algorithm.decision_engine_routing_id.clone() {\n let routing_algo = ActivateRoutingConfigRequest {\n created_by: business_profile.get_id().get_string_repr().to_string(),\n routing_algorithm_id: euclid_routing_id,\n };\n let link_result = link_de_euclid_routing_algorithm(&state, routing_algo).await;\n match link_result {\n Ok(_) => {\n router_env::logger::info!(\n routing_flow=?\"link_routing_algorithm\",\n is_equal=?true,\n \"decision_engine_euclid\"\n );\n }\n Err(e) => {\n router_env::logger::info!(\n routing_flow=?\"link_routing_algorithm\",\n is_equal=?false,\n error=?e,\n \"decision_engine_euclid\"\n );\n }\n }\n }\n\n // redact cgraph cache on rule activation\n helpers::redact_cgraph_cache(\n &state,\n merchant_context.get_merchant_account().get_id(),\n business_profile.get_id(),\n )\n .await?;\n\n // redact routing cache on rule activation\n helpers::redact_routing_cache(\n &state,\n merchant_context.get_merchant_account().get_id(),\n business_profile.get_id(),\n )\n .await?;\n\n metrics::ROUTING_LINK_CONFIG_SUCCESS_RESPONSE.add(1, &[]);\n Ok(service_api::ApplicationResponse::Json(\n routing_algorithm.foreign_into(),\n ))\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to setup decision engine dynamic routing\")?;\n }\n }",
|
| 35 |
+
"after": " )\n .await\n .map_err(|err| match err.current_context() {\n errors::ApiErrorResponse::GenericNotFoundError {..}=> {\n err.change_context(errors::ApiErrorResponse::ConfigNotFound)\n .attach_printable(\"Decision engine config not found\")\n }\n _ => err\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to setup decision engine dynamic routing\"),\n })?;\n }\n }"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "291e6d95226dd14386926f6a471f8caa95325d48"
|
| 38 |
+
}
|
| 39 |
+
]
|
| 40 |
+
}
|
diffs/pr_10133/2e6d515/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "2e6d5155941fbab4ca98bd2b27d57d44fc164d11",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/routing.rs::DynamicRoutingAlgorithmRef::function::is_success_rate_routing_enabled",
|
| 10 |
+
"file": "crates/api_models/src/routing.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn is_success_rate_routing_enabled(&self) -> bool {\n self.success_based_algorithm\n .as_ref()\n .map(|success_based_routing| {\n if success_based_routing.algorithm_id_with_timestamp.algorithm_id.is_none() {\n return false;\n }\n success_based_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection\n || success_based_routing.enabled_feature == DynamicRoutingFeatures::Metrics\n })\n .unwrap_or_default()\n }",
|
| 16 |
+
"after_code": "pub fn is_success_rate_routing_enabled(&self) -> bool {\n self.success_based_algorithm\n .as_ref()\n .map(|success_based_routing| {\n if success_based_routing\n .algorithm_id_with_timestamp\n .algorithm_id\n .is_none()\n {\n return false;\n }\n success_based_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection\n || success_based_routing.enabled_feature == DynamicRoutingFeatures::Metrics\n })\n .unwrap_or_default()\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " .as_ref()\n .map(|success_based_routing| {\n if success_based_routing.algorithm_id_with_timestamp.algorithm_id.is_none() {\n return false;\n }",
|
| 19 |
+
"after": " .as_ref()\n .map(|success_based_routing| {\n if success_based_routing\n .algorithm_id_with_timestamp\n .algorithm_id\n .is_none()\n {\n return false;\n }"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "2e6d5155941fbab4ca98bd2b27d57d44fc164d11"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10133/3f33c88/diff.json
ADDED
|
@@ -0,0 +1,75 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "3f33c881716c123819c8513f2b34c8a1ae89aef7",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs",
|
| 6 |
+
"crates/router/src/core/routing/helpers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/router/src/core/routing/helpers.rs::function::create_specific_dynamic_routing_setup",
|
| 11 |
+
"file": "crates/router/src/core/routing/helpers.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub async fn create_specific_dynamic_routing_setup(\n state: &SessionState,\n key_store: domain::MerchantKeyStore,\n business_profile: domain::Profile,\n feature_to_enable: routing_types::DynamicRoutingFeatures,\n mut dynamic_routing_algo_ref: routing_types::DynamicRoutingAlgorithmRef,\n dynamic_routing_type: routing_types::DynamicRoutingType,\n payload: routing_types::DynamicRoutingPayload,\n) -> RouterResult<ApplicationResponse<routing_types::RoutingDictionaryRecord>> {\n let db = state.store.as_ref();\n let key_manager_state = &state.into();\n let profile_id = business_profile.get_id().clone();\n let merchant_id = business_profile.merchant_id.clone();\n let algorithm_id = common_utils::generate_routing_id_of_default_length();\n let timestamp = common_utils::date_time::now();\n\n let algo = match dynamic_routing_type {\n routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => config,\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => config,\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Elimination Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(elimination_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n\n routing_types::DynamicRoutingType::ContractBasedRouting => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Contract routing cannot be set as default\".to_string(),\n })\n .into())\n }\n };\n\n let record = db\n .insert_routing_algorithm(algo)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to insert record in routing algorithm table\")?;\n\n dynamic_routing_algo_ref.update_feature(feature_to_enable, dynamic_routing_type);\n update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n &key_store,\n business_profile,\n dynamic_routing_algo_ref,\n )\n .await?;\n\n let new_record = record.foreign_into();\n\n core_metrics::ROUTING_CREATE_SUCCESS_RESPONSE.add(\n 1,\n router_env::metric_attributes!((\"profile_id\", profile_id.clone())),\n );\n Ok(ApplicationResponse::Json(new_record))\n}",
|
| 17 |
+
"after_code": "pub async fn create_specific_dynamic_routing_setup(\n state: &SessionState,\n key_store: domain::MerchantKeyStore,\n business_profile: domain::Profile,\n feature_to_enable: routing_types::DynamicRoutingFeatures,\n mut dynamic_routing_algo_ref: routing_types::DynamicRoutingAlgorithmRef,\n dynamic_routing_type: routing_types::DynamicRoutingType,\n payload: routing_types::DynamicRoutingPayload,\n) -> RouterResult<ApplicationResponse<routing_types::RoutingDictionaryRecord>> {\n let db = state.store.as_ref();\n let key_manager_state = &state.into();\n let profile_id = business_profile.get_id().clone();\n let merchant_id = business_profile.merchant_id.clone();\n let algorithm_id = common_utils::generate_routing_id_of_default_length();\n let timestamp = common_utils::date_time::now();\n\n let algo = match dynamic_routing_type {\n routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Elimination Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(elimination_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n\n routing_types::DynamicRoutingType::ContractBasedRouting => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Contract routing cannot be set as default\".to_string(),\n })\n .into())\n }\n };\n\n let record = db\n .insert_routing_algorithm(algo)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to insert record in routing algorithm table\")?;\n\n dynamic_routing_algo_ref.update_feature(feature_to_enable, dynamic_routing_type);\n update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n &key_store,\n business_profile,\n dynamic_routing_algo_ref,\n )\n .await?;\n\n let new_record = record.foreign_into();\n\n core_metrics::ROUTING_CREATE_SUCCESS_RESPONSE.add(\n 1,\n router_env::metric_attributes!((\"profile_id\", profile_id.clone())),\n );\n Ok(ApplicationResponse::Json(new_record))\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => config,\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => config,\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {",
|
| 20 |
+
"after": " routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "3f33c881716c123819c8513f2b34c8a1ae89aef7"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/api_models/src/routing.rs::impl::EliminationRoutingConfig",
|
| 26 |
+
"file": "crates/api_models/src/routing.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl EliminationRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.elimination_analyser_config {\n self.elimination_analyser_config\n .as_mut()\n .map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n elimination_analyser_config: None,\n params: None,\n decision_engine_configs: Some(open_router::DecisionEngineEliminationData {\n threshold: DEFAULT_ELIMINATION_THRESHOLD,\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineEliminationData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n}",
|
| 32 |
+
"after_code": "impl EliminationRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.elimination_analyser_config {\n self.elimination_analyser_config\n .as_mut()\n .map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n elimination_analyser_config: None,\n params: None,\n decision_engine_configs: Some(open_router::DecisionEngineEliminationData {\n threshold: DEFAULT_ELIMINATION_THRESHOLD,\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineEliminationData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "",
|
| 35 |
+
"after": " ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "3f33c881716c123819c8513f2b34c8a1ae89aef7"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/api_models/src/routing.rs::impl::SuccessBasedRoutingConfig",
|
| 41 |
+
"file": "crates/api_models/src/routing.rs",
|
| 42 |
+
"kind": "impl_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n}",
|
| 47 |
+
"after_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": "",
|
| 50 |
+
"after": " ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "3f33c881716c123819c8513f2b34c8a1ae89aef7"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/api_models/src/routing.rs::SuccessBasedRoutingConfig::function::validate_fields_not_all_null",
|
| 56 |
+
"file": "crates/api_models/src/routing.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "added",
|
| 59 |
+
"before_code": null,
|
| 60 |
+
"after_code": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }",
|
| 61 |
+
"diff_span": null,
|
| 62 |
+
"commit_sha": "3f33c881716c123819c8513f2b34c8a1ae89aef7"
|
| 63 |
+
},
|
| 64 |
+
{
|
| 65 |
+
"id": "crates/api_models/src/routing.rs::EliminationRoutingConfig::function::validate_fields_not_all_null",
|
| 66 |
+
"file": "crates/api_models/src/routing.rs",
|
| 67 |
+
"kind": "function_item",
|
| 68 |
+
"status": "added",
|
| 69 |
+
"before_code": null,
|
| 70 |
+
"after_code": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }",
|
| 71 |
+
"diff_span": null,
|
| 72 |
+
"commit_sha": "3f33c881716c123819c8513f2b34c8a1ae89aef7"
|
| 73 |
+
}
|
| 74 |
+
]
|
| 75 |
+
}
|
diffs/pr_10133/56af8c9/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "56af8c9a21a084946c458a69de9ae51eb56dffdb",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/routing.rs::DynamicRoutingAlgorithmRef::function::is_elimination_enabled",
|
| 10 |
+
"file": "crates/api_models/src/routing.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn is_elimination_enabled(&self) -> bool {\n self.elimination_routing_algorithm\n .as_ref()\n .map(|elimination_routing| {\n elimination_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection\n || elimination_routing.enabled_feature == DynamicRoutingFeatures::Metrics\n })\n .unwrap_or_default()\n }",
|
| 16 |
+
"after_code": "pub fn is_elimination_enabled(&self) -> bool {\n self.elimination_routing_algorithm\n .as_ref()\n .map(|elimination_routing| {\n if elimination_routing\n .algorithm_id_with_timestamp\n .algorithm_id\n .is_none()\n {\n return false;\n }\n elimination_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection\n || elimination_routing.enabled_feature == DynamicRoutingFeatures::Metrics\n })\n .unwrap_or_default()\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": " .as_ref()\n .map(|elimination_routing| {\n if elimination_routing\n .algorithm_id_with_timestamp\n .algorithm_id\n .is_none()\n {\n return false;\n }\n elimination_routing.enabled_feature\n == DynamicRoutingFeatures::DynamicConnectorSelection"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "56af8c9a21a084946c458a69de9ae51eb56dffdb"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10133/66cfd7d/diff.json
ADDED
|
@@ -0,0 +1,95 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs",
|
| 6 |
+
"crates/router/src/core/routing/helpers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/router/src/core/routing/helpers.rs::function::create_specific_dynamic_routing_setup",
|
| 11 |
+
"file": "crates/router/src/core/routing/helpers.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub async fn create_specific_dynamic_routing_setup(\n state: &SessionState,\n key_store: domain::MerchantKeyStore,\n business_profile: domain::Profile,\n feature_to_enable: routing_types::DynamicRoutingFeatures,\n mut dynamic_routing_algo_ref: routing_types::DynamicRoutingAlgorithmRef,\n dynamic_routing_type: routing_types::DynamicRoutingType,\n payload: routing_types::DynamicRoutingPayload,\n) -> RouterResult<ApplicationResponse<routing_types::RoutingDictionaryRecord>> {\n let db = state.store.as_ref();\n let key_manager_state = &state.into();\n let profile_id = business_profile.get_id().clone();\n let merchant_id = business_profile.merchant_id.clone();\n let algorithm_id = common_utils::generate_routing_id_of_default_length();\n let timestamp = common_utils::date_time::now();\n\n let algo = match dynamic_routing_type {\n routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Elimination Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(elimination_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n\n routing_types::DynamicRoutingType::ContractBasedRouting => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Contract routing cannot be set as default\".to_string(),\n })\n .into())\n }\n };\n\n let record = db\n .insert_routing_algorithm(algo)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to insert record in routing algorithm table\")?;\n\n dynamic_routing_algo_ref.update_feature(feature_to_enable, dynamic_routing_type);\n update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n &key_store,\n business_profile,\n dynamic_routing_algo_ref,\n )\n .await?;\n\n let new_record = record.foreign_into();\n\n core_metrics::ROUTING_CREATE_SUCCESS_RESPONSE.add(\n 1,\n router_env::metric_attributes!((\"profile_id\", profile_id.clone())),\n );\n Ok(ApplicationResponse::Json(new_record))\n}",
|
| 17 |
+
"after_code": "pub async fn create_specific_dynamic_routing_setup(\n state: &SessionState,\n key_store: domain::MerchantKeyStore,\n business_profile: domain::Profile,\n feature_to_enable: routing_types::DynamicRoutingFeatures,\n mut dynamic_routing_algo_ref: routing_types::DynamicRoutingAlgorithmRef,\n dynamic_routing_type: routing_types::DynamicRoutingType,\n payload: routing_types::DynamicRoutingPayload,\n) -> RouterResult<ApplicationResponse<routing_types::RoutingDictionaryRecord>> {\n let db = state.store.as_ref();\n let key_manager_state = &state.into();\n let profile_id = business_profile.get_id().clone();\n let merchant_id = business_profile.merchant_id.clone();\n let algorithm_id = common_utils::generate_routing_id_of_default_length();\n let timestamp = common_utils::date_time::now();\n\n let algo = match dynamic_routing_type {\n routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config.validate().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config.validate().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Elimination Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(elimination_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n\n routing_types::DynamicRoutingType::ContractBasedRouting => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Contract routing cannot be set as default\".to_string(),\n })\n .into())\n }\n };\n\n let record = db\n .insert_routing_algorithm(algo)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to insert record in routing algorithm table\")?;\n\n dynamic_routing_algo_ref.update_feature(feature_to_enable, dynamic_routing_type);\n update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n &key_store,\n business_profile,\n dynamic_routing_algo_ref,\n )\n .await?;\n\n let new_record = record.foreign_into();\n\n core_metrics::ROUTING_CREATE_SUCCESS_RESPONSE.add(\n 1,\n router_env::metric_attributes!((\"profile_id\", profile_id.clone())),\n );\n Ok(ApplicationResponse::Json(new_record))\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"",
|
| 20 |
+
"after": " let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config.validate().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config.validate().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\""
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/api_models/src/routing.rs::impl::EliminationRoutingConfig",
|
| 26 |
+
"file": "crates/api_models/src/routing.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl EliminationRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.elimination_analyser_config {\n self.elimination_analyser_config\n .as_mut()\n .map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n elimination_analyser_config: None,\n params: None,\n decision_engine_configs: Some(open_router::DecisionEngineEliminationData {\n threshold: DEFAULT_ELIMINATION_THRESHOLD,\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineEliminationData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 32 |
+
"after_code": "impl EliminationRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.elimination_analyser_config {\n self.elimination_analyser_config\n .as_mut()\n .map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n elimination_analyser_config: None,\n params: None,\n decision_engine_configs: Some(open_router::DecisionEngineEliminationData {\n threshold: DEFAULT_ELIMINATION_THRESHOLD,\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineEliminationData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n }\n .into())\n },\n )\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 35 |
+
"after": " }\n\n pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n }\n .into())\n },\n )\n }\n}"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/api_models/src/routing.rs::impl::SuccessBasedRoutingConfig",
|
| 41 |
+
"file": "crates/api_models/src/routing.rs",
|
| 42 |
+
"kind": "impl_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 47 |
+
"after_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 50 |
+
"after": " }\n\n pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }\n}"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/api_models/src/routing.rs::SuccessBasedRoutingConfig::function::validate",
|
| 56 |
+
"file": "crates/api_models/src/routing.rs",
|
| 57 |
+
"kind": "function_item",
|
| 58 |
+
"status": "added",
|
| 59 |
+
"before_code": null,
|
| 60 |
+
"after_code": "pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n }\n .into())\n },\n )\n }",
|
| 61 |
+
"diff_span": null,
|
| 62 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 63 |
+
},
|
| 64 |
+
{
|
| 65 |
+
"id": "crates/api_models/src/routing.rs::EliminationRoutingConfig::function::validate",
|
| 66 |
+
"file": "crates/api_models/src/routing.rs",
|
| 67 |
+
"kind": "function_item",
|
| 68 |
+
"status": "added",
|
| 69 |
+
"before_code": null,
|
| 70 |
+
"after_code": "pub fn validate(&self) -> Result<(), error_stack::Report<ValidationError>> {\n fp_utils::when(\n self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none(),\n || {\n Err(ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n }\n .into())\n },\n )\n }",
|
| 71 |
+
"diff_span": null,
|
| 72 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 73 |
+
},
|
| 74 |
+
{
|
| 75 |
+
"id": "crates/api_models/src/routing.rs::SuccessBasedRoutingConfig::function::validate_fields_not_all_null",
|
| 76 |
+
"file": "crates/api_models/src/routing.rs",
|
| 77 |
+
"kind": "function_item",
|
| 78 |
+
"status": "removed",
|
| 79 |
+
"before_code": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }",
|
| 80 |
+
"after_code": null,
|
| 81 |
+
"diff_span": null,
|
| 82 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 83 |
+
},
|
| 84 |
+
{
|
| 85 |
+
"id": "crates/api_models/src/routing.rs::EliminationRoutingConfig::function::validate_fields_not_all_null",
|
| 86 |
+
"file": "crates/api_models/src/routing.rs",
|
| 87 |
+
"kind": "function_item",
|
| 88 |
+
"status": "removed",
|
| 89 |
+
"before_code": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.elimination_analyser_config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in EliminationRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }",
|
| 90 |
+
"after_code": null,
|
| 91 |
+
"diff_span": null,
|
| 92 |
+
"commit_sha": "66cfd7d79a6e42f7f7045b75a4626affef4ae033"
|
| 93 |
+
}
|
| 94 |
+
]
|
| 95 |
+
}
|
diffs/pr_10133/7bec6af/diff.json
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7bec6afa392fdcd7507d3b3be997a89010ed7902",
|
| 3 |
+
"pr_number": 10133,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/routing.rs",
|
| 6 |
+
"crates/router/src/core/routing/helpers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/api_models/src/routing.rs::SuccessBasedRoutingConfig::function::validate_fields_not_all_null",
|
| 11 |
+
"file": "crates/api_models/src/routing.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }",
|
| 17 |
+
"after_code": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))",
|
| 20 |
+
"after": "pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "7bec6afa392fdcd7507d3b3be997a89010ed7902"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/router/src/core/routing/helpers.rs::function::create_specific_dynamic_routing_setup",
|
| 26 |
+
"file": "crates/router/src/core/routing/helpers.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "pub async fn create_specific_dynamic_routing_setup(\n state: &SessionState,\n key_store: domain::MerchantKeyStore,\n business_profile: domain::Profile,\n feature_to_enable: routing_types::DynamicRoutingFeatures,\n mut dynamic_routing_algo_ref: routing_types::DynamicRoutingAlgorithmRef,\n dynamic_routing_type: routing_types::DynamicRoutingType,\n payload: routing_types::DynamicRoutingPayload,\n) -> RouterResult<ApplicationResponse<routing_types::RoutingDictionaryRecord>> {\n let db = state.store.as_ref();\n let key_manager_state = &state.into();\n let profile_id = business_profile.get_id().clone();\n let merchant_id = business_profile.merchant_id.clone();\n let algorithm_id = common_utils::generate_routing_id_of_default_length();\n let timestamp = common_utils::date_time::now();\n\n let algo = match dynamic_routing_type {\n routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Elimination Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(elimination_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n\n routing_types::DynamicRoutingType::ContractBasedRouting => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Contract routing cannot be set as default\".to_string(),\n })\n .into())\n }\n };\n\n let record = db\n .insert_routing_algorithm(algo)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to insert record in routing algorithm table\")?;\n\n dynamic_routing_algo_ref.update_feature(feature_to_enable, dynamic_routing_type);\n update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n &key_store,\n business_profile,\n dynamic_routing_algo_ref,\n )\n .await?;\n\n let new_record = record.foreign_into();\n\n core_metrics::ROUTING_CREATE_SUCCESS_RESPONSE.add(\n 1,\n router_env::metric_attributes!((\"profile_id\", profile_id.clone())),\n );\n Ok(ApplicationResponse::Json(new_record))\n}",
|
| 32 |
+
"after_code": "pub async fn create_specific_dynamic_routing_setup(\n state: &SessionState,\n key_store: domain::MerchantKeyStore,\n business_profile: domain::Profile,\n feature_to_enable: routing_types::DynamicRoutingFeatures,\n mut dynamic_routing_algo_ref: routing_types::DynamicRoutingAlgorithmRef,\n dynamic_routing_type: routing_types::DynamicRoutingType,\n payload: routing_types::DynamicRoutingPayload,\n) -> RouterResult<ApplicationResponse<routing_types::RoutingDictionaryRecord>> {\n let db = state.store.as_ref();\n let key_manager_state = &state.into();\n let profile_id = business_profile.get_id().clone();\n let merchant_id = business_profile.merchant_id.clone();\n let algorithm_id = common_utils::generate_routing_id_of_default_length();\n let timestamp = common_utils::date_time::now();\n\n let algo = match dynamic_routing_type {\n routing_types::DynamicRoutingType::SuccessRateBasedRouting => {\n let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Elimination Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: ELIMINATION_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(elimination_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n\n routing_types::DynamicRoutingType::ContractBasedRouting => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Contract routing cannot be set as default\".to_string(),\n })\n .into())\n }\n };\n\n let record = db\n .insert_routing_algorithm(algo)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to insert record in routing algorithm table\")?;\n\n dynamic_routing_algo_ref.update_feature(feature_to_enable, dynamic_routing_type);\n update_business_profile_active_dynamic_algorithm_ref(\n db,\n key_manager_state,\n &key_store,\n business_profile,\n dynamic_routing_algo_ref,\n )\n .await?;\n\n let new_record = record.foreign_into();\n\n core_metrics::ROUTING_CREATE_SUCCESS_RESPONSE.add(\n 1,\n router_env::metric_attributes!((\"profile_id\", profile_id.clone())),\n );\n Ok(ApplicationResponse::Json(new_record))\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config\n .validate_fields_not_all_null()\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n })?;\n config\n }",
|
| 35 |
+
"after": " let success_config = match &payload {\n routing_types::DynamicRoutingPayload::SuccessBasedRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }\n _ => {\n return Err((errors::ApiErrorResponse::InvalidRequestData {\n message: \"Invalid payload type for Success Rate Based Routing\".to_string(),\n })\n .into())\n }\n };\n\n routing_algorithm::RoutingAlgorithm {\n algorithm_id: algorithm_id.clone(),\n profile_id: profile_id.clone(),\n merchant_id,\n name: SUCCESS_BASED_DYNAMIC_ROUTING_ALGORITHM.to_string(),\n description: None,\n kind: diesel_models::enums::RoutingAlgorithmKind::Dynamic,\n algorithm_data: serde_json::json!(success_config),\n created_at: timestamp,\n modified_at: timestamp,\n algorithm_for: common_enums::TransactionType::Payment,\n decision_engine_routing_id: None,\n }\n }\n routing_types::DynamicRoutingType::EliminationRouting => {\n let elimination_config = match &payload {\n routing_types::DynamicRoutingPayload::EliminationRoutingPayload(config) => {\n config.validate_fields_not_all_null().change_context(\n errors::ApiErrorResponse::InvalidRequestData {\n message: \"All fields in EliminationRoutingConfig cannot be null\"\n .to_string(),\n },\n )?;\n config\n }"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "7bec6afa392fdcd7507d3b3be997a89010ed7902"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/api_models/src/routing.rs::impl::SuccessBasedRoutingConfig",
|
| 41 |
+
"file": "crates/api_models/src/routing.rs",
|
| 42 |
+
"kind": "impl_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 47 |
+
"after_code": "impl SuccessBasedRoutingConfig {\n pub fn update(&mut self, new: Self) {\n if let Some(params) = new.params {\n self.params = Some(params)\n }\n if let Some(new_config) = new.config {\n self.config.as_mut().map(|config| config.update(new_config));\n }\n if let Some(new_config) = new.decision_engine_configs {\n self.decision_engine_configs\n .as_mut()\n .map(|config| config.update(new_config));\n }\n }\n\n pub fn open_router_config_default() -> Self {\n Self {\n params: None,\n config: None,\n decision_engine_configs: Some(open_router::DecisionEngineSuccessRateData {\n default_latency_threshold: Some(DEFAULT_LATENCY_THRESHOLD),\n default_bucket_size: Some(DEFAULT_BUCKET_SIZE),\n default_hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n default_lower_reset_factor: None,\n default_upper_reset_factor: None,\n default_gateway_extra_score: None,\n sub_level_input_config: Some(vec![\n open_router::DecisionEngineSRSubLevelInputConfig {\n payment_method_type: Some(DEFAULT_PAYMENT_METHOD.to_string()),\n payment_method: None,\n latency_threshold: None,\n bucket_size: Some(DEFAULT_BUCKET_SIZE),\n hedging_percent: Some(DEFAULT_HEDGING_PERCENT),\n lower_reset_factor: None,\n upper_reset_factor: None,\n gateway_extra_score: None,\n },\n ]),\n }),\n }\n }\n\n pub fn get_decision_engine_configs(\n &self,\n ) -> Result<open_router::DecisionEngineSuccessRateData, error_stack::Report<ValidationError>>\n {\n self.decision_engine_configs\n .clone()\n .ok_or(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"decision_engine_configs\".to_string(),\n },\n ))\n }\n\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))\n } else {\n Ok(())\n }\n }\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": "\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none()\n && self.config.is_none()\n && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\".to_string(),\n },\n ))",
|
| 50 |
+
"after": "\n pub fn validate_fields_not_all_null(&self) -> Result<(), error_stack::Report<ValidationError>> {\n if self.params.is_none() && self.config.is_none() && self.decision_engine_configs.is_none()\n {\n Err(error_stack::Report::new(\n ValidationError::MissingRequiredField {\n field_name: \"All fields in SuccessBasedRoutingConfig cannot be null\"\n .to_string(),\n },\n ))"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "7bec6afa392fdcd7507d3b3be997a89010ed7902"
|
| 53 |
+
}
|
| 54 |
+
]
|
| 55 |
+
}
|
diffs/pr_10236/2eac084/diff.json
ADDED
|
@@ -0,0 +1,69 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "2eac0844cfd29b2f538c6273b7d3912dee33ae5f",
|
| 3 |
+
"pr_number": 10236,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs::function::get_googlepay_info",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn get_googlepay_info<F, Req>(\n item: &RouterData<F, Req, PaymentsResponseData>,\n gpay_data: &GooglePayWalletData,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>>\nwhere\n Req: NuveiAuthorizePreprocessingCommon,\n{\n let is_rebilling = if item.request.is_customer_initiated_mandate_payment() {\n Some(IsRebilling::False)\n } else {\n None\n };\n\n if let Ok(PaymentMethodToken::GooglePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_google_pay_decrypt_data(\n token,\n is_rebilling,\n Some(gpay_data.info.card_network.clone()),\n );\n }\n\n match &gpay_data.tokenization_data {\n GpayTokenizationData::Decrypted(gpay_predecrypt_data) => get_google_pay_decrypt_data(\n gpay_predecrypt_data,\n is_rebilling,\n Some(gpay_data.info.card_network.clone()),\n ),\n GpayTokenizationData::Encrypted(ref encrypted_data) => Ok(NuveiPaymentsRequest {\n is_rebilling,\n payment_option: PaymentOption {\n card: Some(Card {\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::GooglePay,\n\n mobile_token: {\n let (token_type, token) = (\n encrypted_data.token_type.clone(),\n encrypted_data.token.clone(),\n );\n\n let google_pay: GooglePayCamelCase = GooglePayCamelCase {\n pm_type: Secret::new(gpay_data.pm_type.clone()),\n description: Secret::new(gpay_data.description.clone()),\n info: GooglePayInfoCamelCase {\n card_network: Secret::new(gpay_data.info.card_network.clone()),\n card_details: Secret::new(gpay_data.info.card_details.clone()),\n assurance_details: gpay_data\n .info\n .assurance_details\n .as_ref()\n .map(|details| GooglePayAssuranceDetailsCamelCase {\n card_holder_authenticated: details\n .card_holder_authenticated,\n account_verified: details.account_verified,\n }),\n card_funding_source: gpay_data.info.card_funding_source.clone(),\n },\n tokenization_data: GooglePayTokenizationDataCamelCase {\n token_type: token_type.into(),\n token: token.into(),\n },\n };\n Some(Secret::new(\n google_pay.encode_to_string_of_json().change_context(\n errors::ConnectorError::RequestEncodingFailed,\n )?,\n ))\n },\n cryptogram: None,\n eci_provider: None,\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n }),\n }\n}",
|
| 16 |
+
"after_code": "fn get_googlepay_info<F, Req>(\n item: &RouterData<F, Req, PaymentsResponseData>,\n gpay_data: &GooglePayWalletData,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>>\nwhere\n Req: NuveiAuthorizePreprocessingCommon,\n{\n let is_rebilling = if item.request.is_customer_initiated_mandate_payment() {\n Some(IsRebilling::False)\n } else {\n None\n };\n let user_token_id = if item.request.is_customer_initiated_mandate_payment() {\n item.request.get_customer_id_optional()\n } else {\n None\n };\n if let Ok(PaymentMethodToken::GooglePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_google_pay_decrypt_data(\n token,\n is_rebilling,\n Some(gpay_data.info.card_network.clone()),\n user_token_id,\n );\n }\n\n match &gpay_data.tokenization_data {\n GpayTokenizationData::Decrypted(gpay_predecrypt_data) => get_google_pay_decrypt_data(\n gpay_predecrypt_data,\n is_rebilling,\n Some(gpay_data.info.card_network.clone()),\n user_token_id,\n ),\n GpayTokenizationData::Encrypted(ref encrypted_data) => Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::GooglePay,\n\n mobile_token: {\n let (token_type, token) = (\n encrypted_data.token_type.clone(),\n encrypted_data.token.clone(),\n );\n\n let google_pay: GooglePayCamelCase = GooglePayCamelCase {\n pm_type: Secret::new(gpay_data.pm_type.clone()),\n description: Secret::new(gpay_data.description.clone()),\n info: GooglePayInfoCamelCase {\n card_network: Secret::new(gpay_data.info.card_network.clone()),\n card_details: Secret::new(gpay_data.info.card_details.clone()),\n assurance_details: gpay_data\n .info\n .assurance_details\n .as_ref()\n .map(|details| GooglePayAssuranceDetailsCamelCase {\n card_holder_authenticated: details\n .card_holder_authenticated,\n account_verified: details.account_verified,\n }),\n card_funding_source: gpay_data.info.card_funding_source.clone(),\n },\n tokenization_data: GooglePayTokenizationDataCamelCase {\n token_type: token_type.into(),\n token: token.into(),\n },\n };\n Some(Secret::new(\n google_pay.encode_to_string_of_json().change_context(\n errors::ConnectorError::RequestEncodingFailed,\n )?,\n ))\n },\n cryptogram: None,\n eci_provider: None,\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n }),\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " None\n };\n\n if let Ok(PaymentMethodToken::GooglePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_google_pay_decrypt_data(",
|
| 19 |
+
"after": " None\n };\n let user_token_id = if item.request.is_customer_initiated_mandate_payment() {\n item.request.get_customer_id_optional()\n } else {\n None\n };\n if let Ok(PaymentMethodToken::GooglePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_google_pay_decrypt_data(\n token,\n is_rebilling,\n Some(gpay_data.info.card_network.clone()),\n user_token_id,\n );\n }\n\n match &gpay_data.tokenization_data {\n GpayTokenizationData::Decrypted(gpay_predecrypt_data) => get_google_pay_decrypt_data(\n gpay_predecrypt_data,\n is_rebilling,\n Some(gpay_data.info.card_network.clone()),\n user_token_id,\n ),\n GpayTokenizationData::Encrypted(ref encrypted_data) => Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "2eac0844cfd29b2f538c6273b7d3912dee33ae5f"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs::function::get_google_pay_decrypt_data",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "fn get_google_pay_decrypt_data(\n predecrypt_data: &GPayPredecryptData,\n is_rebilling: Option<IsRebilling>,\n brand: Option<String>,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>> {\n Ok(NuveiPaymentsRequest {\n is_rebilling,\n payment_option: PaymentOption {\n card: Some(Card {\n brand,\n card_number: Some(predecrypt_data.application_primary_account_number.clone()),\n last4_digits: Some(Secret::new(\n predecrypt_data\n .application_primary_account_number\n .clone()\n .get_last4(),\n )),\n expiration_month: Some(predecrypt_data.card_exp_month.clone()),\n expiration_year: Some(predecrypt_data.card_exp_year.clone()),\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::GooglePay,\n mobile_token: None,\n cryptogram: predecrypt_data.cryptogram.clone(),\n eci_provider: predecrypt_data.eci_indicator.clone(),\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n })\n}",
|
| 31 |
+
"after_code": "fn get_google_pay_decrypt_data(\n predecrypt_data: &GPayPredecryptData,\n is_rebilling: Option<IsRebilling>,\n brand: Option<String>,\n user_token_id: Option<CustomerId>,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>> {\n Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {\n brand,\n card_number: Some(predecrypt_data.application_primary_account_number.clone()),\n last4_digits: Some(Secret::new(\n predecrypt_data\n .application_primary_account_number\n .clone()\n .get_last4(),\n )),\n expiration_month: Some(predecrypt_data.card_exp_month.clone()),\n expiration_year: Some(predecrypt_data.card_exp_year.clone()),\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::GooglePay,\n mobile_token: None,\n cryptogram: predecrypt_data.cryptogram.clone(),\n eci_provider: predecrypt_data.eci_indicator.clone(),\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n })\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "",
|
| 34 |
+
"after": " is_rebilling: Option<IsRebilling>,\n brand: Option<String>,\n user_token_id: Option<CustomerId>,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>> {\n Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "2eac0844cfd29b2f538c6273b7d3912dee33ae5f"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs::function::get_applepay_info",
|
| 40 |
+
"file": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs",
|
| 41 |
+
"kind": "function_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "fn get_applepay_info<F, Req>(\n item: &RouterData<F, Req, PaymentsResponseData>,\n apple_pay_data: &ApplePayWalletData,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>>\nwhere\n Req: NuveiAuthorizePreprocessingCommon,\n{\n let is_rebilling = if item.request.is_customer_initiated_mandate_payment() {\n Some(IsRebilling::False)\n } else {\n None\n };\n if let Ok(PaymentMethodToken::ApplePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_apple_pay_decrypt_data(\n token,\n is_rebilling,\n apple_pay_data.payment_method.network.clone(),\n );\n }\n match apple_pay_data.payment_data {\n ApplePayPaymentData::Decrypted(ref apple_pay_predecrypt_data) => {\n get_apple_pay_decrypt_data(\n apple_pay_predecrypt_data,\n is_rebilling,\n apple_pay_data.payment_method.network.clone(),\n )\n }\n\n ApplePayPaymentData::Encrypted(ref encrypted_data) => Ok(NuveiPaymentsRequest {\n is_rebilling,\n payment_option: PaymentOption {\n card: Some(Card {\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::ApplePay,\n mobile_token: {\n let apple_pay: ApplePayCamelCase = ApplePayCamelCase {\n payment_data: encrypted_data.to_string().into(),\n payment_method: ApplePayPaymentMethodCamelCase {\n display_name: Secret::new(\n apple_pay_data.payment_method.display_name.clone(),\n ),\n network: Secret::new(\n apple_pay_data.payment_method.network.clone(),\n ),\n pm_type: Secret::new(\n apple_pay_data.payment_method.pm_type.clone(),\n ),\n },\n transaction_identifier: Secret::new(\n apple_pay_data.transaction_identifier.clone(),\n ),\n };\n\n Some(Secret::new(\n apple_pay.encode_to_string_of_json().change_context(\n errors::ConnectorError::RequestEncodingFailed,\n )?,\n ))\n },\n cryptogram: None,\n eci_provider: None,\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n }),\n }\n}",
|
| 46 |
+
"after_code": "fn get_applepay_info<F, Req>(\n item: &RouterData<F, Req, PaymentsResponseData>,\n apple_pay_data: &ApplePayWalletData,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>>\nwhere\n Req: NuveiAuthorizePreprocessingCommon,\n{\n let is_rebilling = if item.request.is_customer_initiated_mandate_payment() {\n Some(IsRebilling::False)\n } else {\n None\n };\n let user_token_id = if item.request.is_customer_initiated_mandate_payment() {\n item.request.get_customer_id_optional()\n } else {\n None\n };\n if let Ok(PaymentMethodToken::ApplePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_apple_pay_decrypt_data(\n token,\n is_rebilling,\n apple_pay_data.payment_method.network.clone(),\n user_token_id,\n );\n }\n match apple_pay_data.payment_data {\n ApplePayPaymentData::Decrypted(ref apple_pay_predecrypt_data) => {\n get_apple_pay_decrypt_data(\n apple_pay_predecrypt_data,\n is_rebilling,\n apple_pay_data.payment_method.network.clone(),\n user_token_id,\n )\n }\n\n ApplePayPaymentData::Encrypted(ref encrypted_data) => Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::ApplePay,\n mobile_token: {\n let apple_pay: ApplePayCamelCase = ApplePayCamelCase {\n payment_data: encrypted_data.to_string().into(),\n payment_method: ApplePayPaymentMethodCamelCase {\n display_name: Secret::new(\n apple_pay_data.payment_method.display_name.clone(),\n ),\n network: Secret::new(\n apple_pay_data.payment_method.network.clone(),\n ),\n pm_type: Secret::new(\n apple_pay_data.payment_method.pm_type.clone(),\n ),\n },\n transaction_identifier: Secret::new(\n apple_pay_data.transaction_identifier.clone(),\n ),\n };\n\n Some(Secret::new(\n apple_pay.encode_to_string_of_json().change_context(\n errors::ConnectorError::RequestEncodingFailed,\n )?,\n ))\n },\n cryptogram: None,\n eci_provider: None,\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n }),\n }\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": "",
|
| 49 |
+
"after": " None\n };\n let user_token_id = if item.request.is_customer_initiated_mandate_payment() {\n item.request.get_customer_id_optional()\n } else {\n None\n };\n if let Ok(PaymentMethodToken::ApplePayDecrypt(ref token)) = item.get_payment_method_token() {\n return get_apple_pay_decrypt_data(\n token,\n is_rebilling,\n apple_pay_data.payment_method.network.clone(),\n user_token_id,\n );\n }\n match apple_pay_data.payment_data {\n ApplePayPaymentData::Decrypted(ref apple_pay_predecrypt_data) => {\n get_apple_pay_decrypt_data(\n apple_pay_predecrypt_data,\n is_rebilling,\n apple_pay_data.payment_method.network.clone(),\n user_token_id,\n )\n }\n\n ApplePayPaymentData::Encrypted(ref encrypted_data) => Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "2eac0844cfd29b2f538c6273b7d3912dee33ae5f"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs::function::get_apple_pay_decrypt_data",
|
| 55 |
+
"file": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": true,
|
| 59 |
+
"imports_changed": false,
|
| 60 |
+
"before_code": "fn get_apple_pay_decrypt_data(\n apple_pay_predecrypt_data: &ApplePayPredecryptData,\n is_rebilling: Option<IsRebilling>,\n network: String,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>> {\n Ok(NuveiPaymentsRequest {\n is_rebilling,\n payment_option: PaymentOption {\n card: Some(Card {\n brand: Some(network),\n card_number: Some(\n apple_pay_predecrypt_data\n .application_primary_account_number\n .clone(),\n ),\n last4_digits: Some(Secret::new(\n apple_pay_predecrypt_data\n .application_primary_account_number\n .get_last4(),\n )),\n expiration_month: Some(\n apple_pay_predecrypt_data\n .application_expiration_month\n .clone(),\n ),\n expiration_year: Some(\n apple_pay_predecrypt_data\n .application_expiration_year\n .clone(),\n ),\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::ApplePay,\n mobile_token: None,\n cryptogram: Some(\n apple_pay_predecrypt_data\n .payment_data\n .online_payment_cryptogram\n .clone(),\n ),\n eci_provider: apple_pay_predecrypt_data.payment_data.eci_indicator.clone(),\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n })\n}",
|
| 61 |
+
"after_code": "fn get_apple_pay_decrypt_data(\n apple_pay_predecrypt_data: &ApplePayPredecryptData,\n is_rebilling: Option<IsRebilling>,\n network: String,\n user_token_id: Option<CustomerId>,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>> {\n Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {\n brand: Some(network),\n card_number: Some(\n apple_pay_predecrypt_data\n .application_primary_account_number\n .clone(),\n ),\n last4_digits: Some(Secret::new(\n apple_pay_predecrypt_data\n .application_primary_account_number\n .get_last4(),\n )),\n expiration_month: Some(\n apple_pay_predecrypt_data\n .application_expiration_month\n .clone(),\n ),\n expiration_year: Some(\n apple_pay_predecrypt_data\n .application_expiration_year\n .clone(),\n ),\n external_token: Some(ExternalToken {\n external_token_provider: ExternalTokenProvider::ApplePay,\n mobile_token: None,\n cryptogram: Some(\n apple_pay_predecrypt_data\n .payment_data\n .online_payment_cryptogram\n .clone(),\n ),\n eci_provider: apple_pay_predecrypt_data.payment_data.eci_indicator.clone(),\n }),\n ..Default::default()\n }),\n ..Default::default()\n },\n ..Default::default()\n })\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": "",
|
| 64 |
+
"after": " is_rebilling: Option<IsRebilling>,\n network: String,\n user_token_id: Option<CustomerId>,\n) -> Result<NuveiPaymentsRequest, error_stack::Report<errors::ConnectorError>> {\n Ok(NuveiPaymentsRequest {\n is_rebilling,\n user_token_id,\n payment_option: PaymentOption {\n card: Some(Card {"
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "2eac0844cfd29b2f538c6273b7d3912dee33ae5f"
|
| 67 |
+
}
|
| 68 |
+
]
|
| 69 |
+
}
|
diffs/pr_10643/ecf5c83/diff.json
ADDED
|
@@ -0,0 +1,142 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0",
|
| 3 |
+
"pr_number": 10643,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/gigadat.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat.rs::Gigadat::function::get_webhook_object_reference_id",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": true,
|
| 16 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let query_params = get_webhook_query_params(request)?;\n let body_str = std::str::from_utf8(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details: Vec<transformers::GigadatWebhookKeyValue> =\n form_urlencoded::parse(body_str.as_bytes())\n .map(|(key, value)| transformers::GigadatWebhookKeyValue {\n key: key.to_string(),\n value: value.to_string(),\n })\n .collect();\n\n let webhook_type = details\n .iter()\n .find(|&entry| entry.key == \"type\")\n .ok_or(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match transformers::GigadatFlow::get_flow(webhook_type.value.as_str())? {\n transformers::GigadatFlow::Payment => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n query_params.transaction,\n ),\n )\n }\n #[cfg(feature = \"payouts\")]\n transformers::GigadatFlow::Payout => api_models::webhooks::ObjectReferenceId::PayoutId(\n api_models::webhooks::PayoutIdType::ConnectorPayoutId(query_params.transaction),\n ),\n };\n Ok(reference_id)\n }",
|
| 17 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError> {\n let query_params = get_webhook_query_params(request)?;\n let body_str = std::str::from_utf8(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details = transformers::GigadatWebhookKeyValueBody::decode_from_url(body_str)?;\n let webhook_type = details.webhook_type;\n\n let reference_id = match transformers::GigadatFlow::get_flow(&webhook_type)? {\n transformers::GigadatFlow::Payment => {\n api_models::webhooks::ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::ConnectorTransactionId(\n query_params.transaction,\n ),\n )\n }\n #[cfg(feature = \"payouts\")]\n transformers::GigadatFlow::Payout => api_models::webhooks::ObjectReferenceId::PayoutId(\n api_models::webhooks::PayoutIdType::ConnectorPayoutId(query_params.transaction),\n ),\n };\n Ok(reference_id)\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details: Vec<transformers::GigadatWebhookKeyValue> =\n form_urlencoded::parse(body_str.as_bytes())\n .map(|(key, value)| transformers::GigadatWebhookKeyValue {\n key: key.to_string(),\n value: value.to_string(),\n })\n .collect();\n\n let webhook_type = details\n .iter()\n .find(|&entry| entry.key == \"type\")\n .ok_or(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let reference_id = match transformers::GigadatFlow::get_flow(webhook_type.value.as_str())? {\n transformers::GigadatFlow::Payment => {\n api_models::webhooks::ObjectReferenceId::PaymentId(",
|
| 20 |
+
"after": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details = transformers::GigadatWebhookKeyValueBody::decode_from_url(body_str)?;\n let webhook_type = details.webhook_type;\n\n let reference_id = match transformers::GigadatFlow::get_flow(&webhook_type)? {\n transformers::GigadatFlow::Payment => {\n api_models::webhooks::ObjectReferenceId::PaymentId("
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0",
|
| 23 |
+
"before_imports": [
|
| 24 |
+
"use hyperswitch_domain_models::{\n router_flow_types::{PoCreate, PoFulfill, PoQuote, PoSync},\n types::{PayoutsData, PayoutsResponseData, PayoutsRouterData},\n};",
|
| 25 |
+
"use hyperswitch_interfaces::types::{\n PayoutCreateType, PayoutFulfillType, PayoutQuoteType, PayoutSyncType,\n};",
|
| 26 |
+
"use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{\n ConnectorInfo, PaymentMethodDetails, PaymentsResponseData, RefundsResponseData,\n SupportedPaymentMethods, SupportedPaymentMethodsExt,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,\n RefundsRouterData,\n },\n};",
|
| 27 |
+
"use common_utils::{\n consts,\n crypto::Encryptable,\n errors::CustomResult,\n ext_traits::BytesExt,\n request::{Method, Request, RequestBuilder, RequestContent},\n types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector},\n};",
|
| 28 |
+
"use hyperswitch_interfaces::{\n api::{\n self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorSpecifications,\n ConnectorValidation,\n },\n configs::Connectors,\n consts as api_consts, errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};",
|
| 29 |
+
"use url::form_urlencoded;"
|
| 30 |
+
],
|
| 31 |
+
"after_imports": [
|
| 32 |
+
"use hyperswitch_domain_models::{\n router_flow_types::{PoCreate, PoFulfill, PoQuote, PoSync},\n types::{PayoutsData, PayoutsResponseData, PayoutsRouterData},\n};",
|
| 33 |
+
"use hyperswitch_interfaces::types::{\n PayoutCreateType, PayoutFulfillType, PayoutQuoteType, PayoutSyncType,\n};",
|
| 34 |
+
"use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{\n ConnectorInfo, PaymentMethodDetails, PaymentsResponseData, RefundsResponseData,\n SupportedPaymentMethods, SupportedPaymentMethodsExt,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,\n RefundsRouterData,\n },\n};",
|
| 35 |
+
"use common_utils::{\n consts,\n crypto::Encryptable,\n errors::CustomResult,\n ext_traits::BytesExt,\n request::{Method, Request, RequestBuilder, RequestContent},\n types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector},\n};",
|
| 36 |
+
"use hyperswitch_interfaces::{\n api::{\n self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorSpecifications,\n ConnectorValidation,\n },\n configs::Connectors,\n consts as api_consts, errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};"
|
| 37 |
+
]
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat.rs::Gigadat::function::get_webhook_event_type",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": true,
|
| 46 |
+
"before_code": "fn get_webhook_event_type(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError> {\n let query_params = get_webhook_query_params(request)?;\n let body_str = std::str::from_utf8(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details: Vec<transformers::GigadatWebhookKeyValue> =\n form_urlencoded::parse(body_str.as_bytes())\n .map(|(key, value)| transformers::GigadatWebhookKeyValue {\n key: key.to_string(),\n value: value.to_string(),\n })\n .collect();\n\n let webhook_type = details\n .iter()\n .find(|&entry| entry.key == \"type\")\n .ok_or(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let flow_type = transformers::GigadatFlow::get_flow(webhook_type.value.as_str())?;\n let event_type =\n transformers::get_gigadat_webhook_event_type(query_params.status, flow_type);\n Ok(event_type)\n }",
|
| 47 |
+
"after_code": "fn get_webhook_event_type(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError> {\n let query_params = get_webhook_query_params(request)?;\n let body_str = std::str::from_utf8(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details = transformers::GigadatWebhookKeyValueBody::decode_from_url(body_str)?;\n\n let webhook_type = details.webhook_type;\n\n let flow_type = transformers::GigadatFlow::get_flow(&webhook_type)?;\n let event_type =\n transformers::get_gigadat_webhook_event_type(query_params.status, flow_type);\n Ok(event_type)\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details: Vec<transformers::GigadatWebhookKeyValue> =\n form_urlencoded::parse(body_str.as_bytes())\n .map(|(key, value)| transformers::GigadatWebhookKeyValue {\n key: key.to_string(),\n value: value.to_string(),\n })\n .collect();\n\n let webhook_type = details\n .iter()\n .find(|&entry| entry.key == \"type\")\n .ok_or(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let flow_type = transformers::GigadatFlow::get_flow(webhook_type.value.as_str())?;\n let event_type =\n transformers::get_gigadat_webhook_event_type(query_params.status, flow_type);",
|
| 50 |
+
"after": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details = transformers::GigadatWebhookKeyValueBody::decode_from_url(body_str)?;\n\n let webhook_type = details.webhook_type;\n\n let flow_type = transformers::GigadatFlow::get_flow(&webhook_type)?;\n let event_type =\n transformers::get_gigadat_webhook_event_type(query_params.status, flow_type);"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0",
|
| 53 |
+
"before_imports": [
|
| 54 |
+
"use hyperswitch_domain_models::{\n router_flow_types::{PoCreate, PoFulfill, PoQuote, PoSync},\n types::{PayoutsData, PayoutsResponseData, PayoutsRouterData},\n};",
|
| 55 |
+
"use hyperswitch_interfaces::types::{\n PayoutCreateType, PayoutFulfillType, PayoutQuoteType, PayoutSyncType,\n};",
|
| 56 |
+
"use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{\n ConnectorInfo, PaymentMethodDetails, PaymentsResponseData, RefundsResponseData,\n SupportedPaymentMethods, SupportedPaymentMethodsExt,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,\n RefundsRouterData,\n },\n};",
|
| 57 |
+
"use common_utils::{\n consts,\n crypto::Encryptable,\n errors::CustomResult,\n ext_traits::BytesExt,\n request::{Method, Request, RequestBuilder, RequestContent},\n types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector},\n};",
|
| 58 |
+
"use hyperswitch_interfaces::{\n api::{\n self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorSpecifications,\n ConnectorValidation,\n },\n configs::Connectors,\n consts as api_consts, errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};",
|
| 59 |
+
"use url::form_urlencoded;"
|
| 60 |
+
],
|
| 61 |
+
"after_imports": [
|
| 62 |
+
"use hyperswitch_domain_models::{\n router_flow_types::{PoCreate, PoFulfill, PoQuote, PoSync},\n types::{PayoutsData, PayoutsResponseData, PayoutsRouterData},\n};",
|
| 63 |
+
"use hyperswitch_interfaces::types::{\n PayoutCreateType, PayoutFulfillType, PayoutQuoteType, PayoutSyncType,\n};",
|
| 64 |
+
"use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{\n ConnectorInfo, PaymentMethodDetails, PaymentsResponseData, RefundsResponseData,\n SupportedPaymentMethods, SupportedPaymentMethodsExt,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,\n RefundsRouterData,\n },\n};",
|
| 65 |
+
"use common_utils::{\n consts,\n crypto::Encryptable,\n errors::CustomResult,\n ext_traits::BytesExt,\n request::{Method, Request, RequestBuilder, RequestContent},\n types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector},\n};",
|
| 66 |
+
"use hyperswitch_interfaces::{\n api::{\n self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorSpecifications,\n ConnectorValidation,\n },\n configs::Connectors,\n consts as api_consts, errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};"
|
| 67 |
+
]
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat.rs::Gigadat::function::get_webhook_resource_object",
|
| 71 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat.rs",
|
| 72 |
+
"kind": "function_item",
|
| 73 |
+
"status": "modified",
|
| 74 |
+
"code_changed": true,
|
| 75 |
+
"imports_changed": true,
|
| 76 |
+
"before_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let body_str = std::str::from_utf8(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details: Vec<transformers::GigadatWebhookKeyValue> =\n form_urlencoded::parse(body_str.as_bytes())\n .map(|(key, value)| transformers::GigadatWebhookKeyValue {\n key: key.to_string(),\n value: value.to_string(),\n })\n .collect();\n let resource_object = serde_json::to_string(&details)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n Ok(Box::new(resource_object))\n }",
|
| 77 |
+
"after_code": "fn get_webhook_resource_object(\n &self,\n request: &webhooks::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError> {\n let body_str = std::str::from_utf8(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details = transformers::GigadatWebhookKeyValueBody::decode_from_url(body_str)?;\n Ok(Box::new(details))\n }",
|
| 78 |
+
"diff_span": {
|
| 79 |
+
"before": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details: Vec<transformers::GigadatWebhookKeyValue> =\n form_urlencoded::parse(body_str.as_bytes())\n .map(|(key, value)| transformers::GigadatWebhookKeyValue {\n key: key.to_string(),\n value: value.to_string(),\n })\n .collect();\n let resource_object = serde_json::to_string(&details)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n Ok(Box::new(resource_object))\n }",
|
| 80 |
+
"after": " .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n\n let details = transformers::GigadatWebhookKeyValueBody::decode_from_url(body_str)?;\n Ok(Box::new(details))\n }"
|
| 81 |
+
},
|
| 82 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0",
|
| 83 |
+
"before_imports": [
|
| 84 |
+
"use hyperswitch_domain_models::{\n router_flow_types::{PoCreate, PoFulfill, PoQuote, PoSync},\n types::{PayoutsData, PayoutsResponseData, PayoutsRouterData},\n};",
|
| 85 |
+
"use hyperswitch_interfaces::types::{\n PayoutCreateType, PayoutFulfillType, PayoutQuoteType, PayoutSyncType,\n};",
|
| 86 |
+
"use masking::{Mask, PeekInterface};",
|
| 87 |
+
"use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{\n ConnectorInfo, PaymentMethodDetails, PaymentsResponseData, RefundsResponseData,\n SupportedPaymentMethods, SupportedPaymentMethodsExt,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,\n RefundsRouterData,\n },\n};",
|
| 88 |
+
"use common_utils::{\n consts,\n crypto::Encryptable,\n errors::CustomResult,\n ext_traits::BytesExt,\n request::{Method, Request, RequestBuilder, RequestContent},\n types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector},\n};",
|
| 89 |
+
"use hyperswitch_interfaces::{\n api::{\n self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorSpecifications,\n ConnectorValidation,\n },\n configs::Connectors,\n consts as api_consts, errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};",
|
| 90 |
+
"use url::form_urlencoded;"
|
| 91 |
+
],
|
| 92 |
+
"after_imports": [
|
| 93 |
+
"use hyperswitch_domain_models::{\n router_flow_types::{PoCreate, PoFulfill, PoQuote, PoSync},\n types::{PayoutsData, PayoutsResponseData, PayoutsRouterData},\n};",
|
| 94 |
+
"use hyperswitch_interfaces::types::{\n PayoutCreateType, PayoutFulfillType, PayoutQuoteType, PayoutSyncType,\n};",
|
| 95 |
+
"use masking::{Mask, PeekInterface};",
|
| 96 |
+
"use hyperswitch_domain_models::{\n payment_method_data::PaymentMethodData,\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n router_flow_types::{\n access_token_auth::AccessTokenAuth,\n payments::{Authorize, Capture, PSync, PaymentMethodToken, Session, SetupMandate, Void},\n refunds::{Execute, RSync},\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{\n ConnectorInfo, PaymentMethodDetails, PaymentsResponseData, RefundsResponseData,\n SupportedPaymentMethods, SupportedPaymentMethodsExt,\n },\n types::{\n PaymentsAuthorizeRouterData, PaymentsCaptureRouterData, PaymentsSyncRouterData,\n RefundsRouterData,\n },\n};",
|
| 97 |
+
"use common_utils::{\n consts,\n crypto::Encryptable,\n errors::CustomResult,\n ext_traits::BytesExt,\n request::{Method, Request, RequestBuilder, RequestContent},\n types::{AmountConvertor, FloatMajorUnit, FloatMajorUnitForConnector},\n};",
|
| 98 |
+
"use hyperswitch_interfaces::{\n api::{\n self, ConnectorCommon, ConnectorCommonExt, ConnectorIntegration, ConnectorSpecifications,\n ConnectorValidation,\n },\n configs::Connectors,\n consts as api_consts, errors,\n events::connector_api_logs::ConnectorEvent,\n types::{self, Response},\n webhooks,\n};"
|
| 99 |
+
]
|
| 100 |
+
},
|
| 101 |
+
{
|
| 102 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs::GigadatWebhookKeyValueBody::function::decode_from_url",
|
| 103 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs",
|
| 104 |
+
"kind": "function_item",
|
| 105 |
+
"status": "added",
|
| 106 |
+
"before_code": null,
|
| 107 |
+
"after_code": "pub fn decode_from_url(body_str: &str) -> Result<Self, errors::ConnectorError> {\n serde_urlencoded::from_str(body_str)\n .map_err(|_| errors::ConnectorError::WebhookBodyDecodingFailed)\n }",
|
| 108 |
+
"diff_span": null,
|
| 109 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0"
|
| 110 |
+
},
|
| 111 |
+
{
|
| 112 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs::impl::GigadatWebhookKeyValueBody",
|
| 113 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs",
|
| 114 |
+
"kind": "impl_item",
|
| 115 |
+
"status": "added",
|
| 116 |
+
"before_code": null,
|
| 117 |
+
"after_code": "impl GigadatWebhookKeyValueBody {\n pub fn decode_from_url(body_str: &str) -> Result<Self, errors::ConnectorError> {\n serde_urlencoded::from_str(body_str)\n .map_err(|_| errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n}",
|
| 118 |
+
"diff_span": null,
|
| 119 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0"
|
| 120 |
+
},
|
| 121 |
+
{
|
| 122 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs::struct::GigadatWebhookKeyValueBody",
|
| 123 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs",
|
| 124 |
+
"kind": "struct_item",
|
| 125 |
+
"status": "added",
|
| 126 |
+
"before_code": null,
|
| 127 |
+
"after_code": "pub struct GigadatWebhookKeyValueBody {\n #[serde(rename = \"type\")]\n pub webhook_type: String,\n pub final_type: Option<String>,\n pub cpi_type: Option<String>,\n // donot remove the below fields\n pub name: Option<Secret<String>>,\n pub mobile: Option<Secret<String>>,\n pub user_id: Option<Secret<String>>,\n pub email: Option<Secret<String>>,\n pub financial_institution: Option<Secret<String>>,\n}",
|
| 128 |
+
"diff_span": null,
|
| 129 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0"
|
| 130 |
+
},
|
| 131 |
+
{
|
| 132 |
+
"id": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs::struct::GigadatWebhookKeyValue",
|
| 133 |
+
"file": "crates/hyperswitch_connectors/src/connectors/gigadat/transformers.rs",
|
| 134 |
+
"kind": "struct_item",
|
| 135 |
+
"status": "removed",
|
| 136 |
+
"before_code": "pub struct GigadatWebhookKeyValue {\n pub key: String,\n pub value: String,\n}",
|
| 137 |
+
"after_code": null,
|
| 138 |
+
"diff_span": null,
|
| 139 |
+
"commit_sha": "ecf5c830b2fe26d3b1eb5b1a497e13942aee3fc0"
|
| 140 |
+
}
|
| 141 |
+
]
|
| 142 |
+
}
|
diffs/pr_6759/f47b37f/diff.json
ADDED
|
@@ -0,0 +1,197 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba",
|
| 3 |
+
"pr_number": 6759,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/diesel_models/src/payment_method.rs",
|
| 6 |
+
"crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs",
|
| 7 |
+
"crates/hyperswitch_interfaces/src/webhooks.rs",
|
| 8 |
+
"crates/router/src/connector/adyen.rs",
|
| 9 |
+
"crates/router/src/connector/adyen/transformers.rs",
|
| 10 |
+
"crates/router/src/core/webhooks/incoming.rs",
|
| 11 |
+
"crates/router/src/services/connector_integration_interface.rs"
|
| 12 |
+
],
|
| 13 |
+
"diffs": [
|
| 14 |
+
{
|
| 15 |
+
"id": "crates/hyperswitch_interfaces/src/webhooks.rs::trait::IncomingWebhook",
|
| 16 |
+
"file": "crates/hyperswitch_interfaces/src/webhooks.rs",
|
| 17 |
+
"kind": "trait_item",
|
| 18 |
+
"status": "modified",
|
| 19 |
+
"code_changed": true,
|
| 20 |
+
"imports_changed": false,
|
| 21 |
+
"before_code": "pub trait IncomingWebhook: ConnectorCommon + Sync {\n /// fn get_webhook_body_decoding_algorithm\n fn get_webhook_body_decoding_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::DecodeMessage + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_body_decoding_message\n fn get_webhook_body_decoding_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(request.body.to_vec())\n }\n\n /// fn decode_webhook_body\n async fn decode_webhook_body(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n connector_name: &str,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n let algorithm = self.get_webhook_body_decoding_algorithm(request)?;\n\n let message = self\n .get_webhook_body_decoding_message(request)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let secret = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .decode_message(&secret.secret, message.into())\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n\n /// fn get_webhook_source_verification_algorithm\n fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_source_verification_merchant_secret\n async fn get_webhook_source_verification_merchant_secret(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<api_models::webhooks::ConnectorWebhookSecrets, errors::ConnectorError> {\n let debug_suffix = format!(\n \"For merchant_id: {:?}, and connector_name: {}\",\n merchant_id, connector_name\n );\n let default_secret = \"default_secret\".to_string();\n let merchant_secret = match connector_webhook_details {\n Some(merchant_connector_webhook_details) => {\n let connector_webhook_details = merchant_connector_webhook_details\n .parse_value::<api_models::admin::MerchantConnectorWebhookDetails>(\n \"MerchantConnectorWebhookDetails\",\n )\n .change_context_lazy(|| errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable_lazy(|| {\n format!(\n \"Deserializing MerchantConnectorWebhookDetails failed {}\",\n debug_suffix\n )\n })?;\n api_models::webhooks::ConnectorWebhookSecrets {\n secret: connector_webhook_details\n .merchant_secret\n .expose()\n .into_bytes(),\n additional_secret: connector_webhook_details.additional_secret,\n }\n }\n\n None => api_models::webhooks::ConnectorWebhookSecrets {\n secret: default_secret.into_bytes(),\n additional_secret: None,\n },\n };\n\n //need to fetch merchant secret from config table with caching in future for enhanced performance\n\n //If merchant has not set the secret for webhook source verification, \"default_secret\" is returned.\n //So it will fail during verification step and goes to psync flow.\n Ok(merchant_secret)\n }\n\n /// fn get_webhook_source_verification_signature\n fn get_webhook_source_verification_signature(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn get_webhook_source_verification_message\n fn get_webhook_source_verification_message(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn verify_webhook_source\n async fn verify_webhook_source(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n _connector_account_details: crypto::Encryptable<Secret<serde_json::Value>>,\n connector_name: &str,\n ) -> CustomResult<bool, errors::ConnectorError> {\n let algorithm = self\n .get_webhook_source_verification_algorithm(request)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let message = self\n .get_webhook_source_verification_message(\n request,\n merchant_id,\n &connector_webhook_secrets,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .verify_signature(&connector_webhook_secrets.secret, &signature, &message)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n }\n\n /// fn get_webhook_object_reference_id\n fn get_webhook_object_reference_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError>;\n\n /// fn get_webhook_resource_object\n fn get_webhook_resource_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError>;\n\n /// fn get_webhook_api_response\n fn get_webhook_api_response(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _error_kind: Option<IncomingWebhookFlowError>,\n ) -> CustomResult<ApplicationResponse<serde_json::Value>, errors::ConnectorError> {\n Ok(ApplicationResponse::StatusOk)\n }\n\n /// fn get_dispute_details\n fn get_dispute_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::disputes::DisputePayload, errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_dispute_details method\".to_string()).into())\n }\n\n /// fn get_external_authentication_details\n fn get_external_authentication_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::authentication::ExternalAuthenticationPayload, errors::ConnectorError>\n {\n Err(errors::ConnectorError::NotImplemented(\n \"get_external_authentication_details method\".to_string(),\n )\n .into())\n }\n\n /// fn get_mandate_details\n fn get_mandate_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n}",
|
| 22 |
+
"after_code": "pub trait IncomingWebhook: ConnectorCommon + Sync {\n /// fn get_webhook_body_decoding_algorithm\n fn get_webhook_body_decoding_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::DecodeMessage + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_body_decoding_message\n fn get_webhook_body_decoding_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(request.body.to_vec())\n }\n\n /// fn decode_webhook_body\n async fn decode_webhook_body(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n connector_name: &str,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n let algorithm = self.get_webhook_body_decoding_algorithm(request)?;\n\n let message = self\n .get_webhook_body_decoding_message(request)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let secret = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .decode_message(&secret.secret, message.into())\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)\n }\n\n /// fn get_webhook_source_verification_algorithm\n fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, errors::ConnectorError> {\n Ok(Box::new(crypto::NoAlgorithm))\n }\n\n /// fn get_webhook_source_verification_merchant_secret\n async fn get_webhook_source_verification_merchant_secret(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n ) -> CustomResult<api_models::webhooks::ConnectorWebhookSecrets, errors::ConnectorError> {\n let debug_suffix = format!(\n \"For merchant_id: {:?}, and connector_name: {}\",\n merchant_id, connector_name\n );\n let default_secret = \"default_secret\".to_string();\n let merchant_secret = match connector_webhook_details {\n Some(merchant_connector_webhook_details) => {\n let connector_webhook_details = merchant_connector_webhook_details\n .parse_value::<api_models::admin::MerchantConnectorWebhookDetails>(\n \"MerchantConnectorWebhookDetails\",\n )\n .change_context_lazy(|| errors::ConnectorError::WebhookSourceVerificationFailed)\n .attach_printable_lazy(|| {\n format!(\n \"Deserializing MerchantConnectorWebhookDetails failed {}\",\n debug_suffix\n )\n })?;\n api_models::webhooks::ConnectorWebhookSecrets {\n secret: connector_webhook_details\n .merchant_secret\n .expose()\n .into_bytes(),\n additional_secret: connector_webhook_details.additional_secret,\n }\n }\n\n None => api_models::webhooks::ConnectorWebhookSecrets {\n secret: default_secret.into_bytes(),\n additional_secret: None,\n },\n };\n\n //need to fetch merchant secret from config table with caching in future for enhanced performance\n\n //If merchant has not set the secret for webhook source verification, \"default_secret\" is returned.\n //So it will fail during verification step and goes to psync flow.\n Ok(merchant_secret)\n }\n\n /// fn get_webhook_source_verification_signature\n fn get_webhook_source_verification_signature(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn get_webhook_source_verification_message\n fn get_webhook_source_verification_message(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, errors::ConnectorError> {\n Ok(Vec::new())\n }\n\n /// fn verify_webhook_source\n async fn verify_webhook_source(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_webhook_details: Option<common_utils::pii::SecretSerdeValue>,\n _connector_account_details: crypto::Encryptable<Secret<serde_json::Value>>,\n connector_name: &str,\n ) -> CustomResult<bool, errors::ConnectorError> {\n let algorithm = self\n .get_webhook_source_verification_algorithm(request)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_name,\n connector_webhook_details,\n )\n .await\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n let message = self\n .get_webhook_source_verification_message(\n request,\n merchant_id,\n &connector_webhook_secrets,\n )\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)?;\n\n algorithm\n .verify_signature(&connector_webhook_secrets.secret, &signature, &message)\n .change_context(errors::ConnectorError::WebhookSourceVerificationFailed)\n }\n\n /// fn get_webhook_object_reference_id\n fn get_webhook_object_reference_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::ObjectReferenceId, errors::ConnectorError>;\n\n /// fn get_webhook_event_type\n fn get_webhook_event_type(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<api_models::webhooks::IncomingWebhookEvent, errors::ConnectorError>;\n\n /// fn get_webhook_resource_object\n fn get_webhook_resource_object(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, errors::ConnectorError>;\n\n /// fn get_webhook_api_response\n fn get_webhook_api_response(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n _error_kind: Option<IncomingWebhookFlowError>,\n ) -> CustomResult<ApplicationResponse<serde_json::Value>, errors::ConnectorError> {\n Ok(ApplicationResponse::StatusOk)\n }\n\n /// fn get_dispute_details\n fn get_dispute_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::disputes::DisputePayload, errors::ConnectorError> {\n Err(errors::ConnectorError::NotImplemented(\"get_dispute_details method\".to_string()).into())\n }\n\n /// fn get_external_authentication_details\n fn get_external_authentication_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<crate::authentication::ExternalAuthenticationPayload, errors::ConnectorError>\n {\n Err(errors::ConnectorError::NotImplemented(\n \"get_external_authentication_details method\".to_string(),\n )\n .into())\n }\n\n /// fn get_mandate_details\n fn get_mandate_details(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorMandateDetails>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n\n /// fn get_network_txn_id\n fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n}",
|
| 23 |
+
"diff_span": {
|
| 24 |
+
"before": "",
|
| 25 |
+
"after": " Ok(None)\n }\n\n /// fn get_network_txn_id\n fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }\n}"
|
| 26 |
+
},
|
| 27 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 28 |
+
},
|
| 29 |
+
{
|
| 30 |
+
"id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethod",
|
| 31 |
+
"file": "crates/diesel_models/src/payment_method.rs",
|
| 32 |
+
"kind": "struct_item",
|
| 33 |
+
"status": "modified",
|
| 34 |
+
"code_changed": false,
|
| 35 |
+
"imports_changed": true,
|
| 36 |
+
"before_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::CustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option<Encryption>,\n pub locker_id: Option<String>,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option<PaymentsMandateReference>,\n pub customer_acceptance: Option<pii::SecretSerdeValue>,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option<String>,\n pub client_secret: Option<String>,\n pub payment_method_billing_address: Option<Encryption>,\n pub updated_by: Option<String>,\n pub locker_fingerprint_id: Option<String>,\n pub payment_method_type_v2: Option<storage_enums::PaymentMethod>,\n pub payment_method_subtype: Option<storage_enums::PaymentMethodType>,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option<String>,\n pub network_token_locker_id: Option<String>,\n pub network_token_payment_method_data: Option<Encryption>,\n}",
|
| 37 |
+
"after_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::CustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option<Encryption>,\n pub locker_id: Option<String>,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option<PaymentsMandateReference>,\n pub customer_acceptance: Option<pii::SecretSerdeValue>,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option<String>,\n pub client_secret: Option<String>,\n pub payment_method_billing_address: Option<Encryption>,\n pub updated_by: Option<String>,\n pub locker_fingerprint_id: Option<String>,\n pub payment_method_type_v2: Option<storage_enums::PaymentMethod>,\n pub payment_method_subtype: Option<storage_enums::PaymentMethodType>,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option<String>,\n pub network_token_locker_id: Option<String>,\n pub network_token_payment_method_data: Option<Encryption>,\n}",
|
| 38 |
+
"diff_span": {
|
| 39 |
+
"before": "",
|
| 40 |
+
"after": ""
|
| 41 |
+
},
|
| 42 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba",
|
| 43 |
+
"before_imports": [
|
| 44 |
+
"use masking::Secret;",
|
| 45 |
+
"use time::PrimitiveDateTime;"
|
| 46 |
+
],
|
| 47 |
+
"after_imports": [
|
| 48 |
+
"use time::PrimitiveDateTime;",
|
| 49 |
+
"use masking::{ExposeInterface, Secret};"
|
| 50 |
+
]
|
| 51 |
+
},
|
| 52 |
+
{
|
| 53 |
+
"id": "crates/router/src/connector/adyen/transformers.rs::struct::AdyenAdditionalDataWH",
|
| 54 |
+
"file": "crates/router/src/connector/adyen/transformers.rs",
|
| 55 |
+
"kind": "struct_item",
|
| 56 |
+
"status": "modified",
|
| 57 |
+
"code_changed": true,
|
| 58 |
+
"imports_changed": false,
|
| 59 |
+
"before_code": "pub struct AdyenAdditionalDataWH {\n pub hmac_signature: Secret<String>,\n pub dispute_status: Option<DisputeStatus>,\n pub chargeback_reason_code: Option<String>,\n #[serde(default, with = \"common_utils::custom_serde::iso8601::option\")]\n pub defense_period_ends_at: Option<PrimitiveDateTime>,\n /// Enable recurring details in dashboard to receive this ID, https://docs.adyen.com/online-payments/tokenization/create-and-use-tokens#test-and-go-live\n #[serde(rename = \"recurring.recurringDetailReference\")]\n pub recurring_detail_reference: Option<Secret<String>>,\n}",
|
| 60 |
+
"after_code": "pub struct AdyenAdditionalDataWH {\n pub hmac_signature: Secret<String>,\n pub dispute_status: Option<DisputeStatus>,\n pub chargeback_reason_code: Option<String>,\n #[serde(default, with = \"common_utils::custom_serde::iso8601::option\")]\n pub defense_period_ends_at: Option<PrimitiveDateTime>,\n /// Enable recurring details in dashboard to receive this ID, https://docs.adyen.com/online-payments/tokenization/create-and-use-tokens#test-and-go-live\n #[serde(rename = \"recurring.recurringDetailReference\")]\n pub recurring_detail_reference: Option<Secret<String>>,\n pub network_tx_reference: Option<Secret<String>>,\n}",
|
| 61 |
+
"diff_span": {
|
| 62 |
+
"before": "",
|
| 63 |
+
"after": " #[serde(rename = \"recurring.recurringDetailReference\")]\n pub recurring_detail_reference: Option<Secret<String>>,\n pub network_tx_reference: Option<Secret<String>>,\n}"
|
| 64 |
+
},
|
| 65 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 66 |
+
},
|
| 67 |
+
{
|
| 68 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::update_connector_mandate_details",
|
| 69 |
+
"file": "crates/router/src/core/webhooks/incoming.rs",
|
| 70 |
+
"kind": "function_item",
|
| 71 |
+
"status": "modified",
|
| 72 |
+
"code_changed": true,
|
| 73 |
+
"imports_changed": false,
|
| 74 |
+
"before_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n object_ref_id: api::ObjectReferenceId,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let webhook_connector_mandate_details = connector\n .get_mandate_details(request_details)\n .switch()\n .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_account)\n .await?;\n\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n key_store,\n payment_method_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n let mandate_details = payment_method_info\n .connector_mandate_details\n .clone()\n .map(|val| {\n val.parse_value::<diesel_models::PaymentsMandateReference>(\n \"PaymentsMandateReference\",\n )\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details\n .as_ref()\n .map(|details: &diesel_models::PaymentsMandateReference| {\n !details.0.contains_key(&merchant_connector_account_id)\n })\n .unwrap_or(true)\n {\n let updated_connector_mandate_details = insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n mandate_details,\n )?;\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details: updated_connector_mandate_details,\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n key_store,\n payment_method_info,\n pm_update,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n // Update the payment attempt to maintain consistency across tables.\n\n let (mandate_metadata, connector_mandate_request_reference_id) = payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update = storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n updated_by: merchant_account.storage_scheme.to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n }\n }\n }\n Ok(())\n}",
|
| 75 |
+
"after_code": "async fn update_connector_mandate_details(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n object_ref_id: api::ObjectReferenceId,\n connector: &ConnectorEnum,\n request_details: &IncomingWebhookRequestDetails<'_>,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let webhook_connector_mandate_details = connector\n .get_mandate_details(request_details)\n .switch()\n .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n let webhook_connector_network_transaction_id = connector\n .get_network_txn_id(request_details)\n .switch()\n .attach_printable(\n \"Could not find connector network transaction id in incoming webhook body\",\n )?;\n\n // Either one OR both of the fields are present\n if webhook_connector_mandate_details.is_some()\n || webhook_connector_network_transaction_id.is_some()\n {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_account)\n .await?;\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n key_store,\n payment_method_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n // Update connector's mandate details\n let updated_connector_mandate_details =\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let mandate_details = payment_method_info\n .connector_mandate_details\n .clone()\n .map(|val| {\n val.parse_value::<diesel_models::PaymentsMandateReference>(\n \"PaymentsMandateReference\",\n )\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details\n .as_ref()\n .map(|details: &diesel_models::PaymentsMandateReference| {\n !details.0.contains_key(&merchant_connector_account_id)\n })\n .unwrap_or(true)\n {\n // Update the payment attempt to maintain consistency across tables.\n let (mandate_metadata, connector_mandate_request_reference_id) =\n payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update =\n storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n updated_by: merchant_account.storage_scheme.to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n mandate_details,\n )?\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n None\n }\n } else {\n None\n };\n\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorNetworkTransactionIdAndMandateDetailsUpdate {\n connector_mandate_details: updated_connector_mandate_details.map(masking::Secret::new),\n network_transaction_id: webhook_connector_network_transaction_id\n .map(|webhook_network_transaction_id| webhook_network_transaction_id.get_id().clone()),\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n key_store,\n payment_method_info,\n pm_update,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n }\n }\n Ok(())\n}",
|
| 76 |
+
"diff_span": {
|
| 77 |
+
"before": " .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_account)\n .await?;\n\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n key_store,\n payment_method_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n let mandate_details = payment_method_info\n .connector_mandate_details\n .clone()\n .map(|val| {\n val.parse_value::<diesel_models::PaymentsMandateReference>(\n \"PaymentsMandateReference\",\n )\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details\n .as_ref()\n .map(|details: &diesel_models::PaymentsMandateReference| {\n !details.0.contains_key(&merchant_connector_account_id)\n })\n .unwrap_or(true)\n {\n let updated_connector_mandate_details = insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n mandate_details,\n )?;\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details: updated_connector_mandate_details,\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n key_store,\n payment_method_info,\n pm_update,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n // Update the payment attempt to maintain consistency across tables.\n\n let (mandate_metadata, connector_mandate_request_reference_id) = payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update = storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n updated_by: merchant_account.storage_scheme.to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n }\n }\n }",
|
| 78 |
+
"after": " .attach_printable(\"Could not find connector mandate details in incoming webhook body\")?;\n\n let webhook_connector_network_transaction_id = connector\n .get_network_txn_id(request_details)\n .switch()\n .attach_printable(\n \"Could not find connector network transaction id in incoming webhook body\",\n )?;\n\n // Either one OR both of the fields are present\n if webhook_connector_mandate_details.is_some()\n || webhook_connector_network_transaction_id.is_some()\n {\n let payment_attempt =\n get_payment_attempt_from_object_reference_id(state, object_ref_id, merchant_account)\n .await?;\n if let Some(ref payment_method_id) = payment_attempt.payment_method_id {\n let key_manager_state = &state.into();\n let payment_method_info = state\n .store\n .find_payment_method(\n key_manager_state,\n key_store,\n payment_method_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentMethodNotFound)?;\n\n // Update connector's mandate details\n let updated_connector_mandate_details =\n if let Some(webhook_mandate_details) = webhook_connector_mandate_details {\n let mandate_details = payment_method_info\n .connector_mandate_details\n .clone()\n .map(|val| {\n val.parse_value::<diesel_models::PaymentsMandateReference>(\n \"PaymentsMandateReference\",\n )\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to deserialize to Payment Mandate Reference\")?;\n\n let merchant_connector_account_id = payment_attempt\n .merchant_connector_id\n .clone()\n .get_required_value(\"merchant_connector_id\")?;\n\n if mandate_details\n .as_ref()\n .map(|details: &diesel_models::PaymentsMandateReference| {\n !details.0.contains_key(&merchant_connector_account_id)\n })\n .unwrap_or(true)\n {\n // Update the payment attempt to maintain consistency across tables.\n let (mandate_metadata, connector_mandate_request_reference_id) =\n payment_attempt\n .connector_mandate_detail\n .as_ref()\n .map(|details| {\n (\n details.mandate_metadata.clone(),\n details.connector_mandate_request_reference_id.clone(),\n )\n })\n .unwrap_or((None, None));\n\n let connector_mandate_reference_id = ConnectorMandateReferenceId {\n connector_mandate_id: Some(\n webhook_mandate_details\n .connector_mandate_id\n .peek()\n .to_string(),\n ),\n payment_method_id: Some(payment_method_id.to_string()),\n mandate_metadata,\n connector_mandate_request_reference_id,\n };\n\n let attempt_update =\n storage::PaymentAttemptUpdate::ConnectorMandateDetailUpdate {\n connector_mandate_detail: Some(connector_mandate_reference_id),\n updated_by: merchant_account.storage_scheme.to_string(),\n };\n\n state\n .store\n .update_payment_attempt_with_attempt_id(\n payment_attempt.clone(),\n attempt_update,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n insert_mandate_details(\n &payment_attempt,\n &webhook_mandate_details,\n mandate_details,\n )?\n } else {\n logger::info!(\n \"Skipping connector mandate details update since they are already present.\"\n );\n None\n }\n } else {\n None\n };\n\n let pm_update = diesel_models::PaymentMethodUpdate::ConnectorNetworkTransactionIdAndMandateDetailsUpdate {\n connector_mandate_details: updated_connector_mandate_details.map(masking::Secret::new),\n network_transaction_id: webhook_connector_network_transaction_id\n .map(|webhook_network_transaction_id| webhook_network_transaction_id.get_id().clone()),\n };\n\n state\n .store\n .update_payment_method(\n key_manager_state,\n key_store,\n payment_method_info,\n pm_update,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to update payment method in db\")?;\n }\n }"
|
| 79 |
+
},
|
| 80 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 81 |
+
},
|
| 82 |
+
{
|
| 83 |
+
"id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethodNew",
|
| 84 |
+
"file": "crates/diesel_models/src/payment_method.rs",
|
| 85 |
+
"kind": "struct_item",
|
| 86 |
+
"status": "modified",
|
| 87 |
+
"code_changed": false,
|
| 88 |
+
"imports_changed": true,
|
| 89 |
+
"before_code": "pub struct PaymentMethodNew {\n pub customer_id: common_utils::id_type::CustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option<Encryption>,\n pub locker_id: Option<String>,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option<PaymentsMandateReference>,\n pub customer_acceptance: Option<pii::SecretSerdeValue>,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option<String>,\n pub client_secret: Option<String>,\n pub payment_method_billing_address: Option<Encryption>,\n pub updated_by: Option<String>,\n pub locker_fingerprint_id: Option<String>,\n pub payment_method_type_v2: Option<storage_enums::PaymentMethod>,\n pub payment_method_subtype: Option<storage_enums::PaymentMethodType>,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option<String>,\n pub network_token_locker_id: Option<String>,\n pub network_token_payment_method_data: Option<Encryption>,\n}",
|
| 90 |
+
"after_code": "pub struct PaymentMethodNew {\n pub customer_id: common_utils::id_type::CustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option<Encryption>,\n pub locker_id: Option<String>,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option<PaymentsMandateReference>,\n pub customer_acceptance: Option<pii::SecretSerdeValue>,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option<String>,\n pub client_secret: Option<String>,\n pub payment_method_billing_address: Option<Encryption>,\n pub updated_by: Option<String>,\n pub locker_fingerprint_id: Option<String>,\n pub payment_method_type_v2: Option<storage_enums::PaymentMethod>,\n pub payment_method_subtype: Option<storage_enums::PaymentMethodType>,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option<String>,\n pub network_token_locker_id: Option<String>,\n pub network_token_payment_method_data: Option<Encryption>,\n}",
|
| 91 |
+
"diff_span": {
|
| 92 |
+
"before": "",
|
| 93 |
+
"after": ""
|
| 94 |
+
},
|
| 95 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba",
|
| 96 |
+
"before_imports": [
|
| 97 |
+
"use masking::Secret;",
|
| 98 |
+
"use time::PrimitiveDateTime;"
|
| 99 |
+
],
|
| 100 |
+
"after_imports": [
|
| 101 |
+
"use time::PrimitiveDateTime;",
|
| 102 |
+
"use masking::{ExposeInterface, Secret};"
|
| 103 |
+
]
|
| 104 |
+
},
|
| 105 |
+
{
|
| 106 |
+
"id": "crates/diesel_models/src/payment_method.rs::struct::PaymentsMandateReferenceRecord",
|
| 107 |
+
"file": "crates/diesel_models/src/payment_method.rs",
|
| 108 |
+
"kind": "struct_item",
|
| 109 |
+
"status": "modified",
|
| 110 |
+
"code_changed": false,
|
| 111 |
+
"imports_changed": true,
|
| 112 |
+
"before_code": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_subtype: Option<common_enums::PaymentMethodType>,\n pub original_payment_authorized_amount: Option<i64>,\n pub original_payment_authorized_currency: Option<common_enums::Currency>,\n pub mandate_metadata: Option<pii::SecretSerdeValue>,\n pub connector_mandate_status: Option<common_enums::ConnectorMandateStatus>,\n pub connector_mandate_request_reference_id: Option<String>,\n}",
|
| 113 |
+
"after_code": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_subtype: Option<common_enums::PaymentMethodType>,\n pub original_payment_authorized_amount: Option<i64>,\n pub original_payment_authorized_currency: Option<common_enums::Currency>,\n pub mandate_metadata: Option<pii::SecretSerdeValue>,\n pub connector_mandate_status: Option<common_enums::ConnectorMandateStatus>,\n pub connector_mandate_request_reference_id: Option<String>,\n}",
|
| 114 |
+
"diff_span": {
|
| 115 |
+
"before": "",
|
| 116 |
+
"after": ""
|
| 117 |
+
},
|
| 118 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba",
|
| 119 |
+
"before_imports": [
|
| 120 |
+
"use masking::Secret;"
|
| 121 |
+
],
|
| 122 |
+
"after_imports": [
|
| 123 |
+
"use masking::{ExposeInterface, Secret};"
|
| 124 |
+
]
|
| 125 |
+
},
|
| 126 |
+
{
|
| 127 |
+
"id": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs::struct::ConnectorNetworkTxnId",
|
| 128 |
+
"file": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs",
|
| 129 |
+
"kind": "struct_item",
|
| 130 |
+
"status": "added",
|
| 131 |
+
"before_code": null,
|
| 132 |
+
"after_code": "pub struct ConnectorNetworkTxnId(masking::Secret<String>);",
|
| 133 |
+
"diff_span": null,
|
| 134 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 135 |
+
},
|
| 136 |
+
{
|
| 137 |
+
"id": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs::ConnectorNetworkTxnId::function::get_id",
|
| 138 |
+
"file": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs",
|
| 139 |
+
"kind": "function_item",
|
| 140 |
+
"status": "added",
|
| 141 |
+
"before_code": null,
|
| 142 |
+
"after_code": "pub fn get_id(&self) -> &masking::Secret<String> {\n &self.0\n }",
|
| 143 |
+
"diff_span": null,
|
| 144 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 145 |
+
},
|
| 146 |
+
{
|
| 147 |
+
"id": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs::ConnectorNetworkTxnId::function::new",
|
| 148 |
+
"file": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs",
|
| 149 |
+
"kind": "function_item",
|
| 150 |
+
"status": "added",
|
| 151 |
+
"before_code": null,
|
| 152 |
+
"after_code": "pub fn new(txn_id: masking::Secret<String>) -> Self {\n Self(txn_id)\n }",
|
| 153 |
+
"diff_span": null,
|
| 154 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 155 |
+
},
|
| 156 |
+
{
|
| 157 |
+
"id": "crates/router/src/connector/adyen.rs::Adyen::function::get_network_txn_id",
|
| 158 |
+
"file": "crates/router/src/connector/adyen.rs",
|
| 159 |
+
"kind": "function_item",
|
| 160 |
+
"status": "added",
|
| 161 |
+
"before_code": null,
|
| 162 |
+
"after_code": "fn get_network_txn_id(\n &self,\n request: &api::IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n let notif = get_webhook_object_from_body(request.body)\n .change_context(errors::ConnectorError::WebhookBodyDecodingFailed)?;\n let optional_network_txn_id =\n notif\n .additional_data\n .network_tx_reference\n .map(|network_txn_id| {\n hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId::new(\n network_txn_id,\n )\n });\n Ok(optional_network_txn_id)\n }",
|
| 163 |
+
"diff_span": null,
|
| 164 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 165 |
+
},
|
| 166 |
+
{
|
| 167 |
+
"id": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs::impl::ConnectorNetworkTxnId",
|
| 168 |
+
"file": "crates/hyperswitch_domain_models/src/router_flow_types/webhooks.rs",
|
| 169 |
+
"kind": "impl_item",
|
| 170 |
+
"status": "added",
|
| 171 |
+
"before_code": null,
|
| 172 |
+
"after_code": "impl ConnectorNetworkTxnId {\n pub fn new(txn_id: masking::Secret<String>) -> Self {\n Self(txn_id)\n }\n pub fn get_id(&self) -> &masking::Secret<String> {\n &self.0\n }\n}",
|
| 173 |
+
"diff_span": null,
|
| 174 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 175 |
+
},
|
| 176 |
+
{
|
| 177 |
+
"id": "crates/hyperswitch_interfaces/src/webhooks.rs::IncomingWebhook::function::get_network_txn_id",
|
| 178 |
+
"file": "crates/hyperswitch_interfaces/src/webhooks.rs",
|
| 179 |
+
"kind": "function_item",
|
| 180 |
+
"status": "added",
|
| 181 |
+
"before_code": null,
|
| 182 |
+
"after_code": "fn get_network_txn_id(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n Ok(None)\n }",
|
| 183 |
+
"diff_span": null,
|
| 184 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 185 |
+
},
|
| 186 |
+
{
|
| 187 |
+
"id": "crates/router/src/services/connector_integration_interface.rs::ConnectorEnum::function::get_network_txn_id",
|
| 188 |
+
"file": "crates/router/src/services/connector_integration_interface.rs",
|
| 189 |
+
"kind": "function_item",
|
| 190 |
+
"status": "added",
|
| 191 |
+
"before_code": null,
|
| 192 |
+
"after_code": "fn get_network_txn_id(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<\n Option<hyperswitch_domain_models::router_flow_types::ConnectorNetworkTxnId>,\n errors::ConnectorError,\n > {\n match self {\n Self::Old(connector) => connector.get_network_txn_id(request),\n Self::New(connector) => connector.get_network_txn_id(request),\n }\n }",
|
| 193 |
+
"diff_span": null,
|
| 194 |
+
"commit_sha": "f47b37f306e094ce626e801bfb68a0b7282677ba"
|
| 195 |
+
}
|
| 196 |
+
]
|
| 197 |
+
}
|
diffs/pr_6776/bc7ac66/diff.json
ADDED
|
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "bc7ac66a2b73e56b30dc9261d1f19c390d0be9e3",
|
| 3 |
+
"pr_number": 6776,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/api_models/src/analytics.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/api_models/src/analytics.rs::struct::ReportRequest",
|
| 10 |
+
"file": "crates/api_models/src/analytics.rs",
|
| 11 |
+
"kind": "struct_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "pub struct ReportRequest {\n pub time_range: TimeRange,\n}",
|
| 16 |
+
"after_code": "pub struct ReportRequest {\n pub time_range: TimeRange,\n pub emails: Option<Vec<Secret<String, EmailStrategy>>>,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": "pub struct ReportRequest {\n pub time_range: TimeRange,\n pub emails: Option<Vec<Secret<String, EmailStrategy>>>,\n}"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "bc7ac66a2b73e56b30dc9261d1f19c390d0be9e3",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"use self::{\n active_payments::ActivePaymentsMetrics,\n api_event::{ApiEventDimensions, ApiEventMetrics},\n auth_events::AuthEventMetrics,\n disputes::{DisputeDimensions, DisputeMetrics},\n frm::{FrmDimensions, FrmMetrics},\n payment_intents::{PaymentIntentDimensions, PaymentIntentMetrics},\n payments::{PaymentDimensions, PaymentDistributions, PaymentMetrics},\n refunds::{RefundDimensions, RefundDistributions, RefundMetrics},\n sdk_events::{SdkEventDimensions, SdkEventMetrics},\n};",
|
| 24 |
+
"pub use common_utils::types::TimeRange;"
|
| 25 |
+
],
|
| 26 |
+
"after_imports": [
|
| 27 |
+
"use masking::Secret;",
|
| 28 |
+
"use self::{\n active_payments::ActivePaymentsMetrics,\n api_event::{ApiEventDimensions, ApiEventMetrics},\n auth_events::AuthEventMetrics,\n disputes::{DisputeDimensions, DisputeMetrics},\n frm::{FrmDimensions, FrmMetrics},\n payment_intents::{PaymentIntentDimensions, PaymentIntentMetrics},\n payments::{PaymentDimensions, PaymentDistributions, PaymentMetrics},\n refunds::{RefundDimensions, RefundDistributions, RefundMetrics},\n sdk_events::{SdkEventDimensions, SdkEventMetrics},\n};",
|
| 29 |
+
"pub use common_utils::types::TimeRange;"
|
| 30 |
+
]
|
| 31 |
+
}
|
| 32 |
+
]
|
| 33 |
+
}
|
diffs/pr_6820/169f1a6/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "169f1a6786c8ea01e75a1810a42cd022a676d0f0",
|
| 3 |
+
"pr_number": 6820,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6826/e3a8a15/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_8014/14c3c54/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_8056/5916603/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|