diff --git "a/diffs/pr_10091/6462e17/diff.json" "b/diffs/pr_10091/6462e17/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_10091/6462e17/diff.json" @@ -0,0 +1,161 @@ +{ + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5", + "pr_number": 10091, + "rust_files": [ + "crates/router/src/core/unified_connector_service/transformers.rs", + "crates/router/src/services/api.rs", + "crates/storage_impl/src/merchant_connector_account.rs" + ], + "diffs": [ + { + "id": "crates/storage_impl/src/merchant_connector_account.rs::impl::kv_router_store::KVRouterStore", + "file": "crates/storage_impl/src/merchant_connector_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl MerchantConnectorAccountInterface for kv_router_store::KVRouterStore {\n type Error = StorageError;\n #[cfg(feature = \"v1\")]\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_merchant_id_connector_label(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_label: &str,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_merchant_id_connector_label(\n state,\n merchant_id,\n connector_label,\n key_store,\n )\n .await\n }\n\n #[cfg(feature = \"v1\")]\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_profile_id_connector_name(\n &self,\n state: &KeyManagerState,\n profile_id: &common_utils::id_type::ProfileId,\n connector_name: &str,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_profile_id_connector_name(\n state,\n profile_id,\n connector_name,\n key_store,\n )\n .await\n }\n\n #[cfg(feature = \"v1\")]\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_merchant_id_connector_name(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n key_store: &MerchantKeyStore,\n ) -> CustomResult, Self::Error> {\n self.router_store\n .find_merchant_connector_account_by_merchant_id_connector_name(\n state,\n merchant_id,\n connector_name,\n key_store,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v1\")]\n async fn find_by_merchant_connector_account_merchant_id_merchant_connector_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id: &common_utils::id_type::MerchantConnectorAccountId,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_by_merchant_connector_account_merchant_id_merchant_connector_id(\n state,\n merchant_id,\n merchant_connector_id,\n key_store,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v2\")]\n async fn find_merchant_connector_account_by_id(\n &self,\n state: &KeyManagerState,\n id: &common_utils::id_type::MerchantConnectorAccountId,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_id(state, id, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n async fn insert_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n t: domain::MerchantConnectorAccount,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .insert_merchant_connector_account(state, t, key_store)\n .await\n }\n\n async fn list_enabled_connector_accounts_by_profile_id(\n &self,\n state: &KeyManagerState,\n profile_id: &common_utils::id_type::ProfileId,\n key_store: &MerchantKeyStore,\n connector_type: common_enums::ConnectorType,\n ) -> CustomResult, Self::Error> {\n self.router_store\n .list_enabled_connector_accounts_by_profile_id(\n state,\n profile_id,\n key_store,\n connector_type,\n )\n .await\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_merchant_id_and_disabled_list(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n get_disabled: bool,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_merchant_id_and_disabled_list(\n state,\n merchant_id,\n get_disabled,\n key_store,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(all(feature = \"olap\", feature = \"v2\"))]\n async fn list_connector_account_by_profile_id(\n &self,\n state: &KeyManagerState,\n profile_id: &common_utils::id_type::ProfileId,\n key_store: &MerchantKeyStore,\n ) -> CustomResult, Self::Error> {\n self.router_store\n .list_connector_account_by_profile_id(state, profile_id, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n async fn update_multiple_merchant_connector_accounts(\n &self,\n merchant_connector_accounts: Vec<(\n domain::MerchantConnectorAccount,\n storage::MerchantConnectorAccountUpdateInternal,\n )>,\n ) -> CustomResult<(), Self::Error> {\n self.router_store\n .update_multiple_merchant_connector_accounts(merchant_connector_accounts)\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v1\")]\n async fn update_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantConnectorAccount,\n merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v2\")]\n async fn update_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantConnectorAccount,\n merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v1\")]\n async fn delete_merchant_connector_account_by_merchant_id_merchant_connector_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id: &common_utils::id_type::MerchantConnectorAccountId,\n ) -> CustomResult {\n self.router_store\n .delete_merchant_connector_account_by_merchant_id_merchant_connector_id(\n merchant_id,\n merchant_connector_id,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v2\")]\n async fn delete_merchant_connector_account_by_id(\n &self,\n id: &common_utils::id_type::MerchantConnectorAccountId,\n ) -> CustomResult {\n self.router_store\n .delete_merchant_connector_account_by_id(id)\n .await\n }\n}", + "after_code": "impl MerchantConnectorAccountInterface for kv_router_store::KVRouterStore {\n type Error = StorageError;\n #[cfg(feature = \"v1\")]\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_merchant_id_connector_label(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_label: &str,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_merchant_id_connector_label(\n state,\n merchant_id,\n connector_label,\n key_store,\n )\n .await\n }\n\n #[cfg(feature = \"v1\")]\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_profile_id_connector_name(\n &self,\n state: &KeyManagerState,\n profile_id: &common_utils::id_type::ProfileId,\n connector_name: &str,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_profile_id_connector_name(\n state,\n profile_id,\n connector_name,\n key_store,\n )\n .await\n }\n\n #[cfg(feature = \"v1\")]\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_merchant_id_connector_name(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n connector_name: &str,\n key_store: &MerchantKeyStore,\n ) -> CustomResult, Self::Error> {\n self.router_store\n .find_merchant_connector_account_by_merchant_id_connector_name(\n state,\n merchant_id,\n connector_name,\n key_store,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v1\")]\n async fn find_by_merchant_connector_account_merchant_id_merchant_connector_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id: &common_utils::id_type::MerchantConnectorAccountId,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_by_merchant_connector_account_merchant_id_merchant_connector_id(\n state,\n merchant_id,\n merchant_connector_id,\n key_store,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v2\")]\n async fn find_merchant_connector_account_by_id(\n &self,\n state: &KeyManagerState,\n id: &common_utils::id_type::MerchantConnectorAccountId,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_id(state, id, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n async fn insert_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n t: domain::MerchantConnectorAccount,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .insert_merchant_connector_account(state, t, key_store)\n .await\n }\n\n async fn list_enabled_connector_accounts_by_profile_id(\n &self,\n state: &KeyManagerState,\n profile_id: &common_utils::id_type::ProfileId,\n key_store: &MerchantKeyStore,\n connector_type: common_enums::ConnectorType,\n ) -> CustomResult, Self::Error> {\n self.router_store\n .list_enabled_connector_accounts_by_profile_id(\n state,\n profile_id,\n key_store,\n connector_type,\n )\n .await\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_connector_account_by_merchant_id_and_disabled_list(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n get_disabled: bool,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .find_merchant_connector_account_by_merchant_id_and_disabled_list(\n state,\n merchant_id,\n get_disabled,\n key_store,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(all(feature = \"olap\", feature = \"v2\"))]\n async fn list_connector_account_by_profile_id(\n &self,\n state: &KeyManagerState,\n profile_id: &common_utils::id_type::ProfileId,\n key_store: &MerchantKeyStore,\n ) -> CustomResult, Self::Error> {\n self.router_store\n .list_connector_account_by_profile_id(state, profile_id, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n async fn update_multiple_merchant_connector_accounts(\n &self,\n merchant_connector_accounts: Vec<(\n domain::MerchantConnectorAccount,\n storage::MerchantConnectorAccountUpdateInternal,\n )>,\n ) -> CustomResult<(), Self::Error> {\n self.router_store\n .update_multiple_merchant_connector_accounts(merchant_connector_accounts)\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v1\")]\n async fn update_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantConnectorAccount,\n merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v2\")]\n async fn update_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantConnectorAccount,\n merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v1\")]\n async fn delete_merchant_connector_account_by_merchant_id_merchant_connector_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_connector_id: &common_utils::id_type::MerchantConnectorAccountId,\n ) -> CustomResult {\n self.router_store\n .delete_merchant_connector_account_by_merchant_id_merchant_connector_id(\n merchant_id,\n merchant_connector_id,\n )\n .await\n }\n\n #[instrument(skip_all)]\n #[cfg(feature = \"v2\")]\n async fn delete_merchant_connector_account_by_id(\n &self,\n id: &common_utils::id_type::MerchantConnectorAccountId,\n ) -> CustomResult {\n self.router_store\n .delete_merchant_connector_account_by_id(id)\n .await\n }\n}", + "diff_span": { + "before": " key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }", + "after": " key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }" + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::PaymentServiceRepeatEverythingRequest::function::foreign_try_from", + "file": "crates/router/src/core/unified_connector_service/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let mandate_reference = match &router_data.request.mandate_id {\n Some(mandate) => match &mandate.mandate_reference_id {\n Some(api_models::payments::MandateReferenceId::ConnectorMandateId(\n connector_mandate_id,\n )) => Some(payments_grpc::MandateReference {\n mandate_id: connector_mandate_id.get_connector_mandate_id(),\n payment_method_id: connector_mandate_id.get_payment_method_id(),\n }),\n _ => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n },\n None => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n };\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n mandate_reference,\n amount: router_data.request.amount,\n currency: currency.into(),\n minor_amount: router_data.request.amount,\n merchant_order_reference_id: router_data.request.merchant_order_reference_id.clone(),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n webhook_url: router_data.request.webhook_url.clone(),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n test_mode: router_data.test_mode,\n payment_method_type: None,\n merchant_account_metadata: HashMap::new(),\n state,\n return_url: None,\n description: None,\n connector_customer_id: None,\n address: None,\n off_session: None,\n recurring_mandate_payment_data: None,\n })\n }", + "after_code": "fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let mandate_reference = match &router_data.request.mandate_id {\n Some(mandate) => match &mandate.mandate_reference_id {\n Some(api_models::payments::MandateReferenceId::ConnectorMandateId(\n connector_mandate_id,\n )) => Some(payments_grpc::MandateReference {\n mandate_id: connector_mandate_id.get_connector_mandate_id(),\n payment_method_id: connector_mandate_id.get_payment_method_id(),\n }),\n _ => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n },\n None => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n };\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n mandate_reference,\n amount: router_data.request.amount,\n currency: currency.into(),\n minor_amount: router_data.request.amount,\n merchant_order_reference_id: router_data.request.merchant_order_reference_id.clone(),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n webhook_url: router_data.request.webhook_url.clone(),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n test_mode: router_data.test_mode,\n payment_method_type: None,\n state,\n return_url: None,\n description: None,\n connector_customer_id: None,\n address: None,\n off_session: None,\n recurring_mandate_payment_data: None,\n })\n }", + "diff_span": { + "before": " test_mode: router_data.test_mode,\n payment_method_type: None,\n merchant_account_metadata: HashMap::new(),\n state,\n return_url: None,", + "after": " })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n webhook_url: router_data.request.webhook_url.clone(),\n capture_method: capture_method.map(|capture_method| capture_method.into())," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/services/api.rs::function::extract_mapped_fields", + "file": "crates/router/src/services/api.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn extract_mapped_fields(\n value: &serde_json::Value,\n mapping: Option<&HashMap>,\n existing_enhancement: Option<&serde_json::Value>,\n) -> Option {\n let mapping = mapping?;\n\n if mapping.is_empty() {\n return existing_enhancement.cloned();\n }\n\n let mut enhancement = match existing_enhancement {\n Some(existing) if existing.is_object() => existing.clone(),\n _ => serde_json::json!({}),\n };\n\n for (dot_path, output_key) in mapping {\n if let Some(extracted_value) = extract_field_by_dot_path(value, dot_path) {\n if let Some(obj) = enhancement.as_object_mut() {\n obj.insert(output_key.clone(), extracted_value);\n }\n }\n }\n\n if enhancement.as_object().is_some_and(|obj| !obj.is_empty()) {\n Some(enhancement)\n } else {\n None\n }\n}", + "after_code": "pub fn extract_mapped_fields(\n values: &[&serde_json::Value],\n mapping: Option<&HashMap>,\n existing_enhancement: Option<&serde_json::Value>,\n) -> Option {\n let mapping = mapping?;\n\n if mapping.is_empty() {\n return existing_enhancement.cloned();\n }\n\n let mut enhancement = match existing_enhancement {\n Some(existing) if existing.is_object() => existing.clone(),\n _ => serde_json::json!({}),\n };\n\n for (dot_path, output_key) in mapping {\n let mut extracted_value = None;\n\n // Try to extract from values in order of priority\n for value in values {\n if let Some(found_value) = extract_field_by_dot_path(value, dot_path) {\n extracted_value = Some(found_value);\n break;\n }\n }\n\n if let Some(value) = extracted_value {\n if let Some(obj) = enhancement.as_object_mut() {\n obj.insert(output_key.clone(), value);\n }\n }\n }\n\n if enhancement.as_object().is_some_and(|obj| !obj.is_empty()) {\n Some(enhancement)\n } else {\n None\n }\n}", + "diff_span": { + "before": "pub fn extract_mapped_fields(\n value: &serde_json::Value,\n mapping: Option<&HashMap>,\n existing_enhancement: Option<&serde_json::Value>,\n) -> Option {\n let mapping = mapping?;\n\n if mapping.is_empty() {\n return existing_enhancement.cloned();\n }\n\n let mut enhancement = match existing_enhancement {\n Some(existing) if existing.is_object() => existing.clone(),\n _ => serde_json::json!({}),\n };\n\n for (dot_path, output_key) in mapping {\n if let Some(extracted_value) = extract_field_by_dot_path(value, dot_path) {\n if let Some(obj) = enhancement.as_object_mut() {\n obj.insert(output_key.clone(), extracted_value);\n }\n }", + "after": "pub fn extract_mapped_fields(\n values: &[&serde_json::Value],\n mapping: Option<&HashMap>,\n existing_enhancement: Option<&serde_json::Value>,\n) -> Option {\n let mapping = mapping?;\n\n if mapping.is_empty() {\n return existing_enhancement.cloned();\n }\n\n let mut enhancement = match existing_enhancement {\n Some(existing) if existing.is_object() => existing.clone(),\n _ => serde_json::json!({}),\n };\n\n for (dot_path, output_key) in mapping {\n let mut extracted_value = None;\n\n // Try to extract from values in order of priority\n for value in values {\n if let Some(found_value) = extract_field_by_dot_path(value, dot_path) {\n extracted_value = Some(found_value);\n break;\n }\n }\n\n if let Some(value) = extracted_value {\n if let Some(obj) = enhancement.as_object_mut() {\n obj.insert(output_key.clone(), value);\n }\n }" + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/services/api.rs::function::server_wrap_util", + "file": "crates/router/src/services/api.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn server_wrap_util<'a, 'b, U, T, Q, F, Fut, E, OErr>(\n flow: &'a impl router_env::types::FlowMetric,\n state: web::Data,\n incoming_request_header: &HeaderMap,\n request: &'a HttpRequest,\n payload: T,\n func: F,\n api_auth: &dyn AuthenticateAndFetch,\n lock_action: api_locking::LockAction,\n) -> CustomResult, OErr>\nwhere\n F: Fn(SessionState, U, T, ReqState) -> Fut,\n 'b: 'a,\n Fut: Future, E>>,\n Q: Serialize + Debug + 'a + ApiEventMetric,\n T: Debug + Serialize + ApiEventMetric,\n E: ErrorSwitch + error_stack::Context,\n OErr: ResponseError + error_stack::Context + Serialize,\n errors::ApiErrorResponse: ErrorSwitch,\n{\n let request_id = RequestId::extract(request)\n .await\n .attach_printable(\"Unable to extract request id from request\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?;\n\n let mut app_state = state.get_ref().clone();\n\n let start_instant = Instant::now();\n let serialized_request = masking::masked_serialize(&payload)\n .attach_printable(\"Failed to serialize json request\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?;\n\n let mut event_type = payload.get_api_event_type();\n let tenant_id = if !state.conf.multitenancy.enabled {\n common_utils::id_type::TenantId::try_from_string(DEFAULT_TENANT.to_owned())\n .attach_printable(\"Unable to get default tenant id\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?\n } else {\n let request_tenant_id = incoming_request_header\n .get(TENANT_HEADER)\n .and_then(|value| value.to_str().ok())\n .ok_or_else(|| errors::ApiErrorResponse::MissingTenantId.switch())\n .and_then(|header_value| {\n common_utils::id_type::TenantId::try_from_string(header_value.to_string()).map_err(\n |_| {\n errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\"`{}` header is invalid\", headers::X_TENANT_ID),\n }\n .switch()\n },\n )\n })?;\n\n state\n .conf\n .multitenancy\n .get_tenant(&request_tenant_id)\n .map(|tenant| tenant.tenant_id.clone())\n .ok_or(\n errors::ApiErrorResponse::InvalidTenant {\n tenant_id: request_tenant_id.get_string_repr().to_string(),\n }\n .switch(),\n )?\n };\n let locale = utils::get_locale_from_header(&incoming_request_header.clone());\n let mut session_state =\n Arc::new(app_state.clone()).get_session_state(&tenant_id, Some(locale), || {\n errors::ApiErrorResponse::InvalidTenant {\n tenant_id: tenant_id.get_string_repr().to_string(),\n }\n .switch()\n })?;\n session_state.add_request_id(request_id);\n let mut request_state = session_state.get_req_state();\n\n request_state.event_context.record_info(request_id);\n request_state\n .event_context\n .record_info((\"flow\".to_string(), flow.to_string()));\n\n request_state.event_context.record_info((\n \"tenant_id\".to_string(),\n tenant_id.get_string_repr().to_string(),\n ));\n\n // Currently auth failures are not recorded as API events\n let (auth_out, auth_type) = api_auth\n .authenticate_and_fetch(request.headers(), &session_state)\n .await\n .switch()?;\n\n request_state.event_context.record_info(auth_type.clone());\n\n let merchant_id = auth_type\n .get_merchant_id()\n .cloned()\n .unwrap_or(common_utils::id_type::MerchantId::get_merchant_id_not_found());\n\n app_state.add_flow_name(flow.to_string());\n\n tracing::Span::current().record(\"merchant_id\", merchant_id.get_string_repr().to_owned());\n\n let output = {\n lock_action\n .clone()\n .perform_locking_action(&session_state, merchant_id.to_owned())\n .await\n .switch()?;\n let res = func(session_state.clone(), auth_out, payload, request_state)\n .await\n .switch();\n lock_action\n .free_lock_action(&session_state, merchant_id.to_owned())\n .await\n .switch()?;\n res\n };\n let request_duration = Instant::now()\n .saturating_duration_since(start_instant)\n .as_millis();\n\n let mut serialized_response = None;\n let mut error = None;\n let mut overhead_latency = None;\n\n let status_code = match output.as_ref() {\n Ok(res) => {\n if let ApplicationResponse::Json(data) = res {\n serialized_response.replace(\n masking::masked_serialize(&data)\n .attach_printable(\"Failed to serialize json response\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?,\n );\n } else if let ApplicationResponse::JsonWithHeaders((data, headers)) = res {\n serialized_response.replace(\n masking::masked_serialize(&data)\n .attach_printable(\"Failed to serialize json response\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?,\n );\n\n if let Some((_, value)) = headers.iter().find(|(key, _)| key == X_HS_LATENCY) {\n if let Ok(external_latency) = value.clone().into_inner().parse::() {\n overhead_latency.replace(external_latency);\n }\n }\n }\n event_type = res.get_api_event_type().or(event_type);\n\n metrics::request::track_response_status_code(res)\n }\n Err(err) => {\n error.replace(\n serde_json::to_value(err.current_context())\n .attach_printable(\"Failed to serialize json response\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())\n .ok()\n .into(),\n );\n err.current_context().status_code().as_u16().into()\n }\n };\n\n let infra = extract_mapped_fields(\n &serialized_request,\n state.enhancement.as_ref(),\n state.infra_components.as_ref(),\n );\n\n let api_event = ApiEvent::new(\n tenant_id,\n Some(merchant_id.clone()),\n flow,\n &request_id,\n request_duration,\n status_code,\n serialized_request,\n serialized_response,\n overhead_latency,\n auth_type,\n error,\n event_type.unwrap_or(ApiEventsType::Miscellaneous),\n request,\n request.method(),\n infra.clone(),\n );\n\n state.event_handler().log_event(&api_event);\n\n output\n}", + "after_code": "pub async fn server_wrap_util<'a, 'b, U, T, Q, F, Fut, E, OErr>(\n flow: &'a impl router_env::types::FlowMetric,\n state: web::Data,\n incoming_request_header: &HeaderMap,\n request: &'a HttpRequest,\n payload: T,\n func: F,\n api_auth: &dyn AuthenticateAndFetch,\n lock_action: api_locking::LockAction,\n) -> CustomResult, OErr>\nwhere\n F: Fn(SessionState, U, T, ReqState) -> Fut,\n 'b: 'a,\n Fut: Future, E>>,\n Q: Serialize + Debug + 'a + ApiEventMetric,\n T: Debug + Serialize + ApiEventMetric,\n E: ErrorSwitch + error_stack::Context,\n OErr: ResponseError + error_stack::Context + Serialize,\n errors::ApiErrorResponse: ErrorSwitch,\n{\n let request_id = RequestId::extract(request)\n .await\n .attach_printable(\"Unable to extract request id from request\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?;\n\n let mut app_state = state.get_ref().clone();\n\n let start_instant = Instant::now();\n let serialized_request = masking::masked_serialize(&payload)\n .attach_printable(\"Failed to serialize json request\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?;\n\n let mut event_type = payload.get_api_event_type();\n let tenant_id = if !state.conf.multitenancy.enabled {\n common_utils::id_type::TenantId::try_from_string(DEFAULT_TENANT.to_owned())\n .attach_printable(\"Unable to get default tenant id\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?\n } else {\n let request_tenant_id = incoming_request_header\n .get(TENANT_HEADER)\n .and_then(|value| value.to_str().ok())\n .ok_or_else(|| errors::ApiErrorResponse::MissingTenantId.switch())\n .and_then(|header_value| {\n common_utils::id_type::TenantId::try_from_string(header_value.to_string()).map_err(\n |_| {\n errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\"`{}` header is invalid\", headers::X_TENANT_ID),\n }\n .switch()\n },\n )\n })?;\n\n state\n .conf\n .multitenancy\n .get_tenant(&request_tenant_id)\n .map(|tenant| tenant.tenant_id.clone())\n .ok_or(\n errors::ApiErrorResponse::InvalidTenant {\n tenant_id: request_tenant_id.get_string_repr().to_string(),\n }\n .switch(),\n )?\n };\n let locale = utils::get_locale_from_header(&incoming_request_header.clone());\n let mut session_state =\n Arc::new(app_state.clone()).get_session_state(&tenant_id, Some(locale), || {\n errors::ApiErrorResponse::InvalidTenant {\n tenant_id: tenant_id.get_string_repr().to_string(),\n }\n .switch()\n })?;\n session_state.add_request_id(request_id);\n let mut request_state = session_state.get_req_state();\n\n request_state.event_context.record_info(request_id);\n request_state\n .event_context\n .record_info((\"flow\".to_string(), flow.to_string()));\n\n request_state.event_context.record_info((\n \"tenant_id\".to_string(),\n tenant_id.get_string_repr().to_string(),\n ));\n\n // Currently auth failures are not recorded as API events\n let (auth_out, auth_type) = api_auth\n .authenticate_and_fetch(request.headers(), &session_state)\n .await\n .switch()?;\n\n request_state.event_context.record_info(auth_type.clone());\n\n let merchant_id = auth_type\n .get_merchant_id()\n .cloned()\n .unwrap_or(common_utils::id_type::MerchantId::get_merchant_id_not_found());\n\n app_state.add_flow_name(flow.to_string());\n\n tracing::Span::current().record(\"merchant_id\", merchant_id.get_string_repr().to_owned());\n\n let output = {\n lock_action\n .clone()\n .perform_locking_action(&session_state, merchant_id.to_owned())\n .await\n .switch()?;\n let res = func(session_state.clone(), auth_out, payload, request_state)\n .await\n .switch();\n lock_action\n .free_lock_action(&session_state, merchant_id.to_owned())\n .await\n .switch()?;\n res\n };\n let request_duration = Instant::now()\n .saturating_duration_since(start_instant)\n .as_millis();\n\n let mut serialized_response = None;\n let mut error = None;\n let mut overhead_latency = None;\n\n let status_code = match output.as_ref() {\n Ok(res) => {\n if let ApplicationResponse::Json(data) = res {\n serialized_response.replace(\n masking::masked_serialize(&data)\n .attach_printable(\"Failed to serialize json response\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?,\n );\n } else if let ApplicationResponse::JsonWithHeaders((data, headers)) = res {\n serialized_response.replace(\n masking::masked_serialize(&data)\n .attach_printable(\"Failed to serialize json response\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())?,\n );\n\n if let Some((_, value)) = headers.iter().find(|(key, _)| key == X_HS_LATENCY) {\n if let Ok(external_latency) = value.clone().into_inner().parse::() {\n overhead_latency.replace(external_latency);\n }\n }\n }\n event_type = res.get_api_event_type().or(event_type);\n\n metrics::request::track_response_status_code(res)\n }\n Err(err) => {\n error.replace(\n serde_json::to_value(err.current_context())\n .attach_printable(\"Failed to serialize json response\")\n .change_context(errors::ApiErrorResponse::InternalServerError.switch())\n .ok()\n .into(),\n );\n err.current_context().status_code().as_u16().into()\n }\n };\n\n let values: Vec<&serde_json::Value> = [Some(&serialized_request), serialized_response.as_ref()]\n .into_iter()\n .flatten()\n .collect();\n\n let infra = extract_mapped_fields(\n &values,\n state.enhancement.as_ref(),\n state.infra_components.as_ref(),\n );\n\n let api_event = ApiEvent::new(\n tenant_id,\n Some(merchant_id.clone()),\n flow,\n &request_id,\n request_duration,\n status_code,\n serialized_request,\n serialized_response,\n overhead_latency,\n auth_type,\n error,\n event_type.unwrap_or(ApiEventsType::Miscellaneous),\n request,\n request.method(),\n infra.clone(),\n );\n\n state.event_handler().log_event(&api_event);\n\n output\n}", + "diff_span": { + "before": "\n let infra = extract_mapped_fields(\n &serialized_request,\n state.enhancement.as_ref(),\n state.infra_components.as_ref(),", + "after": " };\n\n let values: Vec<&serde_json::Value> = [Some(&serialized_request), serialized_response.as_ref()]\n .into_iter()\n .flatten()\n .collect();\n\n let infra = extract_mapped_fields(\n &values,\n state.enhancement.as_ref(),\n state.infra_components.as_ref()," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::PaymentServiceRegisterRequest", + "file": "crates/router/src/core/unified_connector_service/transformers.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n transformers::ForeignTryFrom<\n &RouterData,\n > for payments_grpc::PaymentServiceRegisterRequest\n{\n type Error = error_stack::Report;\n\n fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n currency: currency.into(),\n payment_method,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: false,\n authentication_data: None,\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .map(|secret| secret.peek())\n .and_then(|val| val.as_object()) //secret\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n return_url: router_data.request.router_return_url.clone(),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n\n session_token: None,\n order_tax_amount: None,\n order_category: None,\n merchant_order_reference_id: None,\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|cost| cost.get_amount_as_i64()),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n request_extended_authorization: None,\n customer_acceptance,\n browser_info,\n payment_experience: None,\n connector_customer_id: router_data.connector_customer.clone(),\n merchant_account_metadata: HashMap::new(),\n state,\n })\n }\n}", + "after_code": "impl\n transformers::ForeignTryFrom<\n &RouterData,\n > for payments_grpc::PaymentServiceRegisterRequest\n{\n type Error = error_stack::Report;\n\n fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n currency: currency.into(),\n payment_method,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: false,\n authentication_data: None,\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .map(|secret| secret.peek())\n .and_then(|val| val.as_object()) //secret\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n return_url: router_data.request.router_return_url.clone(),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n\n session_token: None,\n order_tax_amount: None,\n order_category: None,\n merchant_order_reference_id: None,\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|cost| cost.get_amount_as_i64()),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n request_extended_authorization: None,\n customer_acceptance,\n browser_info,\n payment_experience: None,\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n connector_customer_id: router_data.connector_customer.clone(),\n state,\n })\n }\n}", + "diff_span": { + "before": " payment_experience: None,\n connector_customer_id: router_data.connector_customer.clone(),\n merchant_account_metadata: HashMap::new(),\n state,\n })", + "after": " browser_info,\n payment_experience: None,\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n connector_customer_id: router_data.connector_customer.clone(),\n state," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/storage_impl/src/merchant_connector_account.rs::kv_router_store::KVRouterStore::function::update_merchant_connector_account", + "file": "crates/storage_impl/src/merchant_connector_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn update_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantConnectorAccount,\n merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }", + "after_code": "async fn update_merchant_connector_account(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantConnectorAccount,\n merchant_connector_account: storage::MerchantConnectorAccountUpdateInternal,\n key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }", + "diff_span": { + "before": " key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }", + "after": " key_store: &MerchantKeyStore,\n ) -> CustomResult {\n self.router_store\n .update_merchant_connector_account(state, this, merchant_connector_account, key_store)\n .await\n }" + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::PaymentServiceRepeatEverythingRequest", + "file": "crates/router/src/core/unified_connector_service/transformers.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n transformers::ForeignTryFrom<\n &RouterData,\n > for payments_grpc::PaymentServiceRepeatEverythingRequest\n{\n type Error = error_stack::Report;\n\n fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let mandate_reference = match &router_data.request.mandate_id {\n Some(mandate) => match &mandate.mandate_reference_id {\n Some(api_models::payments::MandateReferenceId::ConnectorMandateId(\n connector_mandate_id,\n )) => Some(payments_grpc::MandateReference {\n mandate_id: connector_mandate_id.get_connector_mandate_id(),\n payment_method_id: connector_mandate_id.get_payment_method_id(),\n }),\n _ => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n },\n None => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n };\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n mandate_reference,\n amount: router_data.request.amount,\n currency: currency.into(),\n minor_amount: router_data.request.amount,\n merchant_order_reference_id: router_data.request.merchant_order_reference_id.clone(),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n webhook_url: router_data.request.webhook_url.clone(),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n test_mode: router_data.test_mode,\n payment_method_type: None,\n merchant_account_metadata: HashMap::new(),\n state,\n return_url: None,\n description: None,\n connector_customer_id: None,\n address: None,\n off_session: None,\n recurring_mandate_payment_data: None,\n })\n }\n}", + "after_code": "impl\n transformers::ForeignTryFrom<\n &RouterData,\n > for payments_grpc::PaymentServiceRepeatEverythingRequest\n{\n type Error = error_stack::Report;\n\n fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let mandate_reference = match &router_data.request.mandate_id {\n Some(mandate) => match &mandate.mandate_reference_id {\n Some(api_models::payments::MandateReferenceId::ConnectorMandateId(\n connector_mandate_id,\n )) => Some(payments_grpc::MandateReference {\n mandate_id: connector_mandate_id.get_connector_mandate_id(),\n payment_method_id: connector_mandate_id.get_payment_method_id(),\n }),\n _ => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n },\n None => {\n return Err(UnifiedConnectorServiceError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n }\n .into())\n }\n };\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n mandate_reference,\n amount: router_data.request.amount,\n currency: currency.into(),\n minor_amount: router_data.request.amount,\n merchant_order_reference_id: router_data.request.merchant_order_reference_id.clone(),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n webhook_url: router_data.request.webhook_url.clone(),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n test_mode: router_data.test_mode,\n payment_method_type: None,\n state,\n return_url: None,\n description: None,\n connector_customer_id: None,\n address: None,\n off_session: None,\n recurring_mandate_payment_data: None,\n })\n }\n}", + "diff_span": { + "before": " test_mode: router_data.test_mode,\n payment_method_type: None,\n merchant_account_metadata: HashMap::new(),\n state,\n return_url: None,", + "after": " })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n webhook_url: router_data.request.webhook_url.clone(),\n capture_method: capture_method.map(|capture_method| capture_method.into())," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::PaymentServiceRegisterRequest::function::foreign_try_from", + "file": "crates/router/src/core/unified_connector_service/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n currency: currency.into(),\n payment_method,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: false,\n authentication_data: None,\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .map(|secret| secret.peek())\n .and_then(|val| val.as_object()) //secret\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n return_url: router_data.request.router_return_url.clone(),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n\n session_token: None,\n order_tax_amount: None,\n order_category: None,\n merchant_order_reference_id: None,\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|cost| cost.get_amount_as_i64()),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n request_extended_authorization: None,\n customer_acceptance,\n browser_info,\n payment_experience: None,\n connector_customer_id: router_data.connector_customer.clone(),\n merchant_account_metadata: HashMap::new(),\n state,\n })\n }", + "after_code": "fn foreign_try_from(\n router_data: &RouterData,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n let state = router_data\n .access_token\n .as_ref()\n .map(ConnectorState::foreign_from);\n\n Ok(Self {\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n currency: currency.into(),\n payment_method,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: false,\n authentication_data: None,\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .map(|secret| secret.peek())\n .and_then(|val| val.as_object()) //secret\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n return_url: router_data.request.router_return_url.clone(),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n\n session_token: None,\n order_tax_amount: None,\n order_category: None,\n merchant_order_reference_id: None,\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|cost| cost.get_amount_as_i64()),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n request_extended_authorization: None,\n customer_acceptance,\n browser_info,\n payment_experience: None,\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n connector_customer_id: router_data.connector_customer.clone(),\n state,\n })\n }", + "diff_span": { + "before": " payment_experience: None,\n connector_customer_id: router_data.connector_customer.clone(),\n merchant_account_metadata: HashMap::new(),\n state,\n })", + "after": " browser_info,\n payment_experience: None,\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n connector_customer_id: router_data.connector_customer.clone(),\n state," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::PaymentServiceAuthorizeRequest::function::foreign_try_from", + "file": "crates/router/src/core/unified_connector_service/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_try_from(\n router_data: &RouterData<\n ExternalVaultProxy,\n ExternalVaultProxyPaymentsData,\n PaymentsResponseData,\n >,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let authentication_data = router_data\n .request\n .authentication_data\n .clone()\n .map(payments_grpc::AuthenticationData::foreign_try_from)\n .transpose()?;\n\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n Ok(Self {\n amount: router_data.request.amount,\n currency: currency.into(),\n payment_method,\n return_url: router_data.request.router_return_url.clone(),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n\n session_token: None,\n order_tax_amount: router_data\n .request\n .order_tax_amount\n .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n customer_acceptance,\n order_category: router_data.request.order_category.clone(),\n payment_experience: None,\n authentication_data,\n request_extended_authorization: router_data\n .request\n .request_extended_authorization\n .map(|request_extended_authorization| request_extended_authorization.is_true()),\n merchant_order_reference_id: router_data\n .request\n .merchant_order_reference_id\n .as_ref()\n .map(|merchant_order_reference_id| {\n merchant_order_reference_id.get_string_repr().to_string()\n }),\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n test_mode: router_data.test_mode,\n connector_customer_id: router_data.connector_customer.clone(),\n state: None,\n merchant_account_metadata: HashMap::new(),\n description: None,\n setup_mandate_details: None,\n statement_descriptor_name: None,\n statement_descriptor_suffix: None,\n })\n }", + "after_code": "fn foreign_try_from(\n router_data: &RouterData<\n ExternalVaultProxy,\n ExternalVaultProxyPaymentsData,\n PaymentsResponseData,\n >,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let authentication_data = router_data\n .request\n .authentication_data\n .clone()\n .map(payments_grpc::AuthenticationData::foreign_try_from)\n .transpose()?;\n\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n Ok(Self {\n amount: router_data.request.amount,\n currency: currency.into(),\n payment_method,\n return_url: router_data.request.router_return_url.clone(),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n\n session_token: None,\n order_tax_amount: router_data\n .request\n .order_tax_amount\n .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n customer_acceptance,\n order_category: router_data.request.order_category.clone(),\n payment_experience: None,\n authentication_data,\n request_extended_authorization: router_data\n .request\n .request_extended_authorization\n .map(|request_extended_authorization| request_extended_authorization.is_true()),\n merchant_order_reference_id: router_data\n .request\n .merchant_order_reference_id\n .as_ref()\n .map(|merchant_order_reference_id| {\n merchant_order_reference_id.get_string_repr().to_string()\n }),\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n test_mode: router_data.test_mode,\n connector_customer_id: router_data.connector_customer.clone(),\n state: None,\n merchant_account_metadata: HashMap::new(),\n description: None,\n setup_mandate_details: None,\n statement_descriptor_name: None,\n statement_descriptor_suffix: None,\n })\n }", + "diff_span": { + "before": "", + "after": " })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n test_mode: router_data.test_mode,\n connector_customer_id: router_data.connector_customer.clone()," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + }, + { + "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::PaymentServiceAuthorizeRequest", + "file": "crates/router/src/core/unified_connector_service/transformers.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n transformers::ForeignTryFrom<\n &RouterData,\n > for payments_grpc::PaymentServiceAuthorizeRequest\n{\n type Error = error_stack::Report;\n\n fn foreign_try_from(\n router_data: &RouterData<\n ExternalVaultProxy,\n ExternalVaultProxyPaymentsData,\n PaymentsResponseData,\n >,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let authentication_data = router_data\n .request\n .authentication_data\n .clone()\n .map(payments_grpc::AuthenticationData::foreign_try_from)\n .transpose()?;\n\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n Ok(Self {\n amount: router_data.request.amount,\n currency: currency.into(),\n payment_method,\n return_url: router_data.request.router_return_url.clone(),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n\n session_token: None,\n order_tax_amount: router_data\n .request\n .order_tax_amount\n .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n customer_acceptance,\n order_category: router_data.request.order_category.clone(),\n payment_experience: None,\n authentication_data,\n request_extended_authorization: router_data\n .request\n .request_extended_authorization\n .map(|request_extended_authorization| request_extended_authorization.is_true()),\n merchant_order_reference_id: router_data\n .request\n .merchant_order_reference_id\n .as_ref()\n .map(|merchant_order_reference_id| {\n merchant_order_reference_id.get_string_repr().to_string()\n }),\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n test_mode: router_data.test_mode,\n connector_customer_id: router_data.connector_customer.clone(),\n state: None,\n merchant_account_metadata: HashMap::new(),\n description: None,\n setup_mandate_details: None,\n statement_descriptor_name: None,\n statement_descriptor_suffix: None,\n })\n }\n}", + "after_code": "impl\n transformers::ForeignTryFrom<\n &RouterData,\n > for payments_grpc::PaymentServiceAuthorizeRequest\n{\n type Error = error_stack::Report;\n\n fn foreign_try_from(\n router_data: &RouterData<\n ExternalVaultProxy,\n ExternalVaultProxyPaymentsData,\n PaymentsResponseData,\n >,\n ) -> Result {\n let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n let payment_method = router_data\n .request\n .payment_method_type\n .map(|payment_method_type| {\n unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n router_data.request.payment_method_data.clone(),\n payment_method_type,\n )\n })\n .transpose()?;\n\n let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n let browser_info = router_data\n .request\n .browser_info\n .clone()\n .map(payments_grpc::BrowserInformation::foreign_try_from)\n .transpose()?;\n\n let capture_method = router_data\n .request\n .capture_method\n .map(payments_grpc::CaptureMethod::foreign_try_from)\n .transpose()?;\n\n let authentication_data = router_data\n .request\n .authentication_data\n .clone()\n .map(payments_grpc::AuthenticationData::foreign_try_from)\n .transpose()?;\n\n let setup_future_usage = router_data\n .request\n .setup_future_usage\n .map(payments_grpc::FutureUsage::foreign_try_from)\n .transpose()?;\n\n let customer_acceptance = router_data\n .request\n .customer_acceptance\n .clone()\n .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n .transpose()?;\n\n Ok(Self {\n amount: router_data.request.amount,\n currency: currency.into(),\n payment_method,\n return_url: router_data.request.router_return_url.clone(),\n address: Some(address),\n auth_type: auth_type.into(),\n enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n request_incremental_authorization: router_data\n .request\n .request_incremental_authorization,\n minor_amount: router_data.request.amount,\n email: router_data\n .request\n .email\n .clone()\n .map(|e| e.expose().expose().into()),\n browser_info,\n\n session_token: None,\n order_tax_amount: router_data\n .request\n .order_tax_amount\n .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n customer_name: router_data\n .request\n .customer_name\n .clone()\n .map(|customer_name| customer_name.peek().to_owned()),\n capture_method: capture_method.map(|capture_method| capture_method.into()),\n webhook_url: router_data.request.webhook_url.clone(),\n complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n setup_future_usage: setup_future_usage.map(|s| s.into()),\n off_session: router_data.request.off_session,\n customer_acceptance,\n order_category: router_data.request.order_category.clone(),\n payment_experience: None,\n authentication_data,\n request_extended_authorization: router_data\n .request\n .request_extended_authorization\n .map(|request_extended_authorization| request_extended_authorization.is_true()),\n merchant_order_reference_id: router_data\n .request\n .merchant_order_reference_id\n .as_ref()\n .map(|merchant_order_reference_id| {\n merchant_order_reference_id.get_string_repr().to_string()\n }),\n shipping_cost: router_data\n .request\n .shipping_cost\n .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n request_ref_id: Some(Identifier {\n id_type: Some(payments_grpc::identifier::IdType::Id(\n router_data.connector_request_reference_id.clone(),\n )),\n }),\n customer_id: router_data\n .request\n .customer_id\n .as_ref()\n .map(|id| id.get_string_repr().to_string()),\n metadata: router_data\n .request\n .metadata\n .as_ref()\n .and_then(|val| val.as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n test_mode: router_data.test_mode,\n connector_customer_id: router_data.connector_customer.clone(),\n state: None,\n merchant_account_metadata: HashMap::new(),\n description: None,\n setup_mandate_details: None,\n statement_descriptor_name: None,\n statement_descriptor_suffix: None,\n })\n }\n}", + "diff_span": { + "before": "", + "after": " })\n .unwrap_or_default(),\n merchant_account_metadata: router_data\n .connector_meta_data\n .as_ref()\n .and_then(|meta| meta.peek().as_object())\n .map(|map| {\n map.iter()\n .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n .collect::>()\n })\n .unwrap_or_default(),\n test_mode: router_data.test_mode,\n connector_customer_id: router_data.connector_customer.clone()," + }, + "commit_sha": "6462e17844c253d642b5fd80426d01d0d51ec5d5" + } + ] +} \ No newline at end of file