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_10009/5ed8824/diff.json +6 -0
- diffs/pr_10063/01df8bd/diff.json +0 -0
- diffs/pr_10063/07277a8/diff.json +0 -0
- diffs/pr_10063/27a9ba0/diff.json +6 -0
- diffs/pr_10063/4b394c3/diff.json +71 -0
- diffs/pr_10063/8b81ebd/diff.json +0 -0
- diffs/pr_10063/98f86ee/diff.json +127 -0
- diffs/pr_10063/f1b0d8d/diff.json +0 -0
- diffs/pr_10094/10c2630/diff.json +0 -0
- diffs/pr_10094/253cf47/diff.json +0 -0
- diffs/pr_10094/3c3923b/diff.json +0 -0
- diffs/pr_10094/4030d8d/diff.json +0 -0
- diffs/pr_10094/8cc9638/diff.json +0 -0
- diffs/pr_10108/3ce43ce/diff.json +109 -0
- diffs/pr_10178/0e4d8a1/diff.json +0 -0
- diffs/pr_10178/1070266/diff.json +0 -0
- diffs/pr_10178/1d9a4b9/diff.json +39 -0
- diffs/pr_10178/576ed7d/diff.json +6 -0
- diffs/pr_10178/73e2168/diff.json +24 -0
- diffs/pr_10178/7faee25/diff.json +6 -0
- diffs/pr_10178/9c139b7/diff.json +0 -0
- diffs/pr_10178/9c16278/diff.json +55 -0
- diffs/pr_10178/af0c555/diff.json +0 -0
- diffs/pr_10178/b117e54/diff.json +0 -0
- diffs/pr_10178/b524aab/diff.json +6 -0
- diffs/pr_10178/b73c504/diff.json +39 -0
- diffs/pr_10178/eb7c946/diff.json +0 -0
- diffs/pr_10178/f755750/diff.json +6 -0
- diffs/pr_10178/f9b4bfc/diff.json +0 -0
- diffs/pr_6774/23e1759/diff.json +124 -0
- diffs/pr_6774/2945181/diff.json +178 -0
- diffs/pr_6774/32465fd/diff.json +0 -0
- diffs/pr_6774/4a86832/diff.json +0 -0
- diffs/pr_6774/78e980b/diff.json +8 -0
- diffs/pr_6774/7d55b6b/diff.json +6 -0
- diffs/pr_6774/9b7c679/diff.json +134 -0
- diffs/pr_6774/a2f98f8/diff.json +70 -0
- diffs/pr_6774/ae3bf0a/diff.json +101 -0
- diffs/pr_6774/b79b3e9/diff.json +6 -0
- diffs/pr_6774/c163b5d/diff.json +160 -0
- diffs/pr_6774/d985e24/diff.json +6 -0
- diffs/pr_6774/ef07ecb/diff.json +0 -0
- diffs/pr_6846/2a49e03/diff.json +39 -0
- diffs/pr_6846/e0c4655/diff.json +64 -0
- diffs/pr_6851/34ca118/diff.json +8 -0
- diffs/pr_7938/50cb59e/diff.json +0 -0
- diffs/pr_7953/00fbb77/diff.json +625 -0
- diffs/pr_7953/181823a/diff.json +6 -0
- diffs/pr_7953/1ef9a54/diff.json +8 -0
- diffs/pr_7953/20db763/diff.json +8 -0
diffs/pr_10009/5ed8824/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "5ed88244bb61c7af9e3cbab6412facc157d81a25",
|
| 3 |
+
"pr_number": 10009,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10063/01df8bd/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10063/07277a8/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10063/27a9ba0/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "27a9ba08d518bf0494070f1a5edb43fe2d21797b",
|
| 3 |
+
"pr_number": 10063,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10063/4b394c3/diff.json
ADDED
|
@@ -0,0 +1,71 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "4b394c35d6333c6c0203a1e52c344cb487dabae0",
|
| 3 |
+
"pr_number": 10063,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::impl::TesouroAuthorizeRequest",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 11 |
+
"kind": "impl_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": false,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "impl TryFrom<&TesouroRouterData<&PaymentsAuthorizeRouterData>> for TesouroAuthorizeRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }\n}",
|
| 16 |
+
"after_code": "impl TryFrom<&TesouroRouterData<&PaymentsAuthorizeRouterData>> for TesouroAuthorizeRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": ""
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "4b394c35d6333c6c0203a1e52c344cb487dabae0",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, AdditionalCardInfo, CardData, PaymentsAuthorizeRequestData,\n PaymentsSyncRequestData, RefundsRequestData, RouterData as _,\n },\n};",
|
| 24 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 25 |
+
"use chrono::Utc;",
|
| 26 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 27 |
+
],
|
| 28 |
+
"after_imports": [
|
| 29 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, AdditionalCardInfo, CardData, PaymentsAuthorizeRequestData,\n PaymentsSyncRequestData, RefundsRequestData, RouterData as _,\n },\n};",
|
| 30 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 31 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 32 |
+
]
|
| 33 |
+
},
|
| 34 |
+
{
|
| 35 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::TesouroAuthorizeRequest::function::try_from",
|
| 36 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 37 |
+
"kind": "function_item",
|
| 38 |
+
"status": "modified",
|
| 39 |
+
"code_changed": false,
|
| 40 |
+
"imports_changed": true,
|
| 41 |
+
"before_code": "fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }",
|
| 42 |
+
"after_code": "fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }",
|
| 43 |
+
"diff_span": {
|
| 44 |
+
"before": "",
|
| 45 |
+
"after": ""
|
| 46 |
+
},
|
| 47 |
+
"commit_sha": "4b394c35d6333c6c0203a1e52c344cb487dabae0",
|
| 48 |
+
"before_imports": [
|
| 49 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, AdditionalCardInfo, CardData, PaymentsAuthorizeRequestData,\n PaymentsSyncRequestData, RefundsRequestData, RouterData as _,\n },\n};",
|
| 50 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 51 |
+
"use chrono::Utc;",
|
| 52 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 53 |
+
],
|
| 54 |
+
"after_imports": [
|
| 55 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, AdditionalCardInfo, CardData, PaymentsAuthorizeRequestData,\n PaymentsSyncRequestData, RefundsRequestData, RouterData as _,\n },\n};",
|
| 56 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 57 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 58 |
+
]
|
| 59 |
+
},
|
| 60 |
+
{
|
| 61 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::function::get_todays_date",
|
| 62 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 63 |
+
"kind": "function_item",
|
| 64 |
+
"status": "removed",
|
| 65 |
+
"before_code": "pub fn get_todays_date() -> String {\n use chrono::Utc;\n\n let now = Utc::now();\n now.format(\"%Y-%m-%d\").to_string()\n}",
|
| 66 |
+
"after_code": null,
|
| 67 |
+
"diff_span": null,
|
| 68 |
+
"commit_sha": "4b394c35d6333c6c0203a1e52c344cb487dabae0"
|
| 69 |
+
}
|
| 70 |
+
]
|
| 71 |
+
}
|
diffs/pr_10063/8b81ebd/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10063/98f86ee/diff.json
ADDED
|
@@ -0,0 +1,127 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736",
|
| 3 |
+
"pr_number": 10063,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 6 |
+
"crates/hyperswitch_connectors/src/utils.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::TesouroPaymentMethodDetails::function::get_recurring_acqquirer_token_details",
|
| 11 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "fn get_recurring_acqquirer_token_details(\n connector_mandate_id: String,\n additional_payment_data: AdditionalPaymentData,\n ) -> Result<Self, error_stack::Report<errors::ConnectorError>> {\n let (expiration_month, expiration_year) = match additional_payment_data {\n AdditionalPaymentData::Card(additional_card_info) => Ok((\n additional_card_info.card_exp_month,\n additional_card_info.card_exp_year,\n )),\n AdditionalPaymentData::Wallet {\n apple_pay: _,\n google_pay: _,\n samsung_pay: _,\n } => Err(errors::ConnectorError::MissingRequiredField {\n field_name: \"expiration date and expiration year\",\n }),\n _ => Err(errors::ConnectorError::MissingRequiredField {\n field_name: \"expiration date and expiration year\",\n }),\n }?;\n Ok(Self::AcquirerTokenDetails(\n TesouroAuthorizeRecurringAcquirerTokenDetails {\n expiration_month,\n expiration_year,\n token: Secret::new(connector_mandate_id),\n security_code: TesouroSecurityCode::OmissionReason {\n omission_reason: TesouroOmissionReason::VerificationNotRequested,\n },\n wallet_type: None,\n },\n ))\n }",
|
| 17 |
+
"after_code": "fn get_recurring_acqquirer_token_details(\n connector_mandate_id: String,\n additional_payment_data: AdditionalPaymentData,\n ) -> Result<Self, error_stack::Report<errors::ConnectorError>> {\n let (expiration_month, expiration_year) = match additional_payment_data {\n AdditionalPaymentData::Card(additional_card_info) => Ok((\n additional_card_info.card_exp_month.clone(),\n Some(additional_card_info.get_card_expiry_year_4_digit()?),\n )),\n AdditionalPaymentData::Wallet {\n apple_pay: _,\n google_pay: _,\n samsung_pay: _,\n } => Err(errors::ConnectorError::MissingRequiredField {\n field_name: \"expiration date and expiration year\",\n }),\n _ => Err(errors::ConnectorError::MissingRequiredField {\n field_name: \"expiration date and expiration year\",\n }),\n }?;\n Ok(Self::AcquirerTokenDetails(\n TesouroAuthorizeRecurringAcquirerTokenDetails {\n expiration_month,\n expiration_year,\n token: Secret::new(connector_mandate_id),\n security_code: TesouroSecurityCode::OmissionReason {\n omission_reason: TesouroOmissionReason::VerificationNotRequested,\n },\n wallet_type: None,\n },\n ))\n }",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " let (expiration_month, expiration_year) = match additional_payment_data {\n AdditionalPaymentData::Card(additional_card_info) => Ok((\n additional_card_info.card_exp_month,\n additional_card_info.card_exp_year,\n )),\n AdditionalPaymentData::Wallet {",
|
| 20 |
+
"after": " let (expiration_month, expiration_year) = match additional_payment_data {\n AdditionalPaymentData::Card(additional_card_info) => Ok((\n additional_card_info.card_exp_month.clone(),\n Some(additional_card_info.get_card_expiry_year_4_digit()?),\n )),\n AdditionalPaymentData::Wallet {"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/hyperswitch_connectors/src/utils.rs::impl::payments::AdditionalCardInfo",
|
| 26 |
+
"file": "crates/hyperswitch_connectors/src/utils.rs",
|
| 27 |
+
"kind": "impl_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "impl AdditionalCardInfo for payments::AdditionalCardInfo {\n fn get_card_expiry_year_2_digit(&self) -> Result<Secret<String>, errors::ConnectorError> {\n let binding =\n self.card_exp_year\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"card_exp_year\",\n })?;\n let year = binding.peek();\n Ok(Secret::new(\n year.get(year.len() - 2..)\n .ok_or(errors::ConnectorError::RequestEncodingFailed)?\n .to_string(),\n ))\n }\n}",
|
| 32 |
+
"after_code": "impl AdditionalCardInfo for payments::AdditionalCardInfo {\n fn get_card_expiry_year_2_digit(&self) -> Result<Secret<String>, errors::ConnectorError> {\n let binding =\n self.card_exp_year\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"card_exp_year\",\n })?;\n let year = binding.peek();\n Ok(Secret::new(\n year.get(year.len() - 2..)\n .ok_or(errors::ConnectorError::RequestEncodingFailed)?\n .to_string(),\n ))\n }\n fn get_card_expiry_year_4_digit(&self) -> Result<Secret<String>, errors::ConnectorError> {\n let binding =\n self.card_exp_year\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"card_exp_year\",\n })?;\n let mut year = binding.peek().to_string();\n if year.len() == 4 {\n Ok(Secret::new(year))\n } else if year.len() == 2 {\n year = format!(\"20{year}\");\n Ok(Secret::new(year))\n } else {\n Err(errors::ConnectorError::RequestEncodingFailed)\n }\n }\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "",
|
| 35 |
+
"after": " ))\n }\n fn get_card_expiry_year_4_digit(&self) -> Result<Secret<String>, errors::ConnectorError> {\n let binding =\n self.card_exp_year\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"card_exp_year\",\n })?;\n let mut year = binding.peek().to_string();\n if year.len() == 4 {\n Ok(Secret::new(year))\n } else if year.len() == 2 {\n year = format!(\"20{year}\");\n Ok(Secret::new(year))\n } else {\n Err(errors::ConnectorError::RequestEncodingFailed)\n }\n }\n}"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::impl::TesouroAuthorizeRequest",
|
| 41 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 42 |
+
"kind": "impl_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": true,
|
| 46 |
+
"before_code": "impl TryFrom<&TesouroRouterData<&PaymentsAuthorizeRouterData>> for TesouroAuthorizeRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n let metadata = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n .ok_or(errors::ConnectorError::MissingConnectorMandateMetadata)?\n .expose();\n\n let tesouro_metadata: TesouroMandateMetadata = serde_json::from_value(metadata)\n .map_err(|_| errors::ConnectorError::MissingConnectorMandateMetadata)?;\n\n Some(tesouro_metadata.activity_date)\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }\n}",
|
| 47 |
+
"after_code": "impl TryFrom<&TesouroRouterData<&PaymentsAuthorizeRouterData>> for TesouroAuthorizeRequest {\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " })?;\n original_purchase_date = {\n let metadata = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n .ok_or(errors::ConnectorError::MissingConnectorMandateMetadata)?\n .expose();\n\n let tesouro_metadata: TesouroMandateMetadata = serde_json::from_value(metadata)\n .map_err(|_| errors::ConnectorError::MissingConnectorMandateMetadata)?;\n\n Some(tesouro_metadata.activity_date)\n };\n",
|
| 50 |
+
"after": " })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736",
|
| 53 |
+
"before_imports": [
|
| 54 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, CardData, PaymentsAuthorizeRequestData, PaymentsSyncRequestData,\n RefundsRequestData, RouterData as _,\n },\n};",
|
| 55 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 56 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 57 |
+
],
|
| 58 |
+
"after_imports": [
|
| 59 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, CardData, PaymentsAuthorizeRequestData, PaymentsSyncRequestData,\n RefundsRequestData, RouterData as _,\n },\n};",
|
| 60 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 61 |
+
"use chrono::Utc;",
|
| 62 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 63 |
+
]
|
| 64 |
+
},
|
| 65 |
+
{
|
| 66 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::TesouroAuthorizeRequest::function::try_from",
|
| 67 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 68 |
+
"kind": "function_item",
|
| 69 |
+
"status": "modified",
|
| 70 |
+
"code_changed": true,
|
| 71 |
+
"imports_changed": true,
|
| 72 |
+
"before_code": "fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n let metadata = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n .ok_or(errors::ConnectorError::MissingConnectorMandateMetadata)?\n .expose();\n\n let tesouro_metadata: TesouroMandateMetadata = serde_json::from_value(metadata)\n .map_err(|_| errors::ConnectorError::MissingConnectorMandateMetadata)?;\n\n Some(tesouro_metadata.activity_date)\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }",
|
| 73 |
+
"after_code": "fn try_from(\n item: &TesouroRouterData<&PaymentsAuthorizeRouterData>,\n ) -> Result<Self, Self::Error> {\n if item.router_data.is_three_ds() {\n Err(errors::ConnectorError::NotSupported {\n message: \"Cards 3DS\".to_string(),\n connector: \"Tesouro\",\n })?\n }\n\n let auth = TesouroAuthType::try_from(&item.router_data.connector_auth_type)?;\n let acceptor_id = auth.get_acceptor_id();\n let transaction_reference =\n get_valid_transaction_id(item.router_data.connector_request_reference_id.clone())?;\n let capture_data = TesouroCaptureData::from(item.router_data.request.is_auto_capture()?);\n let mut cit_reference = None;\n let mut original_purchase_date = None;\n let payment_method_details = match &item.router_data.request.payment_method_data {\n PaymentMethodData::Card(card) => {\n get_card_payment_method(card, item.router_data.request.is_mandate_payment())\n }\n PaymentMethodData::MandatePayment => {\n let connector_mandate_id = item.router_data.request.connector_mandate_id().ok_or(\n errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n },\n )?;\n cit_reference = {\n let mandate_reference_id = item\n .router_data\n .request\n .get_connector_mandate_request_reference_id()\n .change_context(errors::ConnectorError::MissingRequiredField {\n field_name: \"connector_mandate_id\",\n })?;\n\n Some(CitReference {\n cit_payment_id: mandate_reference_id.clone().into(),\n })\n };\n let additional_payment_data = item\n .router_data\n .request\n .additional_payment_method_data\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"additional_payment_method_data\",\n })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n\n TesouroPaymentMethodDetails::get_recurring_acqquirer_token_details(\n connector_mandate_id,\n additional_payment_data,\n )\n }\n PaymentMethodData::Wallet(wallet_data) => match wallet_data {\n WalletData::ApplePay(apple_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n apple_pay_wallet_data,\n payment_method_token,\n ))\n }\n WalletData::GooglePay(google_pay_wallet_data) => {\n let payment_method_token = item.router_data.payment_method_token.as_ref();\n TesouroPaymentMethodDetails::try_from((\n google_pay_wallet_data,\n payment_method_token,\n ))\n }\n\n WalletData::AliPayQr(_)\n | WalletData::AliPayRedirect(_)\n | WalletData::AliPayHkRedirect(_)\n | WalletData::AmazonPay(_)\n | WalletData::AmazonPayRedirect(_)\n | WalletData::Paysera(_)\n | WalletData::Skrill(_)\n | WalletData::BluecodeRedirect {}\n | WalletData::MomoRedirect(_)\n | WalletData::KakaoPayRedirect(_)\n | WalletData::GoPayRedirect(_)\n | WalletData::GcashRedirect(_)\n | WalletData::ApplePayRedirect(_)\n | WalletData::ApplePayThirdPartySdk(_)\n | WalletData::DanaRedirect {}\n | WalletData::GooglePayRedirect(_)\n | WalletData::GooglePayThirdPartySdk(_)\n | WalletData::MbWayRedirect(_)\n | WalletData::MobilePayRedirect(_)\n | WalletData::PaypalSdk(_)\n | WalletData::PaypalRedirect(_)\n | WalletData::Paze(_)\n | WalletData::SamsungPay(_)\n | WalletData::TwintRedirect {}\n | WalletData::VippsRedirect {}\n | WalletData::TouchNGoRedirect(_)\n | WalletData::WeChatPayRedirect(_)\n | WalletData::CashappQr(_)\n | WalletData::SwishQr(_)\n | WalletData::WeChatPayQr(_)\n | WalletData::RevolutPay(_)\n | WalletData::Mifinity(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"Tesouro\"),\n ))?,\n },\n PaymentMethodData::CardDetailsForNetworkTransactionId(_)\n | PaymentMethodData::CardRedirect(_)\n | PaymentMethodData::PayLater(_)\n | PaymentMethodData::BankRedirect(_)\n | PaymentMethodData::BankDebit(_)\n | PaymentMethodData::BankTransfer(_)\n | PaymentMethodData::Crypto(_)\n | PaymentMethodData::Reward\n | PaymentMethodData::RealTimePayment(_)\n | PaymentMethodData::Upi(_)\n | PaymentMethodData::Voucher(_)\n | PaymentMethodData::GiftCard(_)\n | PaymentMethodData::CardToken(_)\n | PaymentMethodData::OpenBanking(_)\n | PaymentMethodData::NetworkToken(_)\n | PaymentMethodData::MobilePayment(_) => Err(errors::ConnectorError::NotImplemented(\n connector_utils::get_unimplemented_payment_method_error_message(\"tesouro\"),\n )\n .into()),\n }?;\n\n let bill_to_address = BillToAddress::from(item.router_data);\n\n if item.router_data.request.payment_method_data == PaymentMethodData::MandatePayment {\n let request_input = AuthorizeRecurringTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n bill_to_address,\n cit_reference,\n original_purchase_date,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_RECURRING.to_string(),\n variables: TesouroPaymentRequest::Recurring {\n authorize_recurring_input: request_input,\n },\n })\n } else {\n let request_input = AuthorizeCustomerInitiatedTransactionInput {\n acceptor_id,\n transaction_reference,\n payment_method_details,\n transaction_amount_details: TransactionAmountDetails {\n total_amount: item.amount,\n currency: item.router_data.request.currency,\n },\n automatic_capture: capture_data.automatic_capture,\n authorization_intent: capture_data.authorization_intent,\n bill_to_address,\n };\n Ok(Self {\n query: tesouro_queries::AUTHORIZE_TRANSACTION.to_string(),\n variables: TesouroPaymentRequest::Authorize {\n authorize_customer_initiated_transaction_input: request_input,\n },\n })\n }\n }",
|
| 74 |
+
"diff_span": {
|
| 75 |
+
"before": " })?;\n original_purchase_date = {\n let metadata = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n .ok_or(errors::ConnectorError::MissingConnectorMandateMetadata)?\n .expose();\n\n let tesouro_metadata: TesouroMandateMetadata = serde_json::from_value(metadata)\n .map_err(|_| errors::ConnectorError::MissingConnectorMandateMetadata)?;\n\n Some(tesouro_metadata.activity_date)\n };\n",
|
| 76 |
+
"after": " })?;\n original_purchase_date = {\n if let Some(metadata) = item\n .router_data\n .get_recurring_mandate_payment_data()?\n .mandate_metadata\n {\n let tesouro_metadata: TesouroMandateMetadata =\n serde_json::from_value(metadata.expose()).map_err(|_| {\n errors::ConnectorError::MissingConnectorMandateMetadata\n })?;\n Some(tesouro_metadata.activity_date)\n } else {\n let now = chrono::Utc::now();\n Some(now.format(\"%Y-%m-%d\").to_string())\n }\n };\n"
|
| 77 |
+
},
|
| 78 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736",
|
| 79 |
+
"before_imports": [
|
| 80 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, CardData, PaymentsAuthorizeRequestData, PaymentsSyncRequestData,\n RefundsRequestData, RouterData as _,\n },\n};",
|
| 81 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 82 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 83 |
+
],
|
| 84 |
+
"after_imports": [
|
| 85 |
+
"use crate::{\n types::{RefundsResponseRouterData, ResponseRouterData},\n utils::{\n self as connector_utils, CardData, PaymentsAuthorizeRequestData, PaymentsSyncRequestData,\n RefundsRequestData, RouterData as _,\n },\n};",
|
| 86 |
+
"use hyperswitch_interfaces::{\n consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n errors,\n};",
|
| 87 |
+
"use chrono::Utc;",
|
| 88 |
+
"use hyperswitch_domain_models::{\n payment_method_data::{\n ApplePayWalletData, Card, GooglePayWalletData, PaymentMethodData, WalletData,\n },\n router_data::{AccessToken, ConnectorAuthType, ErrorResponse, PaymentMethodToken, RouterData},\n router_flow_types::refunds::{Execute, RSync},\n router_request_types::{\n PaymentsAuthorizeData, PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData,\n ResponseId, SetupMandateRequestData,\n },\n router_response_types::{MandateReference, PaymentsResponseData, RefundsResponseData},\n types::{\n PaymentsAuthorizeRouterData, PaymentsCancelRouterData, PaymentsCaptureRouterData,\n PaymentsSyncRouterData, RefreshTokenRouterData, RefundSyncRouterData, RefundsRouterData,\n SetupMandateRouterData,\n },\n};"
|
| 89 |
+
]
|
| 90 |
+
},
|
| 91 |
+
{
|
| 92 |
+
"id": "crates/hyperswitch_connectors/src/utils.rs::trait::AdditionalCardInfo",
|
| 93 |
+
"file": "crates/hyperswitch_connectors/src/utils.rs",
|
| 94 |
+
"kind": "trait_item",
|
| 95 |
+
"status": "modified",
|
| 96 |
+
"code_changed": true,
|
| 97 |
+
"imports_changed": false,
|
| 98 |
+
"before_code": "pub trait AdditionalCardInfo {\n fn get_card_expiry_year_2_digit(&self) -> Result<Secret<String>, errors::ConnectorError>;\n}",
|
| 99 |
+
"after_code": "pub trait AdditionalCardInfo {\n fn get_card_expiry_year_2_digit(&self) -> Result<Secret<String>, errors::ConnectorError>;\n fn get_card_expiry_year_4_digit(&self) -> Result<Secret<String>, errors::ConnectorError>;\n}",
|
| 100 |
+
"diff_span": {
|
| 101 |
+
"before": "",
|
| 102 |
+
"after": "pub trait AdditionalCardInfo {\n fn get_card_expiry_year_2_digit(&self) -> Result<Secret<String>, errors::ConnectorError>;\n fn get_card_expiry_year_4_digit(&self) -> Result<Secret<String>, errors::ConnectorError>;\n}"
|
| 103 |
+
},
|
| 104 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736"
|
| 105 |
+
},
|
| 106 |
+
{
|
| 107 |
+
"id": "crates/hyperswitch_connectors/src/utils.rs::payments::AdditionalCardInfo::function::get_card_expiry_year_4_digit",
|
| 108 |
+
"file": "crates/hyperswitch_connectors/src/utils.rs",
|
| 109 |
+
"kind": "function_item",
|
| 110 |
+
"status": "added",
|
| 111 |
+
"before_code": null,
|
| 112 |
+
"after_code": "fn get_card_expiry_year_4_digit(&self) -> Result<Secret<String>, errors::ConnectorError> {\n let binding =\n self.card_exp_year\n .clone()\n .ok_or(errors::ConnectorError::MissingRequiredField {\n field_name: \"card_exp_year\",\n })?;\n let mut year = binding.peek().to_string();\n if year.len() == 4 {\n Ok(Secret::new(year))\n } else if year.len() == 2 {\n year = format!(\"20{year}\");\n Ok(Secret::new(year))\n } else {\n Err(errors::ConnectorError::RequestEncodingFailed)\n }\n }",
|
| 113 |
+
"diff_span": null,
|
| 114 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736"
|
| 115 |
+
},
|
| 116 |
+
{
|
| 117 |
+
"id": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs::function::get_todays_date",
|
| 118 |
+
"file": "crates/hyperswitch_connectors/src/connectors/tesouro/transformers.rs",
|
| 119 |
+
"kind": "function_item",
|
| 120 |
+
"status": "added",
|
| 121 |
+
"before_code": null,
|
| 122 |
+
"after_code": "pub fn get_todays_date() -> String {\n use chrono::Utc;\n\n let now = Utc::now();\n now.format(\"%Y-%m-%d\").to_string()\n}",
|
| 123 |
+
"diff_span": null,
|
| 124 |
+
"commit_sha": "98f86ee3d283ba6f392aeba07ae72654ae488736"
|
| 125 |
+
}
|
| 126 |
+
]
|
| 127 |
+
}
|
diffs/pr_10063/f1b0d8d/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10094/10c2630/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10094/253cf47/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10094/3c3923b/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10094/4030d8d/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10094/8cc9638/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10108/3ce43ce/diff.json
ADDED
|
@@ -0,0 +1,109 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd",
|
| 3 |
+
"pr_number": 10108,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::AdyenRefundRequest::function::try_from",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn try_from(item: &AdyenRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let (store, splits) = match item\n .router_data\n .request\n .split_refunds\n .as_ref()\n {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (None, None),\n };\n\n Ok(Self {\n merchant_account: auth_type.merchant_account,\n amount: Amount {\n currency: item.router_data.request.currency,\n value: item.amount,\n },\n merchant_refund_reason: item\n .router_data\n .request\n .reason\n .as_ref()\n .map(|reason| AdyenRefundRequestReason::from_str(reason))\n .transpose()?,\n reference: item.router_data.request.refund_id.clone(),\n store,\n splits,\n })\n }",
|
| 16 |
+
"after_code": "fn try_from(item: &AdyenRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let (store, splits) = match item\n .router_data\n .request\n .split_refunds\n .as_ref()\n {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .refund_connector_metadata\n .clone()\n .and_then(|metadata| get_store_id(metadata.expose())),\n None,\n ),\n };\n\n Ok(Self {\n merchant_account: auth_type.merchant_account,\n amount: Amount {\n currency: item.router_data.request.currency,\n value: item.amount,\n },\n merchant_refund_reason: item\n .router_data\n .request\n .reason\n .as_ref()\n .map(|reason| AdyenRefundRequestReason::from_str(reason))\n .transpose()?,\n reference: item.router_data.request.refund_id.clone(),\n store,\n splits,\n })\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (None, None),\n };\n",
|
| 19 |
+
"after": " {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .refund_connector_metadata\n .clone()\n .and_then(|metadata| get_store_id(metadata.expose())),\n None,\n ),\n };\n"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::impl::AdyenPaymentRequest<'_>",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 26 |
+
"kind": "impl_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "impl\n TryFrom<(\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n )> for AdyenPaymentRequest<'_>\n{\n type Error = Error;\n fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }\n}",
|
| 31 |
+
"after_code": "impl\n TryFrom<(\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n )> for AdyenPaymentRequest<'_>\n{\n type Error = Error;\n fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .metadata\n .clone()\n .and_then(get_store_id),\n None,\n ),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item",
|
| 34 |
+
"after": " adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .metadata\n .clone()\n .and_then(get_store_id),\n None,\n ),\n };\n let device_fingerprint = item"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::impl::AdyenRefundRequest",
|
| 40 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 41 |
+
"kind": "impl_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "impl<F> TryFrom<&AdyenRouterData<&RefundsRouterData<F>>> for AdyenRefundRequest {\n type Error = Error;\n fn try_from(item: &AdyenRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let (store, splits) = match item\n .router_data\n .request\n .split_refunds\n .as_ref()\n {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (None, None),\n };\n\n Ok(Self {\n merchant_account: auth_type.merchant_account,\n amount: Amount {\n currency: item.router_data.request.currency,\n value: item.amount,\n },\n merchant_refund_reason: item\n .router_data\n .request\n .reason\n .as_ref()\n .map(|reason| AdyenRefundRequestReason::from_str(reason))\n .transpose()?,\n reference: item.router_data.request.refund_id.clone(),\n store,\n splits,\n })\n }\n}",
|
| 46 |
+
"after_code": "impl<F> TryFrom<&AdyenRouterData<&RefundsRouterData<F>>> for AdyenRefundRequest {\n type Error = Error;\n fn try_from(item: &AdyenRouterData<&RefundsRouterData<F>>) -> Result<Self, Self::Error> {\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let (store, splits) = match item\n .router_data\n .request\n .split_refunds\n .as_ref()\n {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .refund_connector_metadata\n .clone()\n .and_then(|metadata| get_store_id(metadata.expose())),\n None,\n ),\n };\n\n Ok(Self {\n merchant_account: auth_type.merchant_account,\n amount: Amount {\n currency: item.router_data.request.currency,\n value: item.amount,\n },\n merchant_refund_reason: item\n .router_data\n .request\n .reason\n .as_ref()\n .map(|reason| AdyenRefundRequestReason::from_str(reason))\n .transpose()?,\n reference: item.router_data.request.refund_id.clone(),\n store,\n splits,\n })\n }\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": " {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (None, None),\n };\n",
|
| 49 |
+
"after": " {\n Some(hyperswitch_domain_models::router_request_types::SplitRefundsRequest::AdyenSplitRefund(adyen_split_data)) => get_adyen_split_request(adyen_split_data, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .refund_connector_metadata\n .clone()\n .and_then(|metadata| get_store_id(metadata.expose())),\n None,\n ),\n };\n"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::struct::AdyenPaymentRequest",
|
| 55 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 56 |
+
"kind": "struct_item",
|
| 57 |
+
"status": "modified",
|
| 58 |
+
"code_changed": true,
|
| 59 |
+
"imports_changed": false,
|
| 60 |
+
"before_code": "pub struct AdyenPaymentRequest<'a> {\n amount: Amount,\n merchant_account: Secret<String>,\n payment_method: PaymentMethod<'a>,\n mpi_data: Option<AdyenMpiData>,\n reference: String,\n return_url: String,\n browser_info: Option<AdyenBrowserInfo>,\n shopper_interaction: AdyenShopperInteraction,\n recurring_processing_model: Option<AdyenRecurringModel>,\n additional_data: Option<AdditionalData>,\n shopper_reference: Option<String>,\n store_payment_method: Option<bool>,\n shopper_name: Option<ShopperName>,\n #[serde(rename = \"shopperIP\")]\n shopper_ip: Option<Secret<String, common_utils::pii::IpAddress>>,\n shopper_locale: Option<String>,\n shopper_email: Option<Email>,\n shopper_statement: Option<String>,\n social_security_number: Option<Secret<String>>,\n telephone_number: Option<Secret<String>>,\n billing_address: Option<Address>,\n delivery_address: Option<Address>,\n country_code: Option<enums::CountryAlpha2>,\n line_items: Option<Vec<LineItem>>,\n channel: Option<Channel>,\n merchant_order_reference: Option<String>,\n splits: Option<Vec<AdyenSplitData>>,\n store: Option<String>,\n device_fingerprint: Option<Secret<String>>,\n #[serde(with = \"common_utils::custom_serde::iso8601::option\")]\n session_validity: Option<PrimitiveDateTime>,\n metadata: Option<serde_json::Value>,\n}",
|
| 61 |
+
"after_code": "pub struct AdyenPaymentRequest<'a> {\n amount: Amount,\n merchant_account: Secret<String>,\n payment_method: PaymentMethod<'a>,\n mpi_data: Option<AdyenMpiData>,\n reference: String,\n return_url: String,\n browser_info: Option<AdyenBrowserInfo>,\n shopper_interaction: AdyenShopperInteraction,\n recurring_processing_model: Option<AdyenRecurringModel>,\n additional_data: Option<AdditionalData>,\n shopper_reference: Option<String>,\n store_payment_method: Option<bool>,\n shopper_name: Option<ShopperName>,\n #[serde(rename = \"shopperIP\")]\n shopper_ip: Option<Secret<String, common_utils::pii::IpAddress>>,\n shopper_locale: Option<String>,\n shopper_email: Option<Email>,\n shopper_statement: Option<String>,\n social_security_number: Option<Secret<String>>,\n telephone_number: Option<Secret<String>>,\n billing_address: Option<Address>,\n delivery_address: Option<Address>,\n country_code: Option<enums::CountryAlpha2>,\n line_items: Option<Vec<LineItem>>,\n channel: Option<Channel>,\n merchant_order_reference: Option<String>,\n splits: Option<Vec<AdyenSplitData>>,\n /// metadata.store\n store: Option<String>,\n device_fingerprint: Option<Secret<String>>,\n #[serde(with = \"common_utils::custom_serde::iso8601::option\")]\n session_validity: Option<PrimitiveDateTime>,\n metadata: Option<serde_json::Value>,\n}",
|
| 62 |
+
"diff_span": {
|
| 63 |
+
"before": "",
|
| 64 |
+
"after": " merchant_order_reference: Option<String>,\n splits: Option<Vec<AdyenSplitData>>,\n /// metadata.store\n store: Option<String>,\n device_fingerprint: Option<Secret<String>>,"
|
| 65 |
+
},
|
| 66 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 67 |
+
},
|
| 68 |
+
{
|
| 69 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::AdyenPaymentRequest<'_>::function::try_from",
|
| 70 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 71 |
+
"kind": "function_item",
|
| 72 |
+
"status": "modified",
|
| 73 |
+
"code_changed": true,
|
| 74 |
+
"imports_changed": false,
|
| 75 |
+
"before_code": "fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }",
|
| 76 |
+
"after_code": "fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result<Self, Self::Error> {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .metadata\n .clone()\n .and_then(get_store_id),\n None,\n ),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }",
|
| 77 |
+
"diff_span": {
|
| 78 |
+
"before": " adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item",
|
| 79 |
+
"after": " adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (\n item.router_data\n .request\n .metadata\n .clone()\n .and_then(get_store_id),\n None,\n ),\n };\n let device_fingerprint = item"
|
| 80 |
+
},
|
| 81 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 82 |
+
},
|
| 83 |
+
{
|
| 84 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::struct::AdyenRefundRequest",
|
| 85 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 86 |
+
"kind": "struct_item",
|
| 87 |
+
"status": "modified",
|
| 88 |
+
"code_changed": true,
|
| 89 |
+
"imports_changed": false,
|
| 90 |
+
"before_code": "pub struct AdyenRefundRequest {\n merchant_account: Secret<String>,\n amount: Amount,\n merchant_refund_reason: Option<AdyenRefundRequestReason>,\n reference: String,\n splits: Option<Vec<AdyenSplitData>>,\n store: Option<String>,\n}",
|
| 91 |
+
"after_code": "pub struct AdyenRefundRequest {\n merchant_account: Secret<String>,\n amount: Amount,\n merchant_refund_reason: Option<AdyenRefundRequestReason>,\n reference: String,\n splits: Option<Vec<AdyenSplitData>>,\n /// refund_connector_metadata.store\n store: Option<String>,\n}",
|
| 92 |
+
"diff_span": {
|
| 93 |
+
"before": "",
|
| 94 |
+
"after": " reference: String,\n splits: Option<Vec<AdyenSplitData>>,\n /// refund_connector_metadata.store\n store: Option<String>,\n}"
|
| 95 |
+
},
|
| 96 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 97 |
+
},
|
| 98 |
+
{
|
| 99 |
+
"id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::function::get_store_id",
|
| 100 |
+
"file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs",
|
| 101 |
+
"kind": "function_item",
|
| 102 |
+
"status": "added",
|
| 103 |
+
"before_code": null,
|
| 104 |
+
"after_code": "fn get_store_id(metadata: serde_json::Value) -> Option<String> {\n metadata\n .get(\"store\")\n .and_then(|store| store.as_str())\n .map(|store| store.to_string())\n}",
|
| 105 |
+
"diff_span": null,
|
| 106 |
+
"commit_sha": "3ce43ce77bc118bdd36d0ff36684f89feed932bd"
|
| 107 |
+
}
|
| 108 |
+
]
|
| 109 |
+
}
|
diffs/pr_10178/0e4d8a1/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10178/1070266/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10178/1d9a4b9/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1d9a4b9c04e48477bbb701a76808b686f9ac81be",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/refunds_v2.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/refunds_v2.rs::function::refund_retrieve_core",
|
| 10 |
+
"file": "crates/router/src/core/refunds_v2.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn refund_retrieve_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile_id: Option<id_type::ProfileId>,\n request: refunds::RefundsRetrieveRequest,\n refund: diesel_refund::Refund,\n) -> errors::RouterResult<(diesel_refund::Refund, Option<masking::Secret<String>>)> {\n let db = &*state.store;\n\n let key_manager_state = &(&state).into();\n core_utils::validate_profile_id_from_auth_layer(profile_id, &refund)?;\n let payment_id = &refund.payment_id;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let active_attempt_id = payment_intent\n .active_attempt_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Active attempt id not found\")?;\n\n let payment_attempt = db\n .find_payment_attempt_by_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n &active_attempt_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let unified_translated_message = if let (Some(unified_code), Some(unified_message)) =\n (refund.unified_code.clone(), refund.unified_message.clone())\n {\n helpers::get_unified_translation(\n &state,\n unified_code,\n unified_message.clone(),\n state.locale.to_string(),\n )\n .await\n .or(Some(unified_message))\n } else {\n refund.unified_message\n };\n\n let refund = diesel_refund::Refund {\n unified_message: unified_translated_message,\n ..refund\n };\n\n let (response, raw_connector_response) = if should_call_refund(&refund, request.force_sync.unwrap_or(false), request.return_raw_connector_response.unwrap_or(false)) {\n if state.conf.merchant_id_auth.merchant_id_auth_enabled {\n let merchant_connector_details = match request.merchant_connector_details {\n Some(details) => details,\n None => {\n return Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"merchant_connector_details\"\n }));\n }\n };\n Box::pin(internal_sync_refund_with_gateway(\n &state,\n &merchant_context,\n &payment_attempt,\n &payment_intent,\n &refund,\n merchant_connector_details,\n request.return_raw_connector_response,\n ))\n .await\n } else {\n Box::pin(sync_refund_with_gateway(\n &state,\n &merchant_context,\n &payment_attempt,\n &payment_intent,\n &refund,\n request.return_raw_connector_response,\n ))\n .await\n }\n } else {\n Ok((refund, None))\n }?;\n Ok((response, raw_connector_response))\n}",
|
| 16 |
+
"after_code": "pub async fn refund_retrieve_core(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n profile_id: Option<id_type::ProfileId>,\n request: refunds::RefundsRetrieveRequest,\n refund: diesel_refund::Refund,\n) -> errors::RouterResult<(diesel_refund::Refund, Option<masking::Secret<String>>)> {\n let db = &*state.store;\n\n let key_manager_state = &(&state).into();\n core_utils::validate_profile_id_from_auth_layer(profile_id, &refund)?;\n let payment_id = &refund.payment_id;\n let payment_intent = db\n .find_payment_intent_by_id(\n key_manager_state,\n payment_id,\n merchant_context.get_merchant_key_store(),\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let active_attempt_id = payment_intent\n .active_attempt_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Active attempt id not found\")?;\n\n let payment_attempt = db\n .find_payment_attempt_by_id(\n key_manager_state,\n merchant_context.get_merchant_key_store(),\n &active_attempt_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let unified_translated_message = if let (Some(unified_code), Some(unified_message)) =\n (refund.unified_code.clone(), refund.unified_message.clone())\n {\n helpers::get_unified_translation(\n &state,\n unified_code,\n unified_message.clone(),\n state.locale.to_string(),\n )\n .await\n .or(Some(unified_message))\n } else {\n refund.unified_message\n };\n\n let refund = diesel_refund::Refund {\n unified_message: unified_translated_message,\n ..refund\n };\n\n let (response, raw_connector_response) = if should_call_refund(\n &refund,\n request.force_sync.unwrap_or(false),\n request.return_raw_connector_response.unwrap_or(false),\n ) {\n if state.conf.merchant_id_auth.merchant_id_auth_enabled {\n let merchant_connector_details = match request.merchant_connector_details {\n Some(details) => details,\n None => {\n return Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"merchant_connector_details\"\n }));\n }\n };\n Box::pin(internal_sync_refund_with_gateway(\n &state,\n &merchant_context,\n &payment_attempt,\n &payment_intent,\n &refund,\n merchant_connector_details,\n request.return_raw_connector_response,\n ))\n .await\n } else {\n Box::pin(sync_refund_with_gateway(\n &state,\n &merchant_context,\n &payment_attempt,\n &payment_intent,\n &refund,\n request.return_raw_connector_response,\n ))\n .await\n }\n } else {\n Ok((refund, None))\n }?;\n Ok((response, raw_connector_response))\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " };\n\n let (response, raw_connector_response) = if should_call_refund(&refund, request.force_sync.unwrap_or(false), request.return_raw_connector_response.unwrap_or(false)) {\n if state.conf.merchant_id_auth.merchant_id_auth_enabled {\n let merchant_connector_details = match request.merchant_connector_details {",
|
| 19 |
+
"after": " };\n\n let (response, raw_connector_response) = if should_call_refund(\n &refund,\n request.force_sync.unwrap_or(false),\n request.return_raw_connector_response.unwrap_or(false),\n ) {\n if state.conf.merchant_id_auth.merchant_id_auth_enabled {\n let merchant_connector_details = match request.merchant_connector_details {"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "1d9a4b9c04e48477bbb701a76808b686f9ac81be"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/refunds_v2.rs::function::should_call_refund",
|
| 25 |
+
"file": "crates/router/src/core/refunds_v2.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "fn should_call_refund(refund: &diesel_models::refund::Refund, force_sync: bool, return_raw_connector_response: bool) -> bool {\n // This implies, we cannot perform a refund sync & `the connector_refund_id`\n // doesn't exist\n let predicate1 = refund.connector_refund_id.is_some();\n\n // This allows refund sync at connector level if force_sync is enabled, or\n // checks if the refund has failed\n let predicate2 = return_raw_connector_response\n || force_sync\n || !matches!(\n refund.refund_status,\n diesel_models::enums::RefundStatus::Failure\n | diesel_models::enums::RefundStatus::Success\n );\n\n predicate1 && predicate2\n}",
|
| 31 |
+
"after_code": "fn should_call_refund(\n refund: &diesel_models::refund::Refund,\n force_sync: bool,\n return_raw_connector_response: bool,\n) -> bool {\n // This implies, we cannot perform a refund sync & `the connector_refund_id`\n // doesn't exist\n let predicate1 = refund.connector_refund_id.is_some();\n\n // This allows refund sync at connector level if force_sync is enabled, or\n // checks if the refund has failed\n let predicate2 = return_raw_connector_response\n || force_sync\n || !matches!(\n refund.refund_status,\n diesel_models::enums::RefundStatus::Failure\n | diesel_models::enums::RefundStatus::Success\n );\n\n predicate1 && predicate2\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "fn should_call_refund(refund: &diesel_models::refund::Refund, force_sync: bool, return_raw_connector_response: bool) -> bool {\n // This implies, we cannot perform a refund sync & `the connector_refund_id`\n // doesn't exist",
|
| 34 |
+
"after": "fn should_call_refund(\n refund: &diesel_models::refund::Refund,\n force_sync: bool,\n return_raw_connector_response: bool,\n) -> bool {\n // This implies, we cannot perform a refund sync & `the connector_refund_id`\n // doesn't exist"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "1d9a4b9c04e48477bbb701a76808b686f9ac81be"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10178/576ed7d/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "576ed7d54495e24623e32788155567a1ab8fc73d",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10178/73e2168/diff.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "73e21685c1a33dfda12f6ba44dccade9b8c3f592",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/refunds.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/refunds.rs::function::validate_and_create_refund",
|
| 10 |
+
"file": "crates/router/src/core/refunds.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub async fn validate_and_create_refund(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n refund_amount: MinorUnit,\n req: refunds::RefundRequest,\n creds_identifier: Option<String>,\n) -> RouterResult<refunds::RefundResponse> {\n let db = &*state.store;\n let split_refunds = core_utils::get_split_refunds(SplitRefundInput {\n split_payment_request: payment_intent.split_payments.clone(),\n payment_charges: payment_attempt.charges.clone(),\n charge_id: payment_attempt.charge_id.clone(),\n refund_request: req.split_refunds.clone(),\n })?;\n\n // Only for initial dev and testing\n let refund_type = req.refund_type.unwrap_or_default();\n\n // If Refund Id not passed in request Generate one.\n\n let refund_id = core_utils::get_or_generate_id(\"refund_id\", &req.refund_id, \"ref\")?;\n\n let predicate = req\n .merchant_id\n .as_ref()\n .map(|merchant_id| merchant_id != merchant_context.get_merchant_account().get_id());\n\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string()\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n let connector_transaction_id = payment_attempt.clone().connector_transaction_id.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Transaction in invalid. Missing field \\\"connector_transaction_id\\\" in payment_attempt.\")\n })?;\n\n let all_refunds = db\n .find_refund_by_merchant_id_connector_transaction_id(\n merchant_context.get_merchant_account().get_id(),\n &connector_transaction_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n\n let currency = payment_attempt.currency.get_required_value(\"currency\")?;\n\n //[#249]: Add Connector Based Validation here.\n validator::validate_payment_order_age(&payment_intent.created_at, state.conf.refund.max_age)\n .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"created_at\".to_string(),\n expected_format: format!(\n \"created_at not older than {} days\",\n state.conf.refund.max_age,\n ),\n })?;\n\n let total_amount_captured = payment_intent\n .amount_captured\n .unwrap_or(payment_attempt.get_total_amount());\n\n validator::validate_refund_amount(\n total_amount_captured.get_amount_as_i64(),\n &all_refunds,\n refund_amount.get_amount_as_i64(),\n )\n .change_context(errors::ApiErrorResponse::RefundAmountExceedsPaymentAmount)?;\n\n validator::validate_maximum_refund_against_payment_attempt(\n &all_refunds,\n state.conf.refund.max_attempts,\n )\n .change_context(errors::ApiErrorResponse::MaximumRefundCount)?;\n\n let connector = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"No connector populated in payment attempt\")?;\n let (connector_transaction_id, processor_transaction_data) =\n ConnectorTransactionId::form_id_and_data(connector_transaction_id);\n let refund_create_req = diesel_refund::RefundNew {\n refund_id: refund_id.to_string(),\n internal_reference_id: utils::generate_id(consts::ID_LENGTH, \"refid\"),\n external_reference_id: Some(refund_id.clone()),\n payment_id: req.payment_id,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector_transaction_id,\n connector,\n refund_type: req.refund_type.unwrap_or_default().foreign_into(),\n total_amount: payment_attempt.get_total_amount(),\n refund_amount,\n currency,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n refund_status: enums::RefundStatus::Pending,\n metadata: req.metadata,\n description: req.reason.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n refund_reason: req.reason,\n profile_id: payment_intent.profile_id.clone(),\n merchant_connector_id: payment_attempt.merchant_connector_id.clone(),\n charges: None,\n split_refunds: req.split_refunds,\n connector_refund_id: None,\n sent_to_gateway: Default::default(),\n refund_arn: None,\n updated_by: Default::default(),\n organization_id: merchant_context\n .get_merchant_account()\n .organization_id\n .clone(),\n processor_transaction_data,\n processor_refund_data: None,\n };\n\n let (refund, raw_connector_response) = match db\n .insert_refund(\n refund_create_req,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n {\n Ok(refund) => {\n Box::pin(schedule_refund_execution(\n state,\n refund.clone(),\n refund_type,\n merchant_context,\n payment_attempt,\n payment_intent,\n creds_identifier,\n split_refunds,\n req.all_keys_required,\n ))\n .await?\n }\n Err(err) => {\n if err.current_context().is_db_unique_violation() {\n Err(errors::ApiErrorResponse::DuplicateRefundRequest)?\n } else {\n return Err(err)\n .change_context(errors::ApiErrorResponse::RefundNotFound)\n .attach_printable(\"Inserting Refund failed\");\n }\n }\n };\n let unified_translated_message = if let (Some(unified_code), Some(unified_message)) =\n (refund.unified_code.clone(), refund.unified_message.clone())\n {\n helpers::get_unified_translation(\n state,\n unified_code,\n unified_message.clone(),\n state.locale.to_string(),\n )\n .await\n .or(Some(unified_message))\n } else {\n refund.unified_message\n };\n\n let refund = diesel_refund::Refund {\n unified_message: unified_translated_message,\n ..refund\n };\n\n let mut refund_response: api::RefundResponse = refund.foreign_into();\n refund_response.whole_connector_response = raw_connector_response;\n\n Ok(refund_response)\n}",
|
| 16 |
+
"after_code": "pub async fn validate_and_create_refund(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n refund_amount: MinorUnit,\n req: refunds::RefundRequest,\n creds_identifier: Option<String>,\n) -> RouterResult<refunds::RefundResponse> {\n let db = &*state.store;\n let split_refunds = core_utils::get_split_refunds(SplitRefundInput {\n split_payment_request: payment_intent.split_payments.clone(),\n payment_charges: payment_attempt.charges.clone(),\n charge_id: payment_attempt.charge_id.clone(),\n refund_request: req.split_refunds.clone(),\n })?;\n\n // Only for initial dev and testing\n let refund_type = req.refund_type.unwrap_or_default();\n\n // If Refund Id not passed in request Generate one.\n\n let refund_id = core_utils::get_or_generate_id(\"refund_id\", &req.refund_id, \"ref\")?;\n\n let predicate = req\n .merchant_id\n .as_ref()\n .map(|merchant_id| merchant_id != merchant_context.get_merchant_account().get_id());\n\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string()\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n let connector_transaction_id = payment_attempt.clone().connector_transaction_id.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Transaction in invalid. Missing field \\\"connector_transaction_id\\\" in payment_attempt.\")\n })?;\n\n let all_refunds = db\n .find_refund_by_merchant_id_connector_transaction_id(\n merchant_context.get_merchant_account().get_id(),\n &connector_transaction_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n\n let currency = payment_attempt.currency.get_required_value(\"currency\")?;\n\n //[#249]: Add Connector Based Validation here.\n validator::validate_payment_order_age(&payment_intent.created_at, state.conf.refund.max_age)\n .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"created_at\".to_string(),\n expected_format: format!(\n \"created_at not older than {} days\",\n state.conf.refund.max_age,\n ),\n })?;\n\n let total_amount_captured = payment_intent\n .amount_captured\n .unwrap_or(payment_attempt.get_total_amount());\n\n validator::validate_refund_amount(\n total_amount_captured.get_amount_as_i64(),\n &all_refunds,\n refund_amount.get_amount_as_i64(),\n )\n .change_context(errors::ApiErrorResponse::RefundAmountExceedsPaymentAmount)?;\n\n validator::validate_maximum_refund_against_payment_attempt(\n &all_refunds,\n state.conf.refund.max_attempts,\n )\n .change_context(errors::ApiErrorResponse::MaximumRefundCount)?;\n\n let connector = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"No connector populated in payment attempt\")?;\n let (connector_transaction_id, processor_transaction_data) =\n ConnectorTransactionId::form_id_and_data(connector_transaction_id);\n let refund_create_req = diesel_refund::RefundNew {\n refund_id: refund_id.to_string(),\n internal_reference_id: utils::generate_id(consts::ID_LENGTH, \"refid\"),\n external_reference_id: Some(refund_id.clone()),\n payment_id: req.payment_id,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector_transaction_id,\n connector,\n refund_type: req.refund_type.unwrap_or_default().foreign_into(),\n total_amount: payment_attempt.get_total_amount(),\n refund_amount,\n currency,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n refund_status: enums::RefundStatus::Pending,\n metadata: req.metadata,\n description: req.reason.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n refund_reason: req.reason,\n profile_id: payment_intent.profile_id.clone(),\n merchant_connector_id: payment_attempt.merchant_connector_id.clone(),\n charges: None,\n split_refunds: req.split_refunds,\n connector_refund_id: None,\n sent_to_gateway: Default::default(),\n refund_arn: None,\n updated_by: Default::default(),\n organization_id: merchant_context\n .get_merchant_account()\n .organization_id\n .clone(),\n processor_transaction_data,\n processor_refund_data: None,\n };\n\n let (refund, raw_connector_response) = match db\n .insert_refund(\n refund_create_req,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n {\n Ok(refund) => {\n Box::pin(schedule_refund_execution(\n state,\n refund.clone(),\n refund_type,\n merchant_context,\n payment_attempt,\n payment_intent,\n creds_identifier,\n split_refunds,\n req.all_keys_required,\n ))\n .await?\n }\n Err(err) => {\n if err.current_context().is_db_unique_violation() {\n Err(errors::ApiErrorResponse::DuplicateRefundRequest)?\n } else {\n return Err(err)\n .change_context(errors::ApiErrorResponse::RefundNotFound)\n .attach_printable(\"Inserting Refund failed\");\n }\n }\n };\n let unified_translated_message = if let (Some(unified_code), Some(unified_message)) =\n (refund.unified_code.clone(), refund.unified_message.clone())\n {\n helpers::get_unified_translation(\n state,\n unified_code,\n unified_message.clone(),\n state.locale.to_string(),\n )\n .await\n .or(Some(unified_message))\n } else {\n refund.unified_message\n };\n\n let refund = diesel_refund::Refund {\n unified_message: unified_translated_message,\n ..refund\n };\n\n Ok((refund, raw_connector_response).foreign_into())\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " };\n\n let mut refund_response: api::RefundResponse = refund.foreign_into();\n refund_response.whole_connector_response = raw_connector_response;\n\n Ok(refund_response)\n}",
|
| 19 |
+
"after": " };\n\n Ok((refund, raw_connector_response).foreign_into())\n}"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "73e21685c1a33dfda12f6ba44dccade9b8c3f592"
|
| 22 |
+
}
|
| 23 |
+
]
|
| 24 |
+
}
|
diffs/pr_10178/7faee25/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7faee252d59f03b79f5b6bbcfcb9e1c1541e920c",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10178/9c139b7/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10178/9c16278/diff.json
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9c16278698d1007b9ef970c6a34a4177f4abd786",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/refunds_v2.rs",
|
| 6 |
+
"crates/router/src/core/webhooks/incoming.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/router/src/core/refunds_v2.rs::function::validate_and_create_refund",
|
| 11 |
+
"file": "crates/router/src/core/refunds_v2.rs",
|
| 12 |
+
"kind": "function_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "pub async fn validate_and_create_refund(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n refund_amount: common_utils_types::MinorUnit,\n req: refunds::RefundsCreateRequest,\n global_refund_id: id_type::GlobalRefundId,\n merchant_connector_details: Option<common_types::domain::MerchantConnectorAuthDetails>,\n) -> errors::RouterResult<refunds::RefundResponse> {\n let db = &*state.store;\n\n let refund_type = req.refund_type.unwrap_or_default();\n\n let merchant_reference_id = req.merchant_reference_id;\n\n let predicate = req\n .merchant_id\n .as_ref()\n .map(|merchant_id| merchant_id != merchant_context.get_merchant_account().get_id());\n\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string()\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n let connector_payment_id = payment_attempt.clone().connector_payment_id.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Transaction in invalid. Missing field \\\"connector_transaction_id\\\" in payment_attempt.\")\n })?;\n\n let all_refunds = db\n .find_refund_by_merchant_id_connector_transaction_id(\n merchant_context.get_merchant_account().get_id(),\n &connector_payment_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n\n let currency = payment_intent.amount_details.currency;\n\n refunds_validator::validate_payment_order_age(\n &payment_intent.created_at,\n state.conf.refund.max_age,\n )\n .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"created_at\".to_string(),\n expected_format: format!(\n \"created_at not older than {} days\",\n state.conf.refund.max_age,\n ),\n })?;\n\n let total_amount_captured = payment_intent\n .amount_captured\n .unwrap_or(payment_attempt.get_total_amount());\n\n refunds_validator::validate_refund_amount(\n total_amount_captured.get_amount_as_i64(),\n &all_refunds,\n refund_amount.get_amount_as_i64(),\n )\n .change_context(errors::ApiErrorResponse::RefundAmountExceedsPaymentAmount)?;\n\n refunds_validator::validate_maximum_refund_against_payment_attempt(\n &all_refunds,\n state.conf.refund.max_attempts,\n )\n .change_context(errors::ApiErrorResponse::MaximumRefundCount)?;\n\n let connector = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"No connector populated in payment attempt\")?;\n let (connector_transaction_id, processor_transaction_data) =\n common_utils_types::ConnectorTransactionId::form_id_and_data(connector_payment_id);\n let refund_create_req = diesel_refund::RefundNew {\n id: global_refund_id,\n merchant_reference_id: merchant_reference_id.clone(),\n external_reference_id: Some(merchant_reference_id.get_string_repr().to_string()),\n payment_id: req.payment_id,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector_transaction_id,\n connector,\n refund_type: enums::RefundType::foreign_from(req.refund_type.unwrap_or_default()),\n total_amount: payment_attempt.get_total_amount(),\n refund_amount,\n currency,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n refund_status: enums::RefundStatus::Pending,\n metadata: req.metadata,\n description: req.reason.clone(),\n attempt_id: payment_attempt.id.clone(),\n refund_reason: req.reason,\n profile_id: Some(payment_intent.profile_id.clone()),\n connector_id: payment_attempt.merchant_connector_id.clone(),\n charges: None,\n split_refunds: None,\n connector_refund_id: None,\n sent_to_gateway: Default::default(),\n refund_arn: None,\n updated_by: Default::default(),\n organization_id: merchant_context\n .get_merchant_account()\n .organization_id\n .clone(),\n processor_transaction_data,\n processor_refund_data: None,\n };\n\n let (refund, raw_connector_response) = match db\n .insert_refund(\n refund_create_req,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n {\n Ok(refund) => {\n Box::pin(schedule_refund_execution(\n state,\n refund.clone(),\n refund_type,\n merchant_context,\n payment_attempt,\n payment_intent,\n merchant_connector_details,\n req.return_raw_connector_response,\n ))\n .await?\n }\n Err(err) => {\n if err.current_context().is_db_unique_violation() {\n Err(errors::ApiErrorResponse::DuplicateRefundRequest)?\n } else {\n Err(err)\n .change_context(errors::ApiErrorResponse::RefundFailed { data: None })\n .attach_printable(\"Failed to insert refund\")?\n }\n }\n };\n\n let unified_translated_message =\n match (refund.unified_code.clone(), refund.unified_message.clone()) {\n (Some(unified_code), Some(unified_message)) => helpers::get_unified_translation(\n state,\n unified_code,\n unified_message.clone(),\n state.locale.to_string(),\n )\n .await\n .or(Some(unified_message)),\n _ => refund.unified_message,\n };\n\n let refund = diesel_refund::Refund {\n unified_message: unified_translated_message,\n ..refund\n };\n\n // api::RefundResponse::foreign_try_from(refund)\n let mut refund_response: api::RefundResponse = api::RefundResponse::foreign_try_from(refund)?;\n refund_response.raw_connector_response = raw_connector_response;\n\n Ok(refund_response)\n}",
|
| 17 |
+
"after_code": "pub async fn validate_and_create_refund(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n refund_amount: common_utils_types::MinorUnit,\n req: refunds::RefundsCreateRequest,\n global_refund_id: id_type::GlobalRefundId,\n merchant_connector_details: Option<common_types::domain::MerchantConnectorAuthDetails>,\n) -> errors::RouterResult<refunds::RefundResponse> {\n let db = &*state.store;\n\n let refund_type = req.refund_type.unwrap_or_default();\n\n let merchant_reference_id = req.merchant_reference_id;\n\n let predicate = req\n .merchant_id\n .as_ref()\n .map(|merchant_id| merchant_id != merchant_context.get_merchant_account().get_id());\n\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string()\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n let connector_payment_id = payment_attempt.clone().connector_payment_id.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Transaction in invalid. Missing field \\\"connector_transaction_id\\\" in payment_attempt.\")\n })?;\n\n let all_refunds = db\n .find_refund_by_merchant_id_connector_transaction_id(\n merchant_context.get_merchant_account().get_id(),\n &connector_payment_id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::RefundNotFound)?;\n\n let currency = payment_intent.amount_details.currency;\n\n refunds_validator::validate_payment_order_age(\n &payment_intent.created_at,\n state.conf.refund.max_age,\n )\n .change_context(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"created_at\".to_string(),\n expected_format: format!(\n \"created_at not older than {} days\",\n state.conf.refund.max_age,\n ),\n })?;\n\n let total_amount_captured = payment_intent\n .amount_captured\n .unwrap_or(payment_attempt.get_total_amount());\n\n refunds_validator::validate_refund_amount(\n total_amount_captured.get_amount_as_i64(),\n &all_refunds,\n refund_amount.get_amount_as_i64(),\n )\n .change_context(errors::ApiErrorResponse::RefundAmountExceedsPaymentAmount)?;\n\n refunds_validator::validate_maximum_refund_against_payment_attempt(\n &all_refunds,\n state.conf.refund.max_attempts,\n )\n .change_context(errors::ApiErrorResponse::MaximumRefundCount)?;\n\n let connector = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"No connector populated in payment attempt\")?;\n let (connector_transaction_id, processor_transaction_data) =\n common_utils_types::ConnectorTransactionId::form_id_and_data(connector_payment_id);\n let refund_create_req = diesel_refund::RefundNew {\n id: global_refund_id,\n merchant_reference_id: merchant_reference_id.clone(),\n external_reference_id: Some(merchant_reference_id.get_string_repr().to_string()),\n payment_id: req.payment_id,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector_transaction_id,\n connector,\n refund_type: enums::RefundType::foreign_from(req.refund_type.unwrap_or_default()),\n total_amount: payment_attempt.get_total_amount(),\n refund_amount,\n currency,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n refund_status: enums::RefundStatus::Pending,\n metadata: req.metadata,\n description: req.reason.clone(),\n attempt_id: payment_attempt.id.clone(),\n refund_reason: req.reason,\n profile_id: Some(payment_intent.profile_id.clone()),\n connector_id: payment_attempt.merchant_connector_id.clone(),\n charges: None,\n split_refunds: None,\n connector_refund_id: None,\n sent_to_gateway: Default::default(),\n refund_arn: None,\n updated_by: Default::default(),\n organization_id: merchant_context\n .get_merchant_account()\n .organization_id\n .clone(),\n processor_transaction_data,\n processor_refund_data: None,\n };\n\n let (refund, raw_connector_response) = match db\n .insert_refund(\n refund_create_req,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n {\n Ok(refund) => {\n Box::pin(schedule_refund_execution(\n state,\n refund.clone(),\n refund_type,\n merchant_context,\n payment_attempt,\n payment_intent,\n merchant_connector_details,\n req.return_raw_connector_response,\n ))\n .await?\n }\n Err(err) => {\n if err.current_context().is_db_unique_violation() {\n Err(errors::ApiErrorResponse::DuplicateRefundRequest)?\n } else {\n Err(err)\n .change_context(errors::ApiErrorResponse::RefundFailed { data: None })\n .attach_printable(\"Failed to insert refund\")?\n }\n }\n };\n\n let unified_translated_message =\n match (refund.unified_code.clone(), refund.unified_message.clone()) {\n (Some(unified_code), Some(unified_message)) => helpers::get_unified_translation(\n state,\n unified_code,\n unified_message.clone(),\n state.locale.to_string(),\n )\n .await\n .or(Some(unified_message)),\n _ => refund.unified_message,\n };\n\n let refund = diesel_refund::Refund {\n unified_message: unified_translated_message,\n ..refund\n };\n\n let mut refund_response: api::RefundResponse = api::RefundResponse::foreign_try_from(refund)?;\n refund_response.raw_connector_response = raw_connector_response;\n\n Ok(refund_response)\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": " };\n\n // api::RefundResponse::foreign_try_from(refund)\n let mut refund_response: api::RefundResponse = api::RefundResponse::foreign_try_from(refund)?;\n refund_response.raw_connector_response = raw_connector_response;",
|
| 20 |
+
"after": ""
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "9c16278698d1007b9ef970c6a34a4177f4abd786"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/router/src/core/webhooks/incoming.rs::function::refunds_incoming_webhook_flow",
|
| 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 refunds_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n connector_name: &str,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n let db = &*state.store;\n //find refund by connector refund id\n let refund = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::RefundId(refund_id_type) => match refund_id_type {\n webhooks::RefundIdType::RefundId(id) => db\n .find_refund_by_merchant_id_refund_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n webhooks::RefundIdType::ConnectorRefundId(id) => db\n .find_refund_by_merchant_id_connector_refund_id_connector(\n merchant_context.get_merchant_account().get_id(),\n &id,\n connector_name,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-refund id when processing refund webhooks\")?,\n };\n let refund_id = refund.refund_id.to_owned();\n //if source verified then update refund status else trigger refund sync\n let updated_refund = if source_verified {\n let refund_update = diesel_refund::RefundUpdate::StatusUpdate {\n connector_refund_id: None,\n sent_to_gateway: true,\n refund_status: common_enums::RefundStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed refund status mapping from event type\")?,\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n processor_refund_data: None,\n };\n db.update_refund(\n refund.to_owned(),\n refund_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n } else {\n Box::pin(refunds::refund_retrieve_core_with_refund_id(\n state.clone(),\n merchant_context.clone(),\n None,\n api_models::refunds::RefundsRetrieveRequest {\n refund_id: refund_id.to_owned(),\n force_sync: Some(true),\n merchant_connector_details: None,\n all_keys_required: Some(true),\n },\n ))\n .await\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n .0\n };\n let event_type: Option<enums::EventType> = updated_refund.refund_status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let refund_response: api_models::refunds::RefundResponse =\n updated_refund.clone().foreign_into();\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::Refunds,\n refund_id,\n enums::EventObjectType::RefundDetails,\n api::OutgoingWebhookContent::RefundDetails(Box::new(refund_response)),\n Some(updated_refund.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Refund {\n payment_id: updated_refund.payment_id,\n refund_id: updated_refund.refund_id,\n status: updated_refund.refund_status,\n })\n}",
|
| 32 |
+
"after_code": "async fn refunds_incoming_webhook_flow(\n state: SessionState,\n merchant_context: domain::MerchantContext,\n business_profile: domain::Profile,\n webhook_details: api::IncomingWebhookDetails,\n connector_name: &str,\n source_verified: bool,\n event_type: webhooks::IncomingWebhookEvent,\n) -> CustomResult<WebhookResponseTracker, errors::ApiErrorResponse> {\n let db = &*state.store;\n //find refund by connector refund id\n let refund = match webhook_details.object_reference_id {\n webhooks::ObjectReferenceId::RefundId(refund_id_type) => match refund_id_type {\n webhooks::RefundIdType::RefundId(id) => db\n .find_refund_by_merchant_id_refund_id(\n merchant_context.get_merchant_account().get_id(),\n &id,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n webhooks::RefundIdType::ConnectorRefundId(id) => db\n .find_refund_by_merchant_id_connector_refund_id_connector(\n merchant_context.get_merchant_account().get_id(),\n &id,\n connector_name,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable(\"Failed to fetch the refund\")?,\n },\n _ => Err(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"received a non-refund id when processing refund webhooks\")?,\n };\n let refund_id = refund.refund_id.to_owned();\n //if source verified then update refund status else trigger refund sync\n let updated_refund = if source_verified {\n let refund_update = diesel_refund::RefundUpdate::StatusUpdate {\n connector_refund_id: None,\n sent_to_gateway: true,\n refund_status: common_enums::RefundStatus::foreign_try_from(event_type)\n .change_context(errors::ApiErrorResponse::WebhookProcessingFailure)\n .attach_printable(\"failed refund status mapping from event type\")?,\n updated_by: merchant_context\n .get_merchant_account()\n .storage_scheme\n .to_string(),\n processor_refund_data: None,\n };\n db.update_refund(\n refund.to_owned(),\n refund_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::WebhookResourceNotFound)\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n } else {\n Box::pin(refunds::refund_retrieve_core_with_refund_id(\n state.clone(),\n merchant_context.clone(),\n None,\n api_models::refunds::RefundsRetrieveRequest {\n refund_id: refund_id.to_owned(),\n force_sync: Some(true),\n merchant_connector_details: None,\n all_keys_required: None,\n },\n ))\n .await\n .attach_printable_lazy(|| format!(\"Failed while updating refund: refund_id: {refund_id}\"))?\n .0\n };\n let event_type: Option<enums::EventType> = updated_refund.refund_status.into();\n\n // If event is NOT an UnsupportedEvent, trigger Outgoing Webhook\n if let Some(outgoing_event_type) = event_type {\n let refund_response: api_models::refunds::RefundResponse =\n updated_refund.clone().foreign_into();\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::Refunds,\n refund_id,\n enums::EventObjectType::RefundDetails,\n api::OutgoingWebhookContent::RefundDetails(Box::new(refund_response)),\n Some(updated_refund.created_at),\n ))\n .await?;\n }\n\n Ok(WebhookResponseTracker::Refund {\n payment_id: updated_refund.payment_id,\n refund_id: updated_refund.refund_id,\n status: updated_refund.refund_status,\n })\n}",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": " force_sync: Some(true),\n merchant_connector_details: None,\n all_keys_required: Some(true),\n },\n ))",
|
| 35 |
+
"after": " force_sync: Some(true),\n merchant_connector_details: None,\n all_keys_required: None,\n },\n ))"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "9c16278698d1007b9ef970c6a34a4177f4abd786"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/router/src/core/refunds_v2.rs::function::internal_trigger_refund_to_gateway",
|
| 41 |
+
"file": "crates/router/src/core/refunds_v2.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "pub async fn internal_trigger_refund_to_gateway(\n state: &SessionState,\n refund: &diesel_refund::Refund,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n merchant_connector_details: common_types::domain::MerchantConnectorAuthDetails,\n return_raw_connector_response: Option<bool>,\n) -> errors::RouterResult<(diesel_refund::Refund, Option<masking::Secret<String>>)> {\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n\n let routed_through = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to retrieve connector from payment attempt\")?;\n\n metrics::REFUND_COUNT.add(\n 1,\n router_env::metric_attributes!((\"connector\", routed_through.clone())),\n );\n\n let connector_enum = merchant_connector_details.connector_name;\n\n let connector: api::ConnectorData = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_enum.to_string(),\n api::GetToken::Connector,\n None,\n )?;\n\n refunds_validator::validate_for_valid_refunds(payment_attempt, connector.connector_name)?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(\n merchant_connector_details,\n );\n\n let mut router_data = core_utils::construct_refund_router_data(\n state,\n connector_enum,\n merchant_context,\n payment_intent,\n payment_attempt,\n refund,\n &merchant_connector_account,\n )\n .await?;\n\n let add_access_token_result = Box::pin(access_token::add_access_token(\n state,\n &connector,\n &router_data,\n None,\n ))\n .await?;\n\n access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &payments::CallConnectorAction::Trigger,\n );\n\n let connector_response = Box::pin(call_connector_service(\n state,\n &connector,\n add_access_token_result,\n router_data,\n return_raw_connector_response,\n ))\n .await;\n // .await\n // .to_refund_failed_response()?;\n\n let refund_update = get_refund_update_object(\n state,\n &connector,\n &storage_scheme,\n merchant_context,\n &connector_response,\n )\n .await;\n\n let response = match refund_update {\n Some(refund_update) => state\n .store\n .update_refund(\n refund.to_owned(),\n refund_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating refund: refund_id: {}\",\n refund.id.get_string_repr()\n )\n })?,\n None => refund.to_owned(),\n };\n let raw_connector_response = connector_response\n .as_ref()\n .ok()\n .and_then(|data| data.raw_connector_response.clone());\n // Implement outgoing webhooks here\n connector_response.to_refund_failed_response()?;\n Ok((response, raw_connector_response))\n}",
|
| 47 |
+
"after_code": "pub async fn internal_trigger_refund_to_gateway(\n state: &SessionState,\n refund: &diesel_refund::Refund,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n merchant_connector_details: common_types::domain::MerchantConnectorAuthDetails,\n return_raw_connector_response: Option<bool>,\n) -> errors::RouterResult<(diesel_refund::Refund, Option<masking::Secret<String>>)> {\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n\n let routed_through = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to retrieve connector from payment attempt\")?;\n\n metrics::REFUND_COUNT.add(\n 1,\n router_env::metric_attributes!((\"connector\", routed_through.clone())),\n );\n\n let connector_enum = merchant_connector_details.connector_name;\n\n let connector: api::ConnectorData = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &connector_enum.to_string(),\n api::GetToken::Connector,\n None,\n )?;\n\n refunds_validator::validate_for_valid_refunds(payment_attempt, connector.connector_name)?;\n\n let merchant_connector_account =\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(\n merchant_connector_details,\n );\n\n let mut router_data = core_utils::construct_refund_router_data(\n state,\n connector_enum,\n merchant_context,\n payment_intent,\n payment_attempt,\n refund,\n &merchant_connector_account,\n )\n .await?;\n\n let add_access_token_result = Box::pin(access_token::add_access_token(\n state,\n &connector,\n &router_data,\n None,\n ))\n .await?;\n\n access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &payments::CallConnectorAction::Trigger,\n );\n\n let connector_response = Box::pin(call_connector_service(\n state,\n &connector,\n add_access_token_result,\n router_data,\n return_raw_connector_response,\n ))\n .await;\n\n let refund_update = get_refund_update_object(\n state,\n &connector,\n &storage_scheme,\n merchant_context,\n &connector_response,\n )\n .await;\n\n let response = match refund_update {\n Some(refund_update) => state\n .store\n .update_refund(\n refund.to_owned(),\n refund_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating refund: refund_id: {}\",\n refund.id.get_string_repr()\n )\n })?,\n None => refund.to_owned(),\n };\n let raw_connector_response = connector_response\n .as_ref()\n .ok()\n .and_then(|data| data.raw_connector_response.clone());\n // Implement outgoing webhooks here\n connector_response.to_refund_failed_response()?;\n Ok((response, raw_connector_response))\n}",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": " ))\n .await;\n // .await\n // .to_refund_failed_response()?;\n\n let refund_update = get_refund_update_object(",
|
| 50 |
+
"after": ""
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "9c16278698d1007b9ef970c6a34a4177f4abd786"
|
| 53 |
+
}
|
| 54 |
+
]
|
| 55 |
+
}
|
diffs/pr_10178/af0c555/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10178/b117e54/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10178/b524aab/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "b524aabb555bd3a116a1fb4f330de3badba536dd",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10178/b73c504/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "b73c50456161099f4ea038332e40f70f5191d0f7",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/core/refunds.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router/src/core/refunds.rs::function::execute_refund_execute_via_direct_with_ucs_shadow",
|
| 10 |
+
"file": "crates/router/src/core/refunds.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "async fn execute_refund_execute_via_direct_with_ucs_shadow(\n state: &SessionState,\n connector: &api::ConnectorData,\n merchant_context: &domain::MerchantContext,\n refund: &diesel_refund::Refund,\n router_data: types::RefundExecuteRouterData,\n merchant_connector_account: MerchantConnectorAccountType,\n) -> RouterResult<types::RefundExecuteRouterData> {\n // Execute Direct connector (PRIMARY)\n let direct_result = Box::pin(execute_refund_execute_via_direct(\n state,\n connector,\n merchant_context,\n refund,\n router_data.clone(),\n None,\n ))\n .await;\n\n // Execute UCS in parallel (SHADOW - for comparison only)\n let ucs_router_data = router_data.clone();\n let ucs_merchant_context = merchant_context.clone();\n let ucs_state = state.clone();\n\n // Clone direct result for comparison (if successful)\n let direct_router_data_for_comparison = direct_result.as_ref().ok().cloned();\n\n tokio::spawn(async move {\n let ucs_result =\n unified_connector_service::call_unified_connector_service_for_refund_execute(\n &ucs_state,\n &ucs_merchant_context,\n ucs_router_data,\n ExecutionMode::Shadow,\n merchant_connector_account,\n )\n .await;\n\n match (ucs_result, direct_router_data_for_comparison) {\n (Ok(ucs_router_data), Some(direct_router_data)) => {\n unified_connector_service::serialize_router_data_and_send_to_comparison_service(\n &ucs_state,\n direct_router_data,\n ucs_router_data,\n )\n .await\n .inspect_err(|e| {\n router_env::logger::debug!(\n \"Shadow UCS refund execute comparison failed: {:?}\",\n e\n );\n })\n .ok();\n }\n (Err(e), _) => {\n router_env::logger::debug!(\n \"Skipping refund execute comparison - UCS shadow execute failed: {:?}\",\n e\n );\n }\n (_, None) => {\n router_env::logger::debug!(\n \"Skipping refund execute comparison - direct execute failed\"\n );\n }\n }\n });\n\n // Return PRIMARY result (Direct connector response)\n direct_result\n}",
|
| 16 |
+
"after_code": "async fn execute_refund_execute_via_direct_with_ucs_shadow(\n state: &SessionState,\n connector: &api::ConnectorData,\n merchant_context: &domain::MerchantContext,\n refund: &diesel_refund::Refund,\n router_data: types::RefundExecuteRouterData,\n merchant_connector_account: MerchantConnectorAccountType,\n all_keys_required: Option<bool>,\n) -> RouterResult<types::RefundExecuteRouterData> {\n // Execute Direct connector (PRIMARY)\n let direct_result = Box::pin(execute_refund_execute_via_direct(\n state,\n connector,\n merchant_context,\n refund,\n router_data.clone(),\n all_keys_required,\n ))\n .await;\n\n // Execute UCS in parallel (SHADOW - for comparison only)\n let ucs_router_data = router_data.clone();\n let ucs_merchant_context = merchant_context.clone();\n let ucs_state = state.clone();\n\n // Clone direct result for comparison (if successful)\n let direct_router_data_for_comparison = direct_result.as_ref().ok().cloned();\n\n tokio::spawn(async move {\n let ucs_result =\n unified_connector_service::call_unified_connector_service_for_refund_execute(\n &ucs_state,\n &ucs_merchant_context,\n ucs_router_data,\n ExecutionMode::Shadow,\n merchant_connector_account,\n )\n .await;\n\n match (ucs_result, direct_router_data_for_comparison) {\n (Ok(ucs_router_data), Some(direct_router_data)) => {\n unified_connector_service::serialize_router_data_and_send_to_comparison_service(\n &ucs_state,\n direct_router_data,\n ucs_router_data,\n )\n .await\n .inspect_err(|e| {\n router_env::logger::debug!(\n \"Shadow UCS refund execute comparison failed: {:?}\",\n e\n );\n })\n .ok();\n }\n (Err(e), _) => {\n router_env::logger::debug!(\n \"Skipping refund execute comparison - UCS shadow execute failed: {:?}\",\n e\n );\n }\n (_, None) => {\n router_env::logger::debug!(\n \"Skipping refund execute comparison - direct execute failed\"\n );\n }\n }\n });\n\n // Return PRIMARY result (Direct connector response)\n direct_result\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " refund,\n router_data.clone(),\n None,\n ))\n .await;",
|
| 19 |
+
"after": " router_data: types::RefundExecuteRouterData,\n merchant_connector_account: MerchantConnectorAccountType,\n all_keys_required: Option<bool>,\n) -> RouterResult<types::RefundExecuteRouterData> {\n // Execute Direct connector (PRIMARY)\n let direct_result = Box::pin(execute_refund_execute_via_direct(\n state,\n connector,\n merchant_context,\n refund,\n router_data.clone(),\n all_keys_required,\n ))\n .await;"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "b73c50456161099f4ea038332e40f70f5191d0f7"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router/src/core/refunds.rs::function::trigger_refund_to_gateway",
|
| 25 |
+
"file": "crates/router/src/core/refunds.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "pub async fn trigger_refund_to_gateway(\n state: &SessionState,\n refund: &diesel_refund::Refund,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n creds_identifier: Option<String>,\n split_refunds: Option<SplitRefundsRequest>,\n all_keys_required: Option<bool>,\n) -> RouterResult<(diesel_refund::Refund, Option<masking::Secret<String>>)> {\n let routed_through = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to retrieve connector from payment attempt\")?;\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n metrics::REFUND_COUNT.add(\n 1,\n router_env::metric_attributes!((\"connector\", routed_through.clone())),\n );\n\n let connector: api::ConnectorData = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &routed_through,\n api::GetToken::Connector,\n payment_attempt.merchant_connector_id.clone(),\n )?;\n\n let currency = payment_attempt.currency.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Transaction in invalid. Missing field \\\"currency\\\" in payment_attempt.\",\n )\n })?;\n\n validator::validate_for_valid_refunds(payment_attempt, connector.connector_name)?;\n\n // Fetch merchant connector account\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?;\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n creds_identifier.as_deref(),\n merchant_context.get_merchant_key_store(),\n profile_id,\n &routed_through,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let mut router_data = core_utils::construct_refund_router_data(\n state,\n &routed_through,\n merchant_context,\n (payment_attempt.get_total_amount(), currency),\n payment_intent,\n payment_attempt,\n refund,\n split_refunds,\n &merchant_connector_account,\n )\n .await?;\n\n // Add access token for both UCS and direct connector paths\n let add_access_token_result = Box::pin(access_token::add_access_token(\n state,\n &connector,\n &router_data,\n creds_identifier.as_deref(),\n ))\n .await?;\n\n logger::debug!(refund_router_data=?router_data);\n\n access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &payments::CallConnectorAction::Trigger,\n );\n\n // Common access token handling for all flows\n let router_data_res = if !(add_access_token_result.connector_supports_access_token\n && router_data.access_token.is_none())\n {\n // Access token available or not needed - proceed with execution\n\n // Check which gateway system to use for refunds\n let (execution_path, updated_state) =\n unified_connector_service::should_call_unified_connector_service(\n state,\n merchant_context,\n &router_data,\n None::<&payments::PaymentData<api::Execute>>, // No payment data for refunds\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await?;\n\n router_env::logger::info!(\n refund_id = refund.refund_id,\n execution_path = ?execution_path,\n \"Executing refund via {execution_path:?}\"\n );\n\n // Execute refund based on gateway system decision\n match execution_path {\n common_enums::ExecutionPath::UnifiedConnectorService => {\n unified_connector_service::call_unified_connector_service_for_refund_execute(\n state,\n merchant_context,\n router_data.clone(),\n ExecutionMode::Primary,\n merchant_connector_account,\n )\n .await\n .attach_printable(format!(\n \"UCS refund execution failed for connector: {}, refund_id: {}\",\n connector.connector_name, router_data.request.refund_id\n ))?\n }\n common_enums::ExecutionPath::Direct => {\n Box::pin(execute_refund_execute_via_direct(\n state,\n &connector,\n merchant_context,\n refund,\n router_data,\n all_keys_required,\n ))\n .await?\n }\n common_enums::ExecutionPath::ShadowUnifiedConnectorService => {\n Box::pin(execute_refund_execute_via_direct_with_ucs_shadow(\n &updated_state,\n &connector,\n merchant_context,\n refund,\n router_data,\n merchant_connector_account.clone(),\n ))\n .await?\n }\n }\n } else {\n // Access token needed but not available - return error router_data\n router_data\n };\n\n let refund_update = match router_data_res.response {\n Err(err) => {\n let option_gsm = helpers::get_gsm_record(\n state,\n Some(err.code.clone()),\n Some(err.message.clone()),\n connector.connector_name.to_string(),\n consts::REFUND_FLOW_STR.to_string(),\n )\n .await;\n // Note: Some connectors do not have a separate list of refund errors\n // In such cases, the error codes and messages are stored under \"Authorize\" flow in GSM table\n // So we will have to fetch the GSM using Authorize flow in case GSM is not found using \"refund_flow\"\n let option_gsm = if option_gsm.is_none() {\n helpers::get_gsm_record(\n state,\n Some(err.code.clone()),\n Some(err.message.clone()),\n connector.connector_name.to_string(),\n consts::AUTHORIZE_FLOW_STR.to_string(),\n )\n .await\n } else {\n option_gsm\n };\n\n let gsm_unified_code = option_gsm.as_ref().and_then(|gsm| gsm.unified_code.clone());\n let gsm_unified_message = option_gsm.and_then(|gsm| gsm.unified_message);\n\n let (unified_code, unified_message) = if let Some((code, message)) =\n gsm_unified_code.as_ref().zip(gsm_unified_message.as_ref())\n {\n (code.to_owned(), message.to_owned())\n } else {\n (\n consts::DEFAULT_UNIFIED_ERROR_CODE.to_owned(),\n consts::DEFAULT_UNIFIED_ERROR_MESSAGE.to_owned(),\n )\n };\n\n diesel_refund::RefundUpdate::ErrorUpdate {\n refund_status: Some(enums::RefundStatus::Failure),\n refund_error_message: err.reason.or(Some(err.message)),\n refund_error_code: Some(err.code),\n updated_by: storage_scheme.to_string(),\n connector_refund_id: None,\n processor_refund_data: None,\n unified_code: Some(unified_code),\n unified_message: Some(unified_message),\n issuer_error_code: err.network_decline_code,\n issuer_error_message: err.network_error_message,\n }\n }\n Ok(response) => {\n // match on connector integrity checks\n match router_data_res.integrity_check.clone() {\n Err(err) => {\n let (refund_connector_transaction_id, processor_refund_data) =\n err.connector_transaction_id.map_or((None, None), |txn_id| {\n let (refund_id, refund_data) =\n ConnectorTransactionId::form_id_and_data(txn_id);\n (Some(refund_id), refund_data)\n });\n metrics::INTEGRITY_CHECK_FAILED.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector.connector_name.to_string()),\n (\n \"merchant_id\",\n merchant_context.get_merchant_account().get_id().clone()\n ),\n ),\n );\n diesel_refund::RefundUpdate::ErrorUpdate {\n refund_status: Some(enums::RefundStatus::ManualReview),\n refund_error_message: Some(format!(\n \"Integrity Check Failed! as data mismatched for fields {}\",\n err.field_names\n )),\n refund_error_code: Some(\"IE\".to_string()),\n updated_by: storage_scheme.to_string(),\n connector_refund_id: refund_connector_transaction_id,\n processor_refund_data,\n unified_code: None,\n unified_message: None,\n issuer_error_code: None,\n issuer_error_message: None,\n }\n }\n Ok(()) => {\n if response.refund_status == diesel_models::enums::RefundStatus::Success {\n metrics::SUCCESSFUL_REFUND.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string(),\n )),\n )\n }\n let (connector_refund_id, processor_refund_data) =\n ConnectorTransactionId::form_id_and_data(response.connector_refund_id);\n diesel_refund::RefundUpdate::Update {\n connector_refund_id,\n refund_status: response.refund_status,\n sent_to_gateway: true,\n refund_error_message: None,\n refund_arn: \"\".to_string(),\n updated_by: storage_scheme.to_string(),\n processor_refund_data,\n }\n }\n }\n }\n };\n\n let response = state\n .store\n .update_refund(\n refund.to_owned(),\n refund_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating refund: refund_id: {}\",\n refund.refund_id\n )\n })?;\n utils::trigger_refund_outgoing_webhook(\n state,\n merchant_context,\n &response,\n payment_attempt.profile_id.clone(),\n )\n .await\n .map_err(|error| logger::warn!(refunds_outgoing_webhook_error=?error))\n .ok();\n Ok((response, router_data_res.raw_connector_response))\n}",
|
| 31 |
+
"after_code": "pub async fn trigger_refund_to_gateway(\n state: &SessionState,\n refund: &diesel_refund::Refund,\n merchant_context: &domain::MerchantContext,\n payment_attempt: &storage::PaymentAttempt,\n payment_intent: &storage::PaymentIntent,\n creds_identifier: Option<String>,\n split_refunds: Option<SplitRefundsRequest>,\n all_keys_required: Option<bool>,\n) -> RouterResult<(diesel_refund::Refund, Option<masking::Secret<String>>)> {\n let routed_through = payment_attempt\n .connector\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to retrieve connector from payment attempt\")?;\n\n let storage_scheme = merchant_context.get_merchant_account().storage_scheme;\n metrics::REFUND_COUNT.add(\n 1,\n router_env::metric_attributes!((\"connector\", routed_through.clone())),\n );\n\n let connector: api::ConnectorData = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n &routed_through,\n api::GetToken::Connector,\n payment_attempt.merchant_connector_id.clone(),\n )?;\n\n let currency = payment_attempt.currency.ok_or_else(|| {\n report!(errors::ApiErrorResponse::InternalServerError).attach_printable(\n \"Transaction in invalid. Missing field \\\"currency\\\" in payment_attempt.\",\n )\n })?;\n\n validator::validate_for_valid_refunds(payment_attempt, connector.connector_name)?;\n\n // Fetch merchant connector account\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?;\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n creds_identifier.as_deref(),\n merchant_context.get_merchant_key_store(),\n profile_id,\n &routed_through,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let mut router_data = core_utils::construct_refund_router_data(\n state,\n &routed_through,\n merchant_context,\n (payment_attempt.get_total_amount(), currency),\n payment_intent,\n payment_attempt,\n refund,\n split_refunds,\n &merchant_connector_account,\n )\n .await?;\n\n // Add access token for both UCS and direct connector paths\n let add_access_token_result = Box::pin(access_token::add_access_token(\n state,\n &connector,\n &router_data,\n creds_identifier.as_deref(),\n ))\n .await?;\n\n logger::debug!(refund_router_data=?router_data);\n\n access_token::update_router_data_with_access_token_result(\n &add_access_token_result,\n &mut router_data,\n &payments::CallConnectorAction::Trigger,\n );\n\n // Common access token handling for all flows\n let router_data_res = if !(add_access_token_result.connector_supports_access_token\n && router_data.access_token.is_none())\n {\n // Access token available or not needed - proceed with execution\n\n // Check which gateway system to use for refunds\n let (execution_path, updated_state) =\n unified_connector_service::should_call_unified_connector_service(\n state,\n merchant_context,\n &router_data,\n None::<&payments::PaymentData<api::Execute>>, // No payment data for refunds\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await?;\n\n router_env::logger::info!(\n refund_id = refund.refund_id,\n execution_path = ?execution_path,\n \"Executing refund via {execution_path:?}\"\n );\n\n // Execute refund based on gateway system decision\n match execution_path {\n common_enums::ExecutionPath::UnifiedConnectorService => {\n unified_connector_service::call_unified_connector_service_for_refund_execute(\n state,\n merchant_context,\n router_data.clone(),\n ExecutionMode::Primary,\n merchant_connector_account,\n )\n .await\n .attach_printable(format!(\n \"UCS refund execution failed for connector: {}, refund_id: {}\",\n connector.connector_name, router_data.request.refund_id\n ))?\n }\n common_enums::ExecutionPath::Direct => {\n Box::pin(execute_refund_execute_via_direct(\n state,\n &connector,\n merchant_context,\n refund,\n router_data,\n all_keys_required,\n ))\n .await?\n }\n common_enums::ExecutionPath::ShadowUnifiedConnectorService => {\n Box::pin(execute_refund_execute_via_direct_with_ucs_shadow(\n &updated_state,\n &connector,\n merchant_context,\n refund,\n router_data,\n merchant_connector_account.clone(),\n all_keys_required,\n ))\n .await?\n }\n }\n } else {\n // Access token needed but not available - return error router_data\n router_data\n };\n\n let refund_update = match router_data_res.response {\n Err(err) => {\n let option_gsm = helpers::get_gsm_record(\n state,\n Some(err.code.clone()),\n Some(err.message.clone()),\n connector.connector_name.to_string(),\n consts::REFUND_FLOW_STR.to_string(),\n )\n .await;\n // Note: Some connectors do not have a separate list of refund errors\n // In such cases, the error codes and messages are stored under \"Authorize\" flow in GSM table\n // So we will have to fetch the GSM using Authorize flow in case GSM is not found using \"refund_flow\"\n let option_gsm = if option_gsm.is_none() {\n helpers::get_gsm_record(\n state,\n Some(err.code.clone()),\n Some(err.message.clone()),\n connector.connector_name.to_string(),\n consts::AUTHORIZE_FLOW_STR.to_string(),\n )\n .await\n } else {\n option_gsm\n };\n\n let gsm_unified_code = option_gsm.as_ref().and_then(|gsm| gsm.unified_code.clone());\n let gsm_unified_message = option_gsm.and_then(|gsm| gsm.unified_message);\n\n let (unified_code, unified_message) = if let Some((code, message)) =\n gsm_unified_code.as_ref().zip(gsm_unified_message.as_ref())\n {\n (code.to_owned(), message.to_owned())\n } else {\n (\n consts::DEFAULT_UNIFIED_ERROR_CODE.to_owned(),\n consts::DEFAULT_UNIFIED_ERROR_MESSAGE.to_owned(),\n )\n };\n\n diesel_refund::RefundUpdate::ErrorUpdate {\n refund_status: Some(enums::RefundStatus::Failure),\n refund_error_message: err.reason.or(Some(err.message)),\n refund_error_code: Some(err.code),\n updated_by: storage_scheme.to_string(),\n connector_refund_id: None,\n processor_refund_data: None,\n unified_code: Some(unified_code),\n unified_message: Some(unified_message),\n issuer_error_code: err.network_decline_code,\n issuer_error_message: err.network_error_message,\n }\n }\n Ok(response) => {\n // match on connector integrity checks\n match router_data_res.integrity_check.clone() {\n Err(err) => {\n let (refund_connector_transaction_id, processor_refund_data) =\n err.connector_transaction_id.map_or((None, None), |txn_id| {\n let (refund_id, refund_data) =\n ConnectorTransactionId::form_id_and_data(txn_id);\n (Some(refund_id), refund_data)\n });\n metrics::INTEGRITY_CHECK_FAILED.add(\n 1,\n router_env::metric_attributes!(\n (\"connector\", connector.connector_name.to_string()),\n (\n \"merchant_id\",\n merchant_context.get_merchant_account().get_id().clone()\n ),\n ),\n );\n diesel_refund::RefundUpdate::ErrorUpdate {\n refund_status: Some(enums::RefundStatus::ManualReview),\n refund_error_message: Some(format!(\n \"Integrity Check Failed! as data mismatched for fields {}\",\n err.field_names\n )),\n refund_error_code: Some(\"IE\".to_string()),\n updated_by: storage_scheme.to_string(),\n connector_refund_id: refund_connector_transaction_id,\n processor_refund_data,\n unified_code: None,\n unified_message: None,\n issuer_error_code: None,\n issuer_error_message: None,\n }\n }\n Ok(()) => {\n if response.refund_status == diesel_models::enums::RefundStatus::Success {\n metrics::SUCCESSFUL_REFUND.add(\n 1,\n router_env::metric_attributes!((\n \"connector\",\n connector.connector_name.to_string(),\n )),\n )\n }\n let (connector_refund_id, processor_refund_data) =\n ConnectorTransactionId::form_id_and_data(response.connector_refund_id);\n diesel_refund::RefundUpdate::Update {\n connector_refund_id,\n refund_status: response.refund_status,\n sent_to_gateway: true,\n refund_error_message: None,\n refund_arn: \"\".to_string(),\n updated_by: storage_scheme.to_string(),\n processor_refund_data,\n }\n }\n }\n }\n };\n\n let response = state\n .store\n .update_refund(\n refund.to_owned(),\n refund_update,\n merchant_context.get_merchant_account().storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed while updating refund: refund_id: {}\",\n refund.refund_id\n )\n })?;\n utils::trigger_refund_outgoing_webhook(\n state,\n merchant_context,\n &response,\n payment_attempt.profile_id.clone(),\n )\n .await\n .map_err(|error| logger::warn!(refunds_outgoing_webhook_error=?error))\n .ok();\n Ok((response, router_data_res.raw_connector_response))\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": "",
|
| 34 |
+
"after": " router_data,\n merchant_connector_account.clone(),\n all_keys_required,\n ))\n .await?"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "b73c50456161099f4ea038332e40f70f5191d0f7"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_10178/eb7c946/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_10178/f755750/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "f755750f8e9b6d25cd4674316a5f183008341753",
|
| 3 |
+
"pr_number": 10178,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_10178/f9b4bfc/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6774/23e1759/diff.json
ADDED
|
@@ -0,0 +1,124 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router_env/src/logger/setup.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router_env/src/logger/setup.rs::struct::TelemetryGuard",
|
| 10 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 11 |
+
"kind": "struct_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "pub struct TelemetryGuard {\n _log_guards: Vec<WorkerGuard>,\n _metrics_controller: Option<BasicController>,\n}",
|
| 16 |
+
"after_code": "pub struct TelemetryGuard {\n _log_guards: Vec<WorkerGuard>,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "pub struct TelemetryGuard {\n _log_guards: Vec<WorkerGuard>,\n _metrics_controller: Option<BasicController>,\n}",
|
| 19 |
+
"after": ""
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"use tracing_appender::non_blocking::WorkerGuard;",
|
| 24 |
+
"use opentelemetry::{\n global, runtime,\n sdk::{\n export::metrics::aggregation::cumulative_temporality_selector,\n metrics::{controllers::BasicController, selectors::simple},\n propagation::TraceContextPropagator,\n trace,\n trace::BatchConfig,\n Resource,\n },\n trace::{TraceContextExt, TraceState},\n KeyValue,\n};"
|
| 25 |
+
],
|
| 26 |
+
"after_imports": [
|
| 27 |
+
"use tracing_appender::non_blocking::WorkerGuard;"
|
| 28 |
+
]
|
| 29 |
+
},
|
| 30 |
+
{
|
| 31 |
+
"id": "crates/router_env/src/logger/setup.rs::function::get_envfilter",
|
| 32 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 33 |
+
"kind": "function_item",
|
| 34 |
+
"status": "modified",
|
| 35 |
+
"code_changed": false,
|
| 36 |
+
"imports_changed": true,
|
| 37 |
+
"before_code": "fn get_envfilter(\n filtering_directive: Option<&String>,\n default_log_level: config::Level,\n filter_log_level: config::Level,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> EnvFilter {\n filtering_directive\n .map(|filter| {\n // Try to create target filter from specified filtering directive, if set\n\n // Safety: If user is overriding the default filtering directive, then we need to panic\n // for invalid directives.\n #[allow(clippy::expect_used)]\n EnvFilter::builder()\n .with_default_directive(default_log_level.into_level().into())\n .parse(filter)\n .expect(\"Invalid EnvFilter filtering directive\")\n })\n .unwrap_or_else(|| {\n // Construct a default target filter otherwise\n let mut workspace_members = crate::cargo_workspace_members!();\n workspace_members.extend(crates_to_filter.as_ref());\n\n workspace_members\n .drain()\n .zip(std::iter::repeat(filter_log_level.into_level()))\n .fold(\n EnvFilter::default().add_directive(default_log_level.into_level().into()),\n |env_filter, (target, level)| {\n // Safety: This is a hardcoded basic filtering directive. If even the basic\n // filter is wrong, it's better to panic.\n #[allow(clippy::expect_used)]\n env_filter.add_directive(\n format!(\"{target}={level}\")\n .parse()\n .expect(\"Invalid EnvFilter directive format\"),\n )\n },\n )\n })\n}",
|
| 38 |
+
"after_code": "fn get_envfilter(\n filtering_directive: Option<&String>,\n default_log_level: config::Level,\n filter_log_level: config::Level,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> EnvFilter {\n filtering_directive\n .map(|filter| {\n // Try to create target filter from specified filtering directive, if set\n\n // Safety: If user is overriding the default filtering directive, then we need to panic\n // for invalid directives.\n #[allow(clippy::expect_used)]\n EnvFilter::builder()\n .with_default_directive(default_log_level.into_level().into())\n .parse(filter)\n .expect(\"Invalid EnvFilter filtering directive\")\n })\n .unwrap_or_else(|| {\n // Construct a default target filter otherwise\n let mut workspace_members = crate::cargo_workspace_members!();\n workspace_members.extend(crates_to_filter.as_ref());\n\n workspace_members\n .drain()\n .zip(std::iter::repeat(filter_log_level.into_level()))\n .fold(\n EnvFilter::default().add_directive(default_log_level.into_level().into()),\n |env_filter, (target, level)| {\n // Safety: This is a hardcoded basic filtering directive. If even the basic\n // filter is wrong, it's better to panic.\n #[allow(clippy::expect_used)]\n env_filter.add_directive(\n format!(\"{target}={level}\")\n .parse()\n .expect(\"Invalid EnvFilter directive format\"),\n )\n },\n )\n })\n}",
|
| 39 |
+
"diff_span": {
|
| 40 |
+
"before": "",
|
| 41 |
+
"after": ""
|
| 42 |
+
},
|
| 43 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543",
|
| 44 |
+
"before_imports": [
|
| 45 |
+
"use crate::{config, FormattingLayer, StorageSubscription};",
|
| 46 |
+
"use opentelemetry::{\n global, runtime,\n sdk::{\n export::metrics::aggregation::cumulative_temporality_selector,\n metrics::{controllers::BasicController, selectors::simple},\n propagation::TraceContextPropagator,\n trace,\n trace::BatchConfig,\n Resource,\n },\n trace::{TraceContextExt, TraceState},\n KeyValue,\n};"
|
| 47 |
+
],
|
| 48 |
+
"after_imports": [
|
| 49 |
+
"use crate::{config, FormattingLayer, StorageSubscription};"
|
| 50 |
+
]
|
| 51 |
+
},
|
| 52 |
+
{
|
| 53 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup_metrics_pipeline",
|
| 54 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 55 |
+
"kind": "function_item",
|
| 56 |
+
"status": "modified",
|
| 57 |
+
"code_changed": true,
|
| 58 |
+
"imports_changed": true,
|
| 59 |
+
"before_code": "fn setup_metrics_pipeline(config: &config::LogTelemetry) -> Option<BasicController> {\n let histogram_buckets = {\n let mut init = 0.01;\n let mut buckets: [f64; 15] = [0.0; 15];\n\n for bucket in &mut buckets {\n init *= 2.0;\n *bucket = init;\n }\n buckets\n };\n\n let metrics_controller_result = opentelemetry_otlp::new_pipeline()\n .metrics(\n simple::histogram(histogram_buckets),\n cumulative_temporality_selector(),\n // This would have to be updated if a different web framework is used\n runtime::TokioCurrentThread,\n )\n .with_exporter(get_opentelemetry_exporter(config))\n .with_period(Duration::from_secs(3))\n .with_timeout(Duration::from_secs(10))\n .with_resource(Resource::new(vec![KeyValue::new(\n \"pod\",\n std::env::var(\"POD_NAME\").map_or(\n \"hyperswitch-server-default\".into(),\n Into::<opentelemetry::Value>::into,\n ),\n )]))\n .build();\n\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n if config.ignore_errors {\n metrics_controller_result\n .map_err(|error| eprintln!(\"Failed to setup metrics pipeline: {error:?}\"))\n .ok()\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n Some(metrics_controller_result.expect(\"Failed to setup metrics pipeline\"))\n }\n}",
|
| 60 |
+
"after_code": "fn setup_metrics_pipeline(config: &config::LogTelemetry) {\n use opentelemetry_otlp::WithExportConfig;\n\n let exporter_result = opentelemetry_otlp::MetricExporter::builder()\n .with_tonic()\n .with_temporality(opentelemetry_sdk::metrics::Temporality::Cumulative)\n .with_export_config(get_opentelemetry_exporter_config(config))\n .build();\n\n let exporter = if config.ignore_errors {\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to setup metrics pipeline: {error:?}\"))\n .ok();\n return;\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to setup metrics pipeline\")\n };\n\n let reader = opentelemetry_sdk::metrics::PeriodicReader::builder(\n exporter,\n // The runtime would have to be updated if a different web framework is used\n opentelemetry_sdk::runtime::TokioCurrentThread,\n )\n .with_interval(Duration::from_secs(3))\n .with_timeout(Duration::from_secs(10))\n .build();\n\n let provider = opentelemetry_sdk::metrics::SdkMeterProvider::builder()\n .with_reader(reader)\n .with_resource(opentelemetry_sdk::Resource::new([\n opentelemetry::KeyValue::new(\n \"pod\",\n std::env::var(\"POD_NAME\").unwrap_or(String::from(\"hyperswitch-server-default\")),\n ),\n ]))\n .build();\n\n opentelemetry::global::set_meter_provider(provider);\n}",
|
| 61 |
+
"diff_span": {
|
| 62 |
+
"before": "fn setup_metrics_pipeline(config: &config::LogTelemetry) -> Option<BasicController> {\n let histogram_buckets = {\n let mut init = 0.01;\n let mut buckets: [f64; 15] = [0.0; 15];\n\n for bucket in &mut buckets {\n init *= 2.0;\n *bucket = init;\n }\n buckets\n };\n\n let metrics_controller_result = opentelemetry_otlp::new_pipeline()\n .metrics(\n simple::histogram(histogram_buckets),\n cumulative_temporality_selector(),\n // This would have to be updated if a different web framework is used\n runtime::TokioCurrentThread,\n )\n .with_exporter(get_opentelemetry_exporter(config))\n .with_period(Duration::from_secs(3))\n .with_timeout(Duration::from_secs(10))\n .with_resource(Resource::new(vec![KeyValue::new(\n \"pod\",\n std::env::var(\"POD_NAME\").map_or(\n \"hyperswitch-server-default\".into(),\n Into::<opentelemetry::Value>::into,\n ),\n )]))\n .build();\n\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n if config.ignore_errors {\n metrics_controller_result\n .map_err(|error| eprintln!(\"Failed to setup metrics pipeline: {error:?}\"))\n .ok()\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n Some(metrics_controller_result.expect(\"Failed to setup metrics pipeline\"))\n }\n}",
|
| 63 |
+
"after": "fn setup_metrics_pipeline(config: &config::LogTelemetry) {\n use opentelemetry_otlp::WithExportConfig;\n\n let exporter_result = opentelemetry_otlp::MetricExporter::builder()\n .with_tonic()\n .with_temporality(opentelemetry_sdk::metrics::Temporality::Cumulative)\n .with_export_config(get_opentelemetry_exporter_config(config))\n .build();\n\n let exporter = if config.ignore_errors {\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to setup metrics pipeline: {error:?}\"))\n .ok();\n return;\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to setup metrics pipeline\")\n };\n\n let reader = opentelemetry_sdk::metrics::PeriodicReader::builder(\n exporter,\n // The runtime would have to be updated if a different web framework is used\n opentelemetry_sdk::runtime::TokioCurrentThread,\n )\n .with_interval(Duration::from_secs(3))\n .with_timeout(Duration::from_secs(10))\n .build();\n\n let provider = opentelemetry_sdk::metrics::SdkMeterProvider::builder()\n .with_reader(reader)\n .with_resource(opentelemetry_sdk::Resource::new([\n opentelemetry::KeyValue::new(\n \"pod\",\n std::env::var(\"POD_NAME\").unwrap_or(String::from(\"hyperswitch-server-default\")),\n ),\n ]))\n .build();\n\n opentelemetry::global::set_meter_provider(provider);\n}"
|
| 64 |
+
},
|
| 65 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543",
|
| 66 |
+
"before_imports": [
|
| 67 |
+
"use crate::{config, FormattingLayer, StorageSubscription};",
|
| 68 |
+
"use std::time::Duration;",
|
| 69 |
+
"use opentelemetry::{\n global, runtime,\n sdk::{\n export::metrics::aggregation::cumulative_temporality_selector,\n metrics::{controllers::BasicController, selectors::simple},\n propagation::TraceContextPropagator,\n trace,\n trace::BatchConfig,\n Resource,\n },\n trace::{TraceContextExt, TraceState},\n KeyValue,\n};"
|
| 70 |
+
],
|
| 71 |
+
"after_imports": [
|
| 72 |
+
"use crate::{config, FormattingLayer, StorageSubscription};",
|
| 73 |
+
"use opentelemetry_otlp::WithExportConfig;",
|
| 74 |
+
"use std::time::Duration;"
|
| 75 |
+
]
|
| 76 |
+
},
|
| 77 |
+
{
|
| 78 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup",
|
| 79 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 80 |
+
"kind": "function_item",
|
| 81 |
+
"status": "modified",
|
| 82 |
+
"code_changed": true,
|
| 83 |
+
"imports_changed": true,
|
| 84 |
+
"before_code": "pub fn setup(\n config: &config::Log,\n service_name: &str,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> error_stack::Result<TelemetryGuard, ConfigError> {\n let mut guards = Vec::new();\n\n /*\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n */\n\n let _metrics_controller = if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n } else {\n None\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n _metrics_controller,\n })\n}",
|
| 85 |
+
"after_code": "pub fn setup(\n config: &config::Log,\n service_name: &str,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> error_stack::Result<TelemetryGuard, ConfigError> {\n let mut guards = Vec::new();\n\n /*\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n */\n\n if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n })\n}",
|
| 86 |
+
"diff_span": {
|
| 87 |
+
"before": " */\n\n let _metrics_controller = if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n } else {\n None\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n _metrics_controller,\n })\n}",
|
| 88 |
+
"after": " */\n\n if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n };"
|
| 89 |
+
},
|
| 90 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543",
|
| 91 |
+
"before_imports": [
|
| 92 |
+
"use serde_json::ser::{CompactFormatter, PrettyFormatter};",
|
| 93 |
+
"use ::config::ConfigError;",
|
| 94 |
+
"use crate::{config, FormattingLayer, StorageSubscription};",
|
| 95 |
+
"use opentelemetry::{\n global, runtime,\n sdk::{\n export::metrics::aggregation::cumulative_temporality_selector,\n metrics::{controllers::BasicController, selectors::simple},\n propagation::TraceContextPropagator,\n trace,\n trace::BatchConfig,\n Resource,\n },\n trace::{TraceContextExt, TraceState},\n KeyValue,\n};"
|
| 96 |
+
],
|
| 97 |
+
"after_imports": [
|
| 98 |
+
"use serde_json::ser::{CompactFormatter, PrettyFormatter};",
|
| 99 |
+
"use ::config::ConfigError;",
|
| 100 |
+
"use crate::{config, FormattingLayer, StorageSubscription};"
|
| 101 |
+
]
|
| 102 |
+
},
|
| 103 |
+
{
|
| 104 |
+
"id": "crates/router_env/src/logger/setup.rs::function::get_opentelemetry_exporter_config",
|
| 105 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 106 |
+
"kind": "function_item",
|
| 107 |
+
"status": "added",
|
| 108 |
+
"before_code": null,
|
| 109 |
+
"after_code": "fn get_opentelemetry_exporter_config(\n config: &config::LogTelemetry,\n) -> opentelemetry_otlp::ExportConfig {\n let mut exporter_config = opentelemetry_otlp::ExportConfig {\n protocol: opentelemetry_otlp::Protocol::Grpc,\n endpoint: config.otel_exporter_otlp_endpoint.clone(),\n ..Default::default()\n };\n\n if let Some(timeout) = config.otel_exporter_otlp_timeout {\n exporter_config.timeout = Duration::from_millis(timeout);\n }\n\n exporter_config\n}",
|
| 110 |
+
"diff_span": null,
|
| 111 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543"
|
| 112 |
+
},
|
| 113 |
+
{
|
| 114 |
+
"id": "crates/router_env/src/logger/setup.rs::function::get_opentelemetry_exporter",
|
| 115 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 116 |
+
"kind": "function_item",
|
| 117 |
+
"status": "removed",
|
| 118 |
+
"before_code": "fn get_opentelemetry_exporter(config: &config::LogTelemetry) -> TonicExporterBuilder {\n let mut exporter_builder = opentelemetry_otlp::new_exporter().tonic();\n\n if let Some(ref endpoint) = config.otel_exporter_otlp_endpoint {\n exporter_builder = exporter_builder.with_endpoint(endpoint);\n }\n if let Some(timeout) = config.otel_exporter_otlp_timeout {\n exporter_builder = exporter_builder.with_timeout(Duration::from_millis(timeout));\n }\n\n exporter_builder\n}",
|
| 119 |
+
"after_code": null,
|
| 120 |
+
"diff_span": null,
|
| 121 |
+
"commit_sha": "23e1759b2589d623608c8c19451044905b0f3543"
|
| 122 |
+
}
|
| 123 |
+
]
|
| 124 |
+
}
|
diffs/pr_6774/2945181/diff.json
ADDED
|
@@ -0,0 +1,178 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/analytics/src/metrics.rs",
|
| 6 |
+
"crates/diesel_models/src/lib.rs",
|
| 7 |
+
"crates/drainer/src/metrics.rs",
|
| 8 |
+
"crates/external_services/src/lib.rs",
|
| 9 |
+
"crates/hyperswitch_domain_models/src/type_encryption.rs",
|
| 10 |
+
"crates/router/src/routes/metrics.rs",
|
| 11 |
+
"crates/router_env/src/metrics.rs",
|
| 12 |
+
"crates/scheduler/src/metrics.rs"
|
| 13 |
+
],
|
| 14 |
+
"diffs": [
|
| 15 |
+
{
|
| 16 |
+
"id": "crates/hyperswitch_domain_models/src/type_encryption.rs::mod::metrics",
|
| 17 |
+
"file": "crates/hyperswitch_domain_models/src/type_encryption.rs",
|
| 18 |
+
"kind": "mod_item",
|
| 19 |
+
"status": "modified",
|
| 20 |
+
"code_changed": true,
|
| 21 |
+
"imports_changed": true,
|
| 22 |
+
"before_code": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n // Encryption and Decryption metrics\n histogram_metric!(ENCRYPTION_TIME, GLOBAL_METER);\n histogram_metric!(DECRYPTION_TIME, GLOBAL_METER);\n counter_metric!(ENCRYPTION_API_FAILURES, GLOBAL_METER);\n counter_metric!(DECRYPTION_API_FAILURES, GLOBAL_METER);\n counter_metric!(APPLICATION_ENCRYPTION_COUNT, GLOBAL_METER);\n counter_metric!(APPLICATION_DECRYPTION_COUNT, GLOBAL_METER);\n}",
|
| 23 |
+
"after_code": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric_f64, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n // Encryption and Decryption metrics\n histogram_metric_f64!(ENCRYPTION_TIME, GLOBAL_METER);\n histogram_metric_f64!(DECRYPTION_TIME, GLOBAL_METER);\n counter_metric!(ENCRYPTION_API_FAILURES, GLOBAL_METER);\n counter_metric!(DECRYPTION_API_FAILURES, GLOBAL_METER);\n counter_metric!(APPLICATION_ENCRYPTION_COUNT, GLOBAL_METER);\n counter_metric!(APPLICATION_DECRYPTION_COUNT, GLOBAL_METER);\n}",
|
| 24 |
+
"diff_span": {
|
| 25 |
+
"before": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n // Encryption and Decryption metrics\n histogram_metric!(ENCRYPTION_TIME, GLOBAL_METER);\n histogram_metric!(DECRYPTION_TIME, GLOBAL_METER);\n counter_metric!(ENCRYPTION_API_FAILURES, GLOBAL_METER);\n counter_metric!(DECRYPTION_API_FAILURES, GLOBAL_METER);",
|
| 26 |
+
"after": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric_f64, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n // Encryption and Decryption metrics\n histogram_metric_f64!(ENCRYPTION_TIME, GLOBAL_METER);\n histogram_metric_f64!(DECRYPTION_TIME, GLOBAL_METER);\n counter_metric!(ENCRYPTION_API_FAILURES, GLOBAL_METER);\n counter_metric!(DECRYPTION_API_FAILURES, GLOBAL_METER);"
|
| 27 |
+
},
|
| 28 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 29 |
+
"before_imports": [
|
| 30 |
+
"use super::{metrics, EncryptedJsonType};",
|
| 31 |
+
"use common_utils::{\n crypto,\n encryption::Encryption,\n errors::{self, CustomResult},\n ext_traits::AsyncExt,\n metrics::utils::record_operation_time,\n types::keymanager::{Identifier, KeyManagerState},\n};",
|
| 32 |
+
"use common_utils::{\n crypto,\n encryption::Encryption,\n errors::{self, CustomResult},\n ext_traits::ByteSliceExt,\n keymanager::call_encryption_service,\n transformers::{ForeignFrom, ForeignTryFrom},\n types::keymanager::{\n BatchDecryptDataResponse, BatchEncryptDataRequest, BatchEncryptDataResponse,\n DecryptDataResponse, EncryptDataRequest, EncryptDataResponse, Identifier,\n KeyManagerState, TransientBatchDecryptDataRequest, TransientDecryptDataRequest,\n },\n };",
|
| 33 |
+
"use router_env::{counter_metric, global_meter, histogram_metric, once_cell};"
|
| 34 |
+
],
|
| 35 |
+
"after_imports": [
|
| 36 |
+
"use super::{metrics, EncryptedJsonType};",
|
| 37 |
+
"use common_utils::{\n crypto,\n encryption::Encryption,\n errors::{self, CustomResult},\n ext_traits::AsyncExt,\n metrics::utils::record_operation_time,\n types::keymanager::{Identifier, KeyManagerState},\n};",
|
| 38 |
+
"use router_env::{counter_metric, global_meter, histogram_metric_f64, once_cell};",
|
| 39 |
+
"use common_utils::{\n crypto,\n encryption::Encryption,\n errors::{self, CustomResult},\n ext_traits::ByteSliceExt,\n keymanager::call_encryption_service,\n transformers::{ForeignFrom, ForeignTryFrom},\n types::keymanager::{\n BatchDecryptDataResponse, BatchEncryptDataRequest, BatchEncryptDataResponse,\n DecryptDataResponse, EncryptDataRequest, EncryptDataResponse, Identifier,\n KeyManagerState, TransientBatchDecryptDataRequest, TransientDecryptDataRequest,\n },\n };"
|
| 40 |
+
]
|
| 41 |
+
},
|
| 42 |
+
{
|
| 43 |
+
"id": "crates/router_env/src/metrics.rs::mod::helpers",
|
| 44 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 45 |
+
"kind": "mod_item",
|
| 46 |
+
"status": "modified",
|
| 47 |
+
"code_changed": true,
|
| 48 |
+
"imports_changed": true,
|
| 49 |
+
"before_code": "mod helpers {\n pub fn add_attributes<T, U>(attributes: U) -> Vec<opentelemetry::KeyValue>\n where\n T: Into<opentelemetry::Value>,\n U: IntoIterator<Item = (&'static str, T)>,\n {\n attributes\n .into_iter()\n .map(|(key, value)| opentelemetry::KeyValue::new(key, value))\n .collect::<Vec<_>>()\n }\n}",
|
| 50 |
+
"after_code": "mod helpers {\n pub fn add_attributes<T, U>(attributes: U) -> Vec<opentelemetry::KeyValue>\n where\n T: Into<opentelemetry::Value>,\n U: IntoIterator<Item = (&'static str, T)>,\n {\n attributes\n .into_iter()\n .map(|(key, value)| opentelemetry::KeyValue::new(key, value))\n .collect::<Vec<_>>()\n }\n\n /// Returns the buckets to be used for a f64 histogram\n #[inline(always)]\n pub fn f64_histogram_buckets() -> Vec<f64> {\n let mut init = 0.01;\n let mut buckets: [f64; 15] = [0.0; 15];\n\n for bucket in &mut buckets {\n init *= 2.0;\n *bucket = init;\n }\n\n Vec::from(buckets)\n }\n}",
|
| 51 |
+
"diff_span": {
|
| 52 |
+
"before": "",
|
| 53 |
+
"after": " .collect::<Vec<_>>()\n }\n\n /// Returns the buckets to be used for a f64 histogram\n #[inline(always)]\n pub fn f64_histogram_buckets() -> Vec<f64> {\n let mut init = 0.01;\n let mut buckets: [f64; 15] = [0.0; 15];\n\n for bucket in &mut buckets {\n init *= 2.0;\n *bucket = init;\n }\n\n Vec::from(buckets)\n }\n}"
|
| 54 |
+
},
|
| 55 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 56 |
+
"before_imports": [
|
| 57 |
+
"pub use helpers::add_attributes;"
|
| 58 |
+
],
|
| 59 |
+
"after_imports": [
|
| 60 |
+
"pub use helpers::{add_attributes, f64_histogram_buckets};"
|
| 61 |
+
]
|
| 62 |
+
},
|
| 63 |
+
{
|
| 64 |
+
"id": "crates/diesel_models/src/lib.rs::mod::metrics",
|
| 65 |
+
"file": "crates/diesel_models/src/lib.rs",
|
| 66 |
+
"kind": "mod_item",
|
| 67 |
+
"status": "modified",
|
| 68 |
+
"code_changed": true,
|
| 69 |
+
"imports_changed": true,
|
| 70 |
+
"before_code": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n counter_metric!(DATABASE_CALLS_COUNT, GLOBAL_METER);\n histogram_metric!(DATABASE_CALL_TIME, GLOBAL_METER);\n}",
|
| 71 |
+
"after_code": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric_f64, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n counter_metric!(DATABASE_CALLS_COUNT, GLOBAL_METER);\n histogram_metric_f64!(DATABASE_CALL_TIME, GLOBAL_METER);\n}",
|
| 72 |
+
"diff_span": {
|
| 73 |
+
"before": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n counter_metric!(DATABASE_CALLS_COUNT, GLOBAL_METER);\n histogram_metric!(DATABASE_CALL_TIME, GLOBAL_METER);\n}",
|
| 74 |
+
"after": "pub(crate) mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric_f64, once_cell};\n\n global_meter!(GLOBAL_METER, \"ROUTER_API\");\n\n counter_metric!(DATABASE_CALLS_COUNT, GLOBAL_METER);\n histogram_metric_f64!(DATABASE_CALL_TIME, GLOBAL_METER);\n}"
|
| 75 |
+
},
|
| 76 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 77 |
+
"before_imports": [
|
| 78 |
+
"use diesel::{\n deserialize::FromSql,\n pg::Pg,\n sql_types::{Array, Nullable},\n Queryable,\n };",
|
| 79 |
+
"use router_env::{counter_metric, global_meter, histogram_metric, once_cell};"
|
| 80 |
+
],
|
| 81 |
+
"after_imports": [
|
| 82 |
+
"use diesel::{\n deserialize::FromSql,\n pg::Pg,\n sql_types::{Array, Nullable},\n Queryable,\n };",
|
| 83 |
+
"use router_env::{counter_metric, global_meter, histogram_metric_f64, once_cell};"
|
| 84 |
+
]
|
| 85 |
+
},
|
| 86 |
+
{
|
| 87 |
+
"id": "crates/router_env/src/metrics.rs::helpers::function::add_attributes",
|
| 88 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 89 |
+
"kind": "function_item",
|
| 90 |
+
"status": "modified",
|
| 91 |
+
"code_changed": false,
|
| 92 |
+
"imports_changed": true,
|
| 93 |
+
"before_code": "pub fn add_attributes<T, U>(attributes: U) -> Vec<opentelemetry::KeyValue>\n where\n T: Into<opentelemetry::Value>,\n U: IntoIterator<Item = (&'static str, T)>,\n {\n attributes\n .into_iter()\n .map(|(key, value)| opentelemetry::KeyValue::new(key, value))\n .collect::<Vec<_>>()\n }",
|
| 94 |
+
"after_code": "pub fn add_attributes<T, U>(attributes: U) -> Vec<opentelemetry::KeyValue>\n where\n T: Into<opentelemetry::Value>,\n U: IntoIterator<Item = (&'static str, T)>,\n {\n attributes\n .into_iter()\n .map(|(key, value)| opentelemetry::KeyValue::new(key, value))\n .collect::<Vec<_>>()\n }",
|
| 95 |
+
"diff_span": {
|
| 96 |
+
"before": "",
|
| 97 |
+
"after": ""
|
| 98 |
+
},
|
| 99 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 100 |
+
"before_imports": [
|
| 101 |
+
"pub use helpers::add_attributes;"
|
| 102 |
+
],
|
| 103 |
+
"after_imports": [
|
| 104 |
+
"pub use helpers::{add_attributes, f64_histogram_buckets};"
|
| 105 |
+
]
|
| 106 |
+
},
|
| 107 |
+
{
|
| 108 |
+
"id": "crates/external_services/src/lib.rs::mod::metrics",
|
| 109 |
+
"file": "crates/external_services/src/lib.rs",
|
| 110 |
+
"kind": "mod_item",
|
| 111 |
+
"status": "modified",
|
| 112 |
+
"code_changed": true,
|
| 113 |
+
"imports_changed": true,
|
| 114 |
+
"before_code": "pub mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric};\n\n global_meter!(GLOBAL_METER, \"EXTERNAL_SERVICES\");\n\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_DECRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Decryption failures\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_ENCRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Encryption failures\n\n #[cfg(feature = \"aws_kms\")]\n histogram_metric!(AWS_KMS_DECRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS decryption time (in sec)\n #[cfg(feature = \"aws_kms\")]\n histogram_metric!(AWS_KMS_ENCRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS encryption time (in sec)\n}",
|
| 115 |
+
"after_code": "pub mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric_f64};\n\n global_meter!(GLOBAL_METER, \"EXTERNAL_SERVICES\");\n\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_DECRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Decryption failures\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_ENCRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Encryption failures\n\n #[cfg(feature = \"aws_kms\")]\n histogram_metric_f64!(AWS_KMS_DECRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS decryption time (in sec)\n #[cfg(feature = \"aws_kms\")]\n histogram_metric_f64!(AWS_KMS_ENCRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS encryption time (in sec)\n}",
|
| 116 |
+
"diff_span": {
|
| 117 |
+
"before": "pub mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric};\n\n global_meter!(GLOBAL_METER, \"EXTERNAL_SERVICES\");\n\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_DECRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Decryption failures\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_ENCRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Encryption failures\n\n #[cfg(feature = \"aws_kms\")]\n histogram_metric!(AWS_KMS_DECRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS decryption time (in sec)\n #[cfg(feature = \"aws_kms\")]\n histogram_metric!(AWS_KMS_ENCRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS encryption time (in sec)\n}",
|
| 118 |
+
"after": "pub mod metrics {\n use router_env::{counter_metric, global_meter, histogram_metric_f64};\n\n global_meter!(GLOBAL_METER, \"EXTERNAL_SERVICES\");\n\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_DECRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Decryption failures\n #[cfg(feature = \"aws_kms\")]\n counter_metric!(AWS_KMS_ENCRYPTION_FAILURES, GLOBAL_METER); // No. of AWS KMS Encryption failures\n\n #[cfg(feature = \"aws_kms\")]\n histogram_metric_f64!(AWS_KMS_DECRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS decryption time (in sec)\n #[cfg(feature = \"aws_kms\")]\n histogram_metric_f64!(AWS_KMS_ENCRYPT_TIME, GLOBAL_METER); // Histogram for AWS KMS encryption time (in sec)\n}"
|
| 119 |
+
},
|
| 120 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 121 |
+
"before_imports": [
|
| 122 |
+
"use router_env::{counter_metric, global_meter, histogram_metric};"
|
| 123 |
+
],
|
| 124 |
+
"after_imports": [
|
| 125 |
+
"use router_env::{counter_metric, global_meter, histogram_metric_f64};"
|
| 126 |
+
]
|
| 127 |
+
},
|
| 128 |
+
{
|
| 129 |
+
"id": "crates/router_env/src/metrics.rs::macro::histogram_metric_u64",
|
| 130 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 131 |
+
"kind": "macro_definition",
|
| 132 |
+
"status": "modified",
|
| 133 |
+
"code_changed": true,
|
| 134 |
+
"imports_changed": true,
|
| 135 |
+
"before_code": "macro_rules! histogram_metric_u64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_histogram(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_histogram($description).build());\n };\n}",
|
| 136 |
+
"after_code": "macro_rules! histogram_metric_u64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}",
|
| 137 |
+
"diff_span": {
|
| 138 |
+
"before": " pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_histogram(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_histogram($description).build());\n };\n}",
|
| 139 |
+
"after": " pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}"
|
| 140 |
+
},
|
| 141 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95",
|
| 142 |
+
"before_imports": [],
|
| 143 |
+
"after_imports": [
|
| 144 |
+
"pub use helpers::{add_attributes, f64_histogram_buckets};"
|
| 145 |
+
]
|
| 146 |
+
},
|
| 147 |
+
{
|
| 148 |
+
"id": "crates/router_env/src/metrics.rs::macro::histogram_metric_f64",
|
| 149 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 150 |
+
"kind": "macro_definition",
|
| 151 |
+
"status": "added",
|
| 152 |
+
"before_code": null,
|
| 153 |
+
"after_code": "macro_rules! histogram_metric_f64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}",
|
| 154 |
+
"diff_span": null,
|
| 155 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95"
|
| 156 |
+
},
|
| 157 |
+
{
|
| 158 |
+
"id": "crates/router_env/src/metrics.rs::helpers::function::f64_histogram_buckets",
|
| 159 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 160 |
+
"kind": "function_item",
|
| 161 |
+
"status": "added",
|
| 162 |
+
"before_code": null,
|
| 163 |
+
"after_code": "pub fn f64_histogram_buckets() -> Vec<f64> {\n let mut init = 0.01;\n let mut buckets: [f64; 15] = [0.0; 15];\n\n for bucket in &mut buckets {\n init *= 2.0;\n *bucket = init;\n }\n\n Vec::from(buckets)\n }",
|
| 164 |
+
"diff_span": null,
|
| 165 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95"
|
| 166 |
+
},
|
| 167 |
+
{
|
| 168 |
+
"id": "crates/router_env/src/metrics.rs::macro::histogram_metric",
|
| 169 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 170 |
+
"kind": "macro_definition",
|
| 171 |
+
"status": "removed",
|
| 172 |
+
"before_code": "macro_rules! histogram_metric {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| $meter.f64_histogram(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| $meter.f64_histogram($description).build());\n };\n}",
|
| 173 |
+
"after_code": null,
|
| 174 |
+
"diff_span": null,
|
| 175 |
+
"commit_sha": "2945181c39d2832435d2c03608e13f44ec7fde95"
|
| 176 |
+
}
|
| 177 |
+
]
|
| 178 |
+
}
|
diffs/pr_6774/32465fd/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6774/4a86832/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6774/78e980b/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "78e980bbca0a7e0ff28d5979946456069fe53f0e",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router_env/src/metrics.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_6774/7d55b6b/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "7d55b6ba1f6964b22bf21abe9082c05dc1eed83f",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6774/9b7c679/diff.json
ADDED
|
@@ -0,0 +1,134 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router_env/src/logger/setup.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup",
|
| 10 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub fn setup(\n config: &config::Log,\n service_name: &str,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> error_stack::Result<TelemetryGuard, ConfigError> {\n let mut guards = Vec::new();\n\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n let _metrics_controller = if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n } else {\n None\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n _metrics_controller,\n })\n}",
|
| 16 |
+
"after_code": "pub fn setup(\n config: &config::Log,\n service_name: &str,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> error_stack::Result<TelemetryGuard, ConfigError> {\n let mut guards = Vec::new();\n\n /*\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n */\n\n let _metrics_controller = if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n } else {\n None\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n _metrics_controller,\n })\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "\n let subscriber = tracing_subscriber::registry()\n .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);",
|
| 19 |
+
"after": " let mut guards = Vec::new();\n\n /*\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n */\n\n let _metrics_controller = if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n } else {\n None\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/router_env/src/logger/setup.rs::impl::TraceUrlAssert",
|
| 25 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 26 |
+
"kind": "impl_item",
|
| 27 |
+
"status": "removed",
|
| 28 |
+
"before_code": "impl From<String> for TraceUrlAssert {\n fn from(value: String) -> Self {\n match value {\n url if url.starts_with('*') => Self::EndsWith(url.trim_start_matches('*').to_string()),\n url => Self::Match(url),\n }\n }\n}",
|
| 29 |
+
"after_code": null,
|
| 30 |
+
"diff_span": null,
|
| 31 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 32 |
+
},
|
| 33 |
+
{
|
| 34 |
+
"id": "crates/router_env/src/logger/setup.rs::TraceUrlAssert::function::from",
|
| 35 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 36 |
+
"kind": "function_item",
|
| 37 |
+
"status": "removed",
|
| 38 |
+
"before_code": "fn from(value: String) -> Self {\n match value {\n url if url.starts_with('*') => Self::EndsWith(url.trim_start_matches('*').to_string()),\n url => Self::Match(url),\n }\n }",
|
| 39 |
+
"after_code": null,
|
| 40 |
+
"diff_span": null,
|
| 41 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 42 |
+
},
|
| 43 |
+
{
|
| 44 |
+
"id": "crates/router_env/src/logger/setup.rs::ConditionalSampler<T>::function::should_sample",
|
| 45 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 46 |
+
"kind": "function_item",
|
| 47 |
+
"status": "removed",
|
| 48 |
+
"before_code": "fn should_sample(\n &self,\n parent_context: Option<&opentelemetry::Context>,\n trace_id: opentelemetry::trace::TraceId,\n name: &str,\n span_kind: &opentelemetry::trace::SpanKind,\n attributes: &opentelemetry::trace::OrderMap<opentelemetry::Key, opentelemetry::Value>,\n links: &[opentelemetry::trace::Link],\n instrumentation_library: &opentelemetry::InstrumentationLibrary,\n ) -> opentelemetry::trace::SamplingResult {\n match attributes\n .get(&opentelemetry::Key::new(\"http.route\"))\n .map_or(self.0.default, |inner| {\n self.0.should_trace_url(&inner.as_str())\n }) {\n true => self.1.should_sample(\n parent_context,\n trace_id,\n name,\n span_kind,\n attributes,\n links,\n instrumentation_library,\n ),\n false => opentelemetry::trace::SamplingResult {\n decision: opentelemetry::trace::SamplingDecision::Drop,\n attributes: Vec::new(),\n trace_state: match parent_context {\n Some(ctx) => ctx.span().span_context().trace_state().clone(),\n None => TraceState::default(),\n },\n },\n }\n }",
|
| 49 |
+
"after_code": null,
|
| 50 |
+
"diff_span": null,
|
| 51 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/router_env/src/logger/setup.rs::struct::ConditionalSampler",
|
| 55 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 56 |
+
"kind": "struct_item",
|
| 57 |
+
"status": "removed",
|
| 58 |
+
"before_code": "struct ConditionalSampler<T: trace::ShouldSample + Clone + 'static>(TraceAssertion, T);",
|
| 59 |
+
"after_code": null,
|
| 60 |
+
"diff_span": null,
|
| 61 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 62 |
+
},
|
| 63 |
+
{
|
| 64 |
+
"id": "crates/router_env/src/logger/setup.rs::TraceUrlAssert::function::compare_url",
|
| 65 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 66 |
+
"kind": "function_item",
|
| 67 |
+
"status": "removed",
|
| 68 |
+
"before_code": "fn compare_url(&self, url: &str) -> bool {\n match self {\n Self::Match(value) => url == value,\n Self::EndsWith(end) => url.ends_with(end),\n }\n }",
|
| 69 |
+
"after_code": null,
|
| 70 |
+
"diff_span": null,
|
| 71 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 72 |
+
},
|
| 73 |
+
{
|
| 74 |
+
"id": "crates/router_env/src/logger/setup.rs::struct::TraceAssertion",
|
| 75 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 76 |
+
"kind": "struct_item",
|
| 77 |
+
"status": "removed",
|
| 78 |
+
"before_code": "struct TraceAssertion {\n clauses: Option<Vec<TraceUrlAssert>>,\n /// default behaviour for tracing if no condition is provided\n default: bool,\n}",
|
| 79 |
+
"after_code": null,
|
| 80 |
+
"diff_span": null,
|
| 81 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 82 |
+
},
|
| 83 |
+
{
|
| 84 |
+
"id": "crates/router_env/src/logger/setup.rs::enum::TraceUrlAssert",
|
| 85 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 86 |
+
"kind": "enum_item",
|
| 87 |
+
"status": "removed",
|
| 88 |
+
"before_code": "enum TraceUrlAssert {\n Match(String),\n EndsWith(String),\n}",
|
| 89 |
+
"after_code": null,
|
| 90 |
+
"diff_span": null,
|
| 91 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 92 |
+
},
|
| 93 |
+
{
|
| 94 |
+
"id": "crates/router_env/src/logger/setup.rs::TraceAssertion::function::should_trace_url",
|
| 95 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 96 |
+
"kind": "function_item",
|
| 97 |
+
"status": "removed",
|
| 98 |
+
"before_code": "fn should_trace_url(&self, url: &str) -> bool {\n match &self.clauses {\n Some(clauses) => clauses.iter().all(|cur| cur.compare_url(url)),\n None => self.default,\n }\n }",
|
| 99 |
+
"after_code": null,
|
| 100 |
+
"diff_span": null,
|
| 101 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 102 |
+
},
|
| 103 |
+
{
|
| 104 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup_tracing_pipeline",
|
| 105 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 106 |
+
"kind": "function_item",
|
| 107 |
+
"status": "removed",
|
| 108 |
+
"before_code": "fn setup_tracing_pipeline(\n config: &config::LogTelemetry,\n service_name: &str,\n) -> Option<tracing_opentelemetry::OpenTelemetryLayer<tracing_subscriber::Registry, trace::Tracer>>\n{\n global::set_text_map_propagator(TraceContextPropagator::new());\n\n let mut trace_config = trace::config()\n .with_sampler(trace::Sampler::ParentBased(Box::new(ConditionalSampler(\n TraceAssertion {\n clauses: config\n .route_to_trace\n .clone()\n .map(|inner| inner.into_iter().map(Into::into).collect()),\n default: false,\n },\n trace::Sampler::TraceIdRatioBased(config.sampling_rate.unwrap_or(1.0)),\n ))))\n .with_resource(Resource::new(vec![KeyValue::new(\n \"service.name\",\n service_name.to_owned(),\n )]));\n if config.use_xray_generator {\n trace_config = trace_config.with_id_generator(trace::XrayIdGenerator::default());\n }\n\n // Change the default export interval from 5 seconds to 1 second\n let batch_config = BatchConfig::default().with_scheduled_delay(Duration::from_millis(1000));\n\n let traces_layer_result = opentelemetry_otlp::new_pipeline()\n .tracing()\n .with_exporter(get_opentelemetry_exporter(config))\n .with_batch_config(batch_config)\n .with_trace_config(trace_config)\n .install_batch(runtime::TokioCurrentThread)\n .map(|tracer| tracing_opentelemetry::layer().with_tracer(tracer));\n\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n if config.ignore_errors {\n traces_layer_result\n .map_err(|error| {\n eprintln!(\"Failed to create an `opentelemetry_otlp` tracer: {error:?}\")\n })\n .ok()\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n Some(traces_layer_result.expect(\"Failed to create an `opentelemetry_otlp` tracer\"))\n }\n}",
|
| 109 |
+
"after_code": null,
|
| 110 |
+
"diff_span": null,
|
| 111 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 112 |
+
},
|
| 113 |
+
{
|
| 114 |
+
"id": "crates/router_env/src/logger/setup.rs::impl::TraceAssertion",
|
| 115 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 116 |
+
"kind": "impl_item",
|
| 117 |
+
"status": "removed",
|
| 118 |
+
"before_code": "impl TraceAssertion {\n /// Should the provided url be traced\n fn should_trace_url(&self, url: &str) -> bool {\n match &self.clauses {\n Some(clauses) => clauses.iter().all(|cur| cur.compare_url(url)),\n None => self.default,\n }\n }\n}",
|
| 119 |
+
"after_code": null,
|
| 120 |
+
"diff_span": null,
|
| 121 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 122 |
+
},
|
| 123 |
+
{
|
| 124 |
+
"id": "crates/router_env/src/logger/setup.rs::impl::ConditionalSampler<T>",
|
| 125 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 126 |
+
"kind": "impl_item",
|
| 127 |
+
"status": "removed",
|
| 128 |
+
"before_code": "impl<T: trace::ShouldSample + Clone + 'static> trace::ShouldSample for ConditionalSampler<T> {\n fn should_sample(\n &self,\n parent_context: Option<&opentelemetry::Context>,\n trace_id: opentelemetry::trace::TraceId,\n name: &str,\n span_kind: &opentelemetry::trace::SpanKind,\n attributes: &opentelemetry::trace::OrderMap<opentelemetry::Key, opentelemetry::Value>,\n links: &[opentelemetry::trace::Link],\n instrumentation_library: &opentelemetry::InstrumentationLibrary,\n ) -> opentelemetry::trace::SamplingResult {\n match attributes\n .get(&opentelemetry::Key::new(\"http.route\"))\n .map_or(self.0.default, |inner| {\n self.0.should_trace_url(&inner.as_str())\n }) {\n true => self.1.should_sample(\n parent_context,\n trace_id,\n name,\n span_kind,\n attributes,\n links,\n instrumentation_library,\n ),\n false => opentelemetry::trace::SamplingResult {\n decision: opentelemetry::trace::SamplingDecision::Drop,\n attributes: Vec::new(),\n trace_state: match parent_context {\n Some(ctx) => ctx.span().span_context().trace_state().clone(),\n None => TraceState::default(),\n },\n },\n }\n }\n}",
|
| 129 |
+
"after_code": null,
|
| 130 |
+
"diff_span": null,
|
| 131 |
+
"commit_sha": "9b7c6799c7dfc505c61674960321ed6b9d24d149"
|
| 132 |
+
}
|
| 133 |
+
]
|
| 134 |
+
}
|
diffs/pr_6774/a2f98f8/diff.json
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "a2f98f8a87dc1c9c01f3a3df551545a84c41f75b",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/common_utils/src/id_type/merchant.rs",
|
| 6 |
+
"crates/common_utils/src/id_type/payment.rs"
|
| 7 |
+
],
|
| 8 |
+
"diffs": [
|
| 9 |
+
{
|
| 10 |
+
"id": "crates/common_utils/src/id_type/merchant.rs::impl::router_env::opentelemetry::Value",
|
| 11 |
+
"file": "crates/common_utils/src/id_type/merchant.rs",
|
| 12 |
+
"kind": "impl_item",
|
| 13 |
+
"status": "modified",
|
| 14 |
+
"code_changed": true,
|
| 15 |
+
"imports_changed": false,
|
| 16 |
+
"before_code": "impl From<MerchantId> for router_env::opentelemetry::Value {\n fn from(val: MerchantId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }\n}",
|
| 17 |
+
"after_code": "impl From<MerchantId> for router_env::opentelemetry::Value {\n fn from(val: MerchantId) -> Self {\n Self::from(val.0 .0 .0)\n }\n}",
|
| 18 |
+
"diff_span": {
|
| 19 |
+
"before": "impl From<MerchantId> for router_env::opentelemetry::Value {\n fn from(val: MerchantId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }\n}",
|
| 20 |
+
"after": "impl From<MerchantId> for router_env::opentelemetry::Value {\n fn from(val: MerchantId) -> Self {\n Self::from(val.0 .0 .0)\n }\n}"
|
| 21 |
+
},
|
| 22 |
+
"commit_sha": "a2f98f8a87dc1c9c01f3a3df551545a84c41f75b"
|
| 23 |
+
},
|
| 24 |
+
{
|
| 25 |
+
"id": "crates/common_utils/src/id_type/payment.rs::router_env::opentelemetry::Value::function::from",
|
| 26 |
+
"file": "crates/common_utils/src/id_type/payment.rs",
|
| 27 |
+
"kind": "function_item",
|
| 28 |
+
"status": "modified",
|
| 29 |
+
"code_changed": true,
|
| 30 |
+
"imports_changed": false,
|
| 31 |
+
"before_code": "fn from(val: PaymentId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }",
|
| 32 |
+
"after_code": "fn from(val: PaymentId) -> Self {\n Self::from(val.0 .0 .0)\n }",
|
| 33 |
+
"diff_span": {
|
| 34 |
+
"before": "fn from(val: PaymentId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }",
|
| 35 |
+
"after": "fn from(val: PaymentId) -> Self {\n Self::from(val.0 .0 .0)\n }"
|
| 36 |
+
},
|
| 37 |
+
"commit_sha": "a2f98f8a87dc1c9c01f3a3df551545a84c41f75b"
|
| 38 |
+
},
|
| 39 |
+
{
|
| 40 |
+
"id": "crates/common_utils/src/id_type/merchant.rs::router_env::opentelemetry::Value::function::from",
|
| 41 |
+
"file": "crates/common_utils/src/id_type/merchant.rs",
|
| 42 |
+
"kind": "function_item",
|
| 43 |
+
"status": "modified",
|
| 44 |
+
"code_changed": true,
|
| 45 |
+
"imports_changed": false,
|
| 46 |
+
"before_code": "fn from(val: MerchantId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }",
|
| 47 |
+
"after_code": "fn from(val: MerchantId) -> Self {\n Self::from(val.0 .0 .0)\n }",
|
| 48 |
+
"diff_span": {
|
| 49 |
+
"before": "fn from(val: MerchantId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }",
|
| 50 |
+
"after": "fn from(val: MerchantId) -> Self {\n Self::from(val.0 .0 .0)\n }"
|
| 51 |
+
},
|
| 52 |
+
"commit_sha": "a2f98f8a87dc1c9c01f3a3df551545a84c41f75b"
|
| 53 |
+
},
|
| 54 |
+
{
|
| 55 |
+
"id": "crates/common_utils/src/id_type/payment.rs::impl::router_env::opentelemetry::Value",
|
| 56 |
+
"file": "crates/common_utils/src/id_type/payment.rs",
|
| 57 |
+
"kind": "impl_item",
|
| 58 |
+
"status": "modified",
|
| 59 |
+
"code_changed": true,
|
| 60 |
+
"imports_changed": false,
|
| 61 |
+
"before_code": "impl From<PaymentId> for router_env::opentelemetry::Value {\n fn from(val: PaymentId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }\n}",
|
| 62 |
+
"after_code": "impl From<PaymentId> for router_env::opentelemetry::Value {\n fn from(val: PaymentId) -> Self {\n Self::from(val.0 .0 .0)\n }\n}",
|
| 63 |
+
"diff_span": {
|
| 64 |
+
"before": "impl From<PaymentId> for router_env::opentelemetry::Value {\n fn from(val: PaymentId) -> Self {\n let string_value = val.0 .0 .0;\n Self::String(router_env::opentelemetry::StringValue::from(string_value))\n }\n}",
|
| 65 |
+
"after": "impl From<PaymentId> for router_env::opentelemetry::Value {\n fn from(val: PaymentId) -> Self {\n Self::from(val.0 .0 .0)\n }\n}"
|
| 66 |
+
},
|
| 67 |
+
"commit_sha": "a2f98f8a87dc1c9c01f3a3df551545a84c41f75b"
|
| 68 |
+
}
|
| 69 |
+
]
|
| 70 |
+
}
|
diffs/pr_6774/ae3bf0a/diff.json
ADDED
|
@@ -0,0 +1,101 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router_env/src/metrics.rs",
|
| 6 |
+
"crates/scheduler/src/metrics.rs",
|
| 7 |
+
"crates/scheduler/src/utils.rs"
|
| 8 |
+
],
|
| 9 |
+
"diffs": [
|
| 10 |
+
{
|
| 11 |
+
"id": "crates/router_env/src/metrics.rs::macro::counter_metric",
|
| 12 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 13 |
+
"kind": "macro_definition",
|
| 14 |
+
"status": "modified",
|
| 15 |
+
"code_changed": true,
|
| 16 |
+
"imports_changed": false,
|
| 17 |
+
"before_code": "macro_rules! counter_metric {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Counter<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_counter(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Counter<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_counter($description).build());\n };\n}",
|
| 18 |
+
"after_code": "macro_rules! counter_metric {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Counter<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_counter(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Counter<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_counter(stringify!($name))\n .with_description($description)\n .build()\n });\n };\n}",
|
| 19 |
+
"diff_span": {
|
| 20 |
+
"before": " pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Counter<u64>,\n > = once_cell::sync::Lazy::new(|| $meter.u64_counter($description).build());\n };\n}",
|
| 21 |
+
"after": " };\n ($name:ident, $meter:ident, description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Counter<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_counter(stringify!($name))\n .with_description($description)\n .build()\n });\n };\n}"
|
| 22 |
+
},
|
| 23 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a"
|
| 24 |
+
},
|
| 25 |
+
{
|
| 26 |
+
"id": "crates/router_env/src/metrics.rs::macro::gauge_metric",
|
| 27 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 28 |
+
"kind": "macro_definition",
|
| 29 |
+
"status": "modified",
|
| 30 |
+
"code_changed": true,
|
| 31 |
+
"imports_changed": false,
|
| 32 |
+
"before_code": "macro_rules! gauge_metric {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Gauge<u64>> =\n once_cell::sync::Lazy::new(|| $meter.u64_gauge(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Gauge<u64>> =\n once_cell::sync::Lazy::new(|| $meter.u64_gauge($description).build());\n };\n}",
|
| 33 |
+
"after_code": "macro_rules! gauge_metric {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Gauge<u64>> =\n once_cell::sync::Lazy::new(|| $meter.u64_gauge(stringify!($name)).build());\n };\n ($name:ident, $meter:ident, description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Gauge<u64>> =\n once_cell::sync::Lazy::new(|| {\n $meter\n .u64_gauge(stringify!($name))\n .with_description($description)\n .build()\n });\n };\n}",
|
| 34 |
+
"diff_span": {
|
| 35 |
+
"before": " ($name:ident, $meter:ident, description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Gauge<u64>> =\n once_cell::sync::Lazy::new(|| $meter.u64_gauge($description).build());\n };\n}",
|
| 36 |
+
"after": " };\n ($name:ident, $meter:ident, description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Gauge<u64>> =\n once_cell::sync::Lazy::new(|| {\n $meter\n .u64_gauge(stringify!($name))\n .with_description($description)\n .build()\n });\n };\n}"
|
| 37 |
+
},
|
| 38 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a"
|
| 39 |
+
},
|
| 40 |
+
{
|
| 41 |
+
"id": "crates/scheduler/src/utils.rs::function::add_histogram_metrics",
|
| 42 |
+
"file": "crates/scheduler/src/utils.rs",
|
| 43 |
+
"kind": "function_item",
|
| 44 |
+
"status": "modified",
|
| 45 |
+
"code_changed": true,
|
| 46 |
+
"imports_changed": false,
|
| 47 |
+
"before_code": "pub fn add_histogram_metrics(\n pickup_time: &time::PrimitiveDateTime,\n task: &mut storage::ProcessTracker,\n stream_name: &str,\n) {\n #[warn(clippy::option_map_unit_fn)]\n if let Some((schedule_time, runner)) = task.schedule_time.as_ref().zip(task.runner.as_ref()) {\n let pickup_schedule_delta = (*pickup_time - *schedule_time).as_seconds_f64();\n logger::error!(\"Time delta for scheduled tasks: {pickup_schedule_delta} seconds\");\n let runner_name = runner.clone();\n metrics::CONSUMER_STATS.record(\n pickup_schedule_delta,\n router_env::metric_attributes!((stream_name.to_owned(), runner_name)),\n );\n };\n}",
|
| 48 |
+
"after_code": "pub fn add_histogram_metrics(\n pickup_time: &time::PrimitiveDateTime,\n task: &mut storage::ProcessTracker,\n stream_name: &str,\n) {\n #[warn(clippy::option_map_unit_fn)]\n if let Some((schedule_time, runner)) = task.schedule_time.as_ref().zip(task.runner.as_ref()) {\n let pickup_schedule_delta = (*pickup_time - *schedule_time).as_seconds_f64();\n logger::error!(\"Time delta for scheduled tasks: {pickup_schedule_delta} seconds\");\n let runner_name = runner.clone();\n metrics::CONSUMER_OPS.record(\n pickup_schedule_delta,\n router_env::metric_attributes!((stream_name.to_owned(), runner_name)),\n );\n };\n}",
|
| 49 |
+
"diff_span": {
|
| 50 |
+
"before": " logger::error!(\"Time delta for scheduled tasks: {pickup_schedule_delta} seconds\");\n let runner_name = runner.clone();\n metrics::CONSUMER_STATS.record(\n pickup_schedule_delta,\n router_env::metric_attributes!((stream_name.to_owned(), runner_name)),",
|
| 51 |
+
"after": " logger::error!(\"Time delta for scheduled tasks: {pickup_schedule_delta} seconds\");\n let runner_name = runner.clone();\n metrics::CONSUMER_OPS.record(\n pickup_schedule_delta,\n router_env::metric_attributes!((stream_name.to_owned(), runner_name)),"
|
| 52 |
+
},
|
| 53 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a"
|
| 54 |
+
},
|
| 55 |
+
{
|
| 56 |
+
"id": "crates/router_env/src/metrics.rs::macro::global_meter",
|
| 57 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 58 |
+
"kind": "macro_definition",
|
| 59 |
+
"status": "modified",
|
| 60 |
+
"code_changed": true,
|
| 61 |
+
"imports_changed": false,
|
| 62 |
+
"before_code": "macro_rules! global_meter {\n ($name:ident) => {\n static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Meter> =\n once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter(stringify!($name)));\n };\n ($name:ident, $description:literal) => {\n static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Meter> =\n once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter($description));\n };\n}",
|
| 63 |
+
"after_code": "macro_rules! global_meter {\n ($name:ident) => {\n static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Meter> =\n once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter(stringify!($name)));\n };\n ($meter:ident, $name:literal) => {\n static $meter: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Meter> =\n once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter(stringify!($name)));\n };\n}",
|
| 64 |
+
"diff_span": {
|
| 65 |
+
"before": " once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter(stringify!($name)));\n };\n ($name:ident, $description:literal) => {\n static $name: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Meter> =\n once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter($description));\n };\n}",
|
| 66 |
+
"after": " once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter(stringify!($name)));\n };\n ($meter:ident, $name:literal) => {\n static $meter: once_cell::sync::Lazy<$crate::opentelemetry::metrics::Meter> =\n once_cell::sync::Lazy::new(|| $crate::opentelemetry::global::meter(stringify!($name)));\n };\n}"
|
| 67 |
+
},
|
| 68 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a"
|
| 69 |
+
},
|
| 70 |
+
{
|
| 71 |
+
"id": "crates/router_env/src/metrics.rs::macro::histogram_metric_u64",
|
| 72 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 73 |
+
"kind": "macro_definition",
|
| 74 |
+
"status": "modified",
|
| 75 |
+
"code_changed": true,
|
| 76 |
+
"imports_changed": false,
|
| 77 |
+
"before_code": "macro_rules! histogram_metric_u64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}",
|
| 78 |
+
"after_code": "macro_rules! histogram_metric_u64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram(stringify!($name))\n .with_description($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}",
|
| 79 |
+
"diff_span": {
|
| 80 |
+
"before": " > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()",
|
| 81 |
+
"after": " };\n ($name:ident, $meter:ident, $description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<u64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .u64_histogram(stringify!($name))\n .with_description($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()"
|
| 82 |
+
},
|
| 83 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a"
|
| 84 |
+
},
|
| 85 |
+
{
|
| 86 |
+
"id": "crates/router_env/src/metrics.rs::macro::histogram_metric_f64",
|
| 87 |
+
"file": "crates/router_env/src/metrics.rs",
|
| 88 |
+
"kind": "macro_definition",
|
| 89 |
+
"status": "modified",
|
| 90 |
+
"code_changed": true,
|
| 91 |
+
"imports_changed": false,
|
| 92 |
+
"before_code": "macro_rules! histogram_metric_f64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}",
|
| 93 |
+
"after_code": "macro_rules! histogram_metric_f64 {\n ($name:ident, $meter:ident) => {\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram(stringify!($name))\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n ($name:ident, $meter:ident, $description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram(stringify!($name))\n .with_description($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()\n });\n };\n}",
|
| 94 |
+
"diff_span": {
|
| 95 |
+
"before": " > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()",
|
| 96 |
+
"after": " };\n ($name:ident, $meter:ident, $description:literal) => {\n #[doc = $description]\n pub(crate) static $name: once_cell::sync::Lazy<\n $crate::opentelemetry::metrics::Histogram<f64>,\n > = once_cell::sync::Lazy::new(|| {\n $meter\n .f64_histogram(stringify!($name))\n .with_description($description)\n .with_boundaries($crate::metrics::f64_histogram_buckets())\n .build()"
|
| 97 |
+
},
|
| 98 |
+
"commit_sha": "ae3bf0a8e0a87ae7ed74384eed941472706d298a"
|
| 99 |
+
}
|
| 100 |
+
]
|
| 101 |
+
}
|
diffs/pr_6774/b79b3e9/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "b79b3e972f8844cd182b73dac6897666f8e4f258",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6774/c163b5d/diff.json
ADDED
|
@@ -0,0 +1,160 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router_env/src/logger/setup.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup",
|
| 10 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "pub fn setup(\n config: &config::Log,\n service_name: &str,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> error_stack::Result<TelemetryGuard, ConfigError> {\n let mut guards = Vec::new();\n\n /*\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n */\n\n if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n })\n}",
|
| 16 |
+
"after_code": "pub fn setup(\n config: &config::Log,\n service_name: &str,\n crates_to_filter: impl AsRef<[&'static str]>,\n) -> error_stack::Result<TelemetryGuard, ConfigError> {\n let mut guards = Vec::new();\n\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n\n if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);\n\n // Setup console logging\n if config.console.enabled {\n let (console_writer, guard) = tracing_appender::non_blocking(std::io::stdout());\n guards.push(guard);\n\n let console_filter = get_envfilter(\n config.console.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.console.level,\n &crates_to_filter,\n );\n println!(\"Using console logging filter: {console_filter}\");\n\n match config.console.log_format {\n config::LogFormat::Default => {\n let logging_layer = fmt::layer()\n .with_timer(fmt::time::time())\n .pretty()\n .with_writer(console_writer)\n .with_filter(console_filter);\n subscriber.with(logging_layer).init();\n }\n config::LogFormat::Json => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, CompactFormatter)?\n .with_filter(console_filter),\n )\n .init();\n }\n config::LogFormat::PrettyJson => {\n error_stack::Report::set_color_mode(error_stack::fmt::ColorMode::None);\n subscriber\n .with(\n FormattingLayer::new(service_name, console_writer, PrettyFormatter::new())?\n .with_filter(console_filter),\n )\n .init();\n }\n }\n } else {\n subscriber.init();\n };\n\n // Returning the TelemetryGuard for logs to be printed and metrics to be collected until it is\n // dropped\n Ok(TelemetryGuard {\n _log_guards: guards,\n })\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " let mut guards = Vec::new();\n\n /*\n // Setup OpenTelemetry traces and metrics\n let traces_layer = if config.telemetry.traces_enabled {\n setup_tracing_pipeline(&config.telemetry, service_name)\n } else {\n None\n };\n */\n\n if config.telemetry.metrics_enabled {\n setup_metrics_pipeline(&config.telemetry)\n };\n\n // Setup file logging\n let file_writer = if config.file.enabled {\n let mut path = crate::env::workspace_path();\n // Using an absolute path for file log path would replace workspace path with absolute path,\n // which is the intended behavior for us.\n path.push(&config.file.path);\n\n let file_appender = tracing_appender::rolling::hourly(&path, &config.file.file_name);\n let (file_writer, guard) = tracing_appender::non_blocking(file_appender);\n guards.push(guard);\n\n let file_filter = get_envfilter(\n config.file.filtering_directive.as_ref(),\n config::Level(tracing::Level::WARN),\n config.file.level,\n &crates_to_filter,\n );\n println!(\"Using file logging filter: {file_filter}\");\n let layer = FormattingLayer::new(service_name, file_writer, CompactFormatter)?\n .with_filter(file_filter);\n Some(layer)\n } else {\n None\n };\n\n let subscriber = tracing_subscriber::registry()\n // .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);",
|
| 19 |
+
"after": "\n let subscriber = tracing_subscriber::registry()\n .with(traces_layer)\n .with(StorageSubscription)\n .with(file_writer);"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"use serde_json::ser::{CompactFormatter, PrettyFormatter};",
|
| 24 |
+
"use ::config::ConfigError;",
|
| 25 |
+
"use crate::{config, FormattingLayer, StorageSubscription};"
|
| 26 |
+
],
|
| 27 |
+
"after_imports": [
|
| 28 |
+
"use opentelemetry_sdk::trace;",
|
| 29 |
+
"use serde_json::ser::{CompactFormatter, PrettyFormatter};",
|
| 30 |
+
"use ::config::ConfigError;",
|
| 31 |
+
"use crate::{config, FormattingLayer, StorageSubscription};"
|
| 32 |
+
]
|
| 33 |
+
},
|
| 34 |
+
{
|
| 35 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup_metrics_pipeline",
|
| 36 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 37 |
+
"kind": "function_item",
|
| 38 |
+
"status": "modified",
|
| 39 |
+
"code_changed": true,
|
| 40 |
+
"imports_changed": false,
|
| 41 |
+
"before_code": "fn setup_metrics_pipeline(config: &config::LogTelemetry) {\n use opentelemetry_otlp::WithExportConfig;\n\n let exporter_result = opentelemetry_otlp::MetricExporter::builder()\n .with_tonic()\n .with_temporality(opentelemetry_sdk::metrics::Temporality::Cumulative)\n .with_export_config(get_opentelemetry_exporter_config(config))\n .build();\n\n let exporter = if config.ignore_errors {\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to setup metrics pipeline: {error:?}\"))\n .ok();\n return;\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to setup metrics pipeline\")\n };\n\n let reader = opentelemetry_sdk::metrics::PeriodicReader::builder(\n exporter,\n // The runtime would have to be updated if a different web framework is used\n opentelemetry_sdk::runtime::TokioCurrentThread,\n )\n .with_interval(Duration::from_secs(3))\n .with_timeout(Duration::from_secs(10))\n .build();\n\n let provider = opentelemetry_sdk::metrics::SdkMeterProvider::builder()\n .with_reader(reader)\n .with_resource(opentelemetry_sdk::Resource::new([\n opentelemetry::KeyValue::new(\n \"pod\",\n std::env::var(\"POD_NAME\").unwrap_or(String::from(\"hyperswitch-server-default\")),\n ),\n ]))\n .build();\n\n opentelemetry::global::set_meter_provider(provider);\n}",
|
| 42 |
+
"after_code": "fn setup_metrics_pipeline(config: &config::LogTelemetry) {\n use opentelemetry_otlp::WithExportConfig;\n\n let exporter_result = opentelemetry_otlp::MetricExporter::builder()\n .with_tonic()\n .with_temporality(opentelemetry_sdk::metrics::Temporality::Cumulative)\n .with_export_config(get_opentelemetry_exporter_config(config))\n .build();\n\n let exporter = if config.ignore_errors {\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to build metrics exporter: {error:?}\"))\n .ok();\n return;\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to build metrics exporter\")\n };\n\n let reader = opentelemetry_sdk::metrics::PeriodicReader::builder(\n exporter,\n // The runtime would have to be updated if a different web framework is used\n opentelemetry_sdk::runtime::TokioCurrentThread,\n )\n .with_interval(Duration::from_secs(3))\n .with_timeout(Duration::from_secs(10))\n .build();\n\n let provider = opentelemetry_sdk::metrics::SdkMeterProvider::builder()\n .with_reader(reader)\n .with_resource(opentelemetry_sdk::Resource::new([\n opentelemetry::KeyValue::new(\n \"pod\",\n std::env::var(\"POD_NAME\").unwrap_or(String::from(\"hyperswitch-server-default\")),\n ),\n ]))\n .build();\n\n opentelemetry::global::set_meter_provider(provider);\n}",
|
| 43 |
+
"diff_span": {
|
| 44 |
+
"before": " #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to setup metrics pipeline: {error:?}\"))\n .ok();\n return;\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to setup metrics pipeline\")\n };\n",
|
| 45 |
+
"after": " #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to build metrics exporter: {error:?}\"))\n .ok();\n return;\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to build metrics exporter\")\n };\n"
|
| 46 |
+
},
|
| 47 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 48 |
+
},
|
| 49 |
+
{
|
| 50 |
+
"id": "crates/router_env/src/logger/setup.rs::impl::TraceUrlAssert",
|
| 51 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 52 |
+
"kind": "impl_item",
|
| 53 |
+
"status": "added",
|
| 54 |
+
"before_code": null,
|
| 55 |
+
"after_code": "impl From<String> for TraceUrlAssert {\n fn from(value: String) -> Self {\n match value {\n url if url.starts_with('*') => Self::EndsWith(url.trim_start_matches('*').to_string()),\n url => Self::Match(url),\n }\n }\n}",
|
| 56 |
+
"diff_span": null,
|
| 57 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 58 |
+
},
|
| 59 |
+
{
|
| 60 |
+
"id": "crates/router_env/src/logger/setup.rs::TraceUrlAssert::function::from",
|
| 61 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 62 |
+
"kind": "function_item",
|
| 63 |
+
"status": "added",
|
| 64 |
+
"before_code": null,
|
| 65 |
+
"after_code": "fn from(value: String) -> Self {\n match value {\n url if url.starts_with('*') => Self::EndsWith(url.trim_start_matches('*').to_string()),\n url => Self::Match(url),\n }\n }",
|
| 66 |
+
"diff_span": null,
|
| 67 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 68 |
+
},
|
| 69 |
+
{
|
| 70 |
+
"id": "crates/router_env/src/logger/setup.rs::ConditionalSampler<T>::function::should_sample",
|
| 71 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 72 |
+
"kind": "function_item",
|
| 73 |
+
"status": "added",
|
| 74 |
+
"before_code": null,
|
| 75 |
+
"after_code": "fn should_sample(\n &self,\n parent_context: Option<&opentelemetry::Context>,\n trace_id: opentelemetry::trace::TraceId,\n name: &str,\n span_kind: &opentelemetry::trace::SpanKind,\n attributes: &[opentelemetry::KeyValue],\n links: &[opentelemetry::trace::Link],\n ) -> opentelemetry::trace::SamplingResult {\n use opentelemetry::trace::TraceContextExt;\n\n match attributes\n .iter()\n .find(|&kv| kv.key == opentelemetry::Key::new(\"http.route\"))\n .map_or(self.0.default, |inner| {\n self.0.should_trace_url(&inner.value.as_str())\n }) {\n true => {\n self.1\n .should_sample(parent_context, trace_id, name, span_kind, attributes, links)\n }\n false => opentelemetry::trace::SamplingResult {\n decision: opentelemetry::trace::SamplingDecision::Drop,\n attributes: Vec::new(),\n trace_state: match parent_context {\n Some(ctx) => ctx.span().span_context().trace_state().clone(),\n None => opentelemetry::trace::TraceState::default(),\n },\n },\n }\n }",
|
| 76 |
+
"diff_span": null,
|
| 77 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 78 |
+
},
|
| 79 |
+
{
|
| 80 |
+
"id": "crates/router_env/src/logger/setup.rs::struct::ConditionalSampler",
|
| 81 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 82 |
+
"kind": "struct_item",
|
| 83 |
+
"status": "added",
|
| 84 |
+
"before_code": null,
|
| 85 |
+
"after_code": "struct ConditionalSampler<T: opentelemetry_sdk::trace::ShouldSample + Clone + 'static>(\n TraceAssertion,\n T,\n);",
|
| 86 |
+
"diff_span": null,
|
| 87 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 88 |
+
},
|
| 89 |
+
{
|
| 90 |
+
"id": "crates/router_env/src/logger/setup.rs::TraceUrlAssert::function::compare_url",
|
| 91 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 92 |
+
"kind": "function_item",
|
| 93 |
+
"status": "added",
|
| 94 |
+
"before_code": null,
|
| 95 |
+
"after_code": "fn compare_url(&self, url: &str) -> bool {\n match self {\n Self::Match(value) => url == value,\n Self::EndsWith(end) => url.ends_with(end),\n }\n }",
|
| 96 |
+
"diff_span": null,
|
| 97 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 98 |
+
},
|
| 99 |
+
{
|
| 100 |
+
"id": "crates/router_env/src/logger/setup.rs::struct::TraceAssertion",
|
| 101 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 102 |
+
"kind": "struct_item",
|
| 103 |
+
"status": "added",
|
| 104 |
+
"before_code": null,
|
| 105 |
+
"after_code": "struct TraceAssertion {\n clauses: Option<Vec<TraceUrlAssert>>,\n /// default behaviour for tracing if no condition is provided\n default: bool,\n}",
|
| 106 |
+
"diff_span": null,
|
| 107 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 108 |
+
},
|
| 109 |
+
{
|
| 110 |
+
"id": "crates/router_env/src/logger/setup.rs::enum::TraceUrlAssert",
|
| 111 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 112 |
+
"kind": "enum_item",
|
| 113 |
+
"status": "added",
|
| 114 |
+
"before_code": null,
|
| 115 |
+
"after_code": "enum TraceUrlAssert {\n Match(String),\n EndsWith(String),\n}",
|
| 116 |
+
"diff_span": null,
|
| 117 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 118 |
+
},
|
| 119 |
+
{
|
| 120 |
+
"id": "crates/router_env/src/logger/setup.rs::TraceAssertion::function::should_trace_url",
|
| 121 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 122 |
+
"kind": "function_item",
|
| 123 |
+
"status": "added",
|
| 124 |
+
"before_code": null,
|
| 125 |
+
"after_code": "fn should_trace_url(&self, url: &str) -> bool {\n match &self.clauses {\n Some(clauses) => clauses.iter().all(|cur| cur.compare_url(url)),\n None => self.default,\n }\n }",
|
| 126 |
+
"diff_span": null,
|
| 127 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 128 |
+
},
|
| 129 |
+
{
|
| 130 |
+
"id": "crates/router_env/src/logger/setup.rs::function::setup_tracing_pipeline",
|
| 131 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 132 |
+
"kind": "function_item",
|
| 133 |
+
"status": "added",
|
| 134 |
+
"before_code": null,
|
| 135 |
+
"after_code": "fn setup_tracing_pipeline(\n config: &config::LogTelemetry,\n service_name: &str,\n) -> Option<\n tracing_opentelemetry::OpenTelemetryLayer<\n tracing_subscriber::Registry,\n opentelemetry_sdk::trace::Tracer,\n >,\n> {\n use opentelemetry::trace::TracerProvider;\n use opentelemetry_otlp::WithExportConfig;\n use opentelemetry_sdk::trace;\n\n opentelemetry::global::set_text_map_propagator(\n opentelemetry_sdk::propagation::TraceContextPropagator::new(),\n );\n\n // Set the export interval to 1 second\n let batch_config = trace::BatchConfigBuilder::default()\n .with_scheduled_delay(Duration::from_millis(1000))\n .build();\n\n let exporter_result = opentelemetry_otlp::SpanExporter::builder()\n .with_tonic()\n .with_export_config(get_opentelemetry_exporter_config(config))\n .build();\n\n let exporter = if config.ignore_errors {\n #[allow(clippy::print_stderr)] // The logger hasn't been initialized yet\n exporter_result\n .inspect_err(|error| eprintln!(\"Failed to build traces exporter: {error:?}\"))\n .ok()?\n } else {\n // Safety: This is conditional, there is an option to avoid this behavior at runtime.\n #[allow(clippy::expect_used)]\n exporter_result.expect(\"Failed to build traces exporter\")\n };\n\n let mut provider_builder = trace::TracerProvider::builder()\n .with_span_processor(\n trace::BatchSpanProcessor::builder(\n exporter,\n // The runtime would have to be updated if a different web framework is used\n opentelemetry_sdk::runtime::TokioCurrentThread,\n )\n .with_batch_config(batch_config)\n .build(),\n )\n .with_sampler(trace::Sampler::ParentBased(Box::new(ConditionalSampler(\n TraceAssertion {\n clauses: config\n .route_to_trace\n .clone()\n .map(|inner| inner.into_iter().map(TraceUrlAssert::from).collect()),\n default: false,\n },\n trace::Sampler::TraceIdRatioBased(config.sampling_rate.unwrap_or(1.0)),\n ))))\n .with_resource(opentelemetry_sdk::Resource::new(vec![\n opentelemetry::KeyValue::new(\"service.name\", service_name.to_owned()),\n ]));\n\n if config.use_xray_generator {\n provider_builder = provider_builder\n .with_id_generator(opentelemetry_aws::trace::XrayIdGenerator::default());\n }\n\n Some(\n tracing_opentelemetry::layer()\n .with_tracer(provider_builder.build().tracer(service_name.to_owned())),\n )\n}",
|
| 136 |
+
"diff_span": null,
|
| 137 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 138 |
+
},
|
| 139 |
+
{
|
| 140 |
+
"id": "crates/router_env/src/logger/setup.rs::impl::TraceAssertion",
|
| 141 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 142 |
+
"kind": "impl_item",
|
| 143 |
+
"status": "added",
|
| 144 |
+
"before_code": null,
|
| 145 |
+
"after_code": "impl TraceAssertion {\n /// Should the provided url be traced\n fn should_trace_url(&self, url: &str) -> bool {\n match &self.clauses {\n Some(clauses) => clauses.iter().all(|cur| cur.compare_url(url)),\n None => self.default,\n }\n }\n}",
|
| 146 |
+
"diff_span": null,
|
| 147 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 148 |
+
},
|
| 149 |
+
{
|
| 150 |
+
"id": "crates/router_env/src/logger/setup.rs::impl::ConditionalSampler<T>",
|
| 151 |
+
"file": "crates/router_env/src/logger/setup.rs",
|
| 152 |
+
"kind": "impl_item",
|
| 153 |
+
"status": "added",
|
| 154 |
+
"before_code": null,
|
| 155 |
+
"after_code": "impl<T: opentelemetry_sdk::trace::ShouldSample + Clone + 'static>\n opentelemetry_sdk::trace::ShouldSample for ConditionalSampler<T>\n{\n fn should_sample(\n &self,\n parent_context: Option<&opentelemetry::Context>,\n trace_id: opentelemetry::trace::TraceId,\n name: &str,\n span_kind: &opentelemetry::trace::SpanKind,\n attributes: &[opentelemetry::KeyValue],\n links: &[opentelemetry::trace::Link],\n ) -> opentelemetry::trace::SamplingResult {\n use opentelemetry::trace::TraceContextExt;\n\n match attributes\n .iter()\n .find(|&kv| kv.key == opentelemetry::Key::new(\"http.route\"))\n .map_or(self.0.default, |inner| {\n self.0.should_trace_url(&inner.value.as_str())\n }) {\n true => {\n self.1\n .should_sample(parent_context, trace_id, name, span_kind, attributes, links)\n }\n false => opentelemetry::trace::SamplingResult {\n decision: opentelemetry::trace::SamplingDecision::Drop,\n attributes: Vec::new(),\n trace_state: match parent_context {\n Some(ctx) => ctx.span().span_context().trace_state().clone(),\n None => opentelemetry::trace::TraceState::default(),\n },\n },\n }\n }\n}",
|
| 156 |
+
"diff_span": null,
|
| 157 |
+
"commit_sha": "c163b5d01b579be007d87b5a71e8328f2831febf"
|
| 158 |
+
}
|
| 159 |
+
]
|
| 160 |
+
}
|
diffs/pr_6774/d985e24/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "d985e2475bc29c67d3e2e44729a724c34653e91f",
|
| 3 |
+
"pr_number": 6774,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_6774/ef07ecb/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_6846/2a49e03/diff.json
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "2a49e03886878e10c675c4afe7126ce7ab8b218e",
|
| 3 |
+
"pr_number": 6846,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/volt/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs::RouterData<F, T, PaymentsResponseData>::function::try_from",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs",
|
| 11 |
+
"kind": "function_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }",
|
| 16 |
+
"after_code": "fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status =\n get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,",
|
| 19 |
+
"after": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status =\n get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "2a49e03886878e10c675c4afe7126ce7ab8b218e"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs::impl::RouterData<F, T, PaymentsResponseData>",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs",
|
| 26 |
+
"kind": "impl_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "impl<F, T> TryFrom<ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>>\n for RouterData<F, T, PaymentsResponseData>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }\n}",
|
| 31 |
+
"after_code": "impl<F, T> TryFrom<ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>>\n for RouterData<F, T, PaymentsResponseData>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status =\n get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }\n}",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,",
|
| 34 |
+
"after": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status =\n get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "2a49e03886878e10c675c4afe7126ce7ab8b218e"
|
| 37 |
+
}
|
| 38 |
+
]
|
| 39 |
+
}
|
diffs/pr_6846/e0c4655/diff.json
ADDED
|
@@ -0,0 +1,64 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "e0c465579af0fb25b6ec05e452674c16e33c4d63",
|
| 3 |
+
"pr_number": 6846,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/volt/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs::enum::VoltPaymentStatus",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs",
|
| 11 |
+
"kind": "enum_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": true,
|
| 14 |
+
"imports_changed": false,
|
| 15 |
+
"before_code": "pub enum VoltPaymentStatus {\n NewPayment,\n Completed,\n Received,\n NotReceived,\n BankRedirect,\n DelayedAtBank,\n AwaitingCheckoutAuthorisation,\n RefusedByBank,\n RefusedByRisk,\n ErrorAtBank,\n CancelledByUser,\n AbandonedByUser,\n Failed,\n Settled,\n}",
|
| 16 |
+
"after_code": "pub enum VoltPaymentStatus {\n NewPayment,\n Completed,\n Received,\n NotReceived,\n BankRedirect,\n DelayedAtBank,\n AwaitingCheckoutAuthorisation,\n RefusedByBank,\n RefusedByRisk,\n ErrorAtBank,\n CancelledByUser,\n AbandonedByUser,\n Failed,\n Settled,\n Unknown,\n}",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": " Failed,\n Settled,\n Unknown,\n}"
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "e0c465579af0fb25b6ec05e452674c16e33c4d63"
|
| 22 |
+
},
|
| 23 |
+
{
|
| 24 |
+
"id": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs::RouterData<F, T, PaymentsResponseData>::function::try_from",
|
| 25 |
+
"file": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs",
|
| 26 |
+
"kind": "function_item",
|
| 27 |
+
"status": "modified",
|
| 28 |
+
"code_changed": true,
|
| 29 |
+
"imports_changed": false,
|
| 30 |
+
"before_code": "fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = enums::AttemptStatus::from(payment_response.status.clone());\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }",
|
| 31 |
+
"after_code": "fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }",
|
| 32 |
+
"diff_span": {
|
| 33 |
+
"before": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = enums::AttemptStatus::from(payment_response.status.clone());\n Ok(Self {\n status,",
|
| 34 |
+
"after": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,"
|
| 35 |
+
},
|
| 36 |
+
"commit_sha": "e0c465579af0fb25b6ec05e452674c16e33c4d63"
|
| 37 |
+
},
|
| 38 |
+
{
|
| 39 |
+
"id": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs::impl::RouterData<F, T, PaymentsResponseData>",
|
| 40 |
+
"file": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs",
|
| 41 |
+
"kind": "impl_item",
|
| 42 |
+
"status": "modified",
|
| 43 |
+
"code_changed": true,
|
| 44 |
+
"imports_changed": false,
|
| 45 |
+
"before_code": "impl<F, T> TryFrom<ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>>\n for RouterData<F, T, PaymentsResponseData>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = enums::AttemptStatus::from(payment_response.status.clone());\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }\n}",
|
| 46 |
+
"after_code": "impl<F, T> TryFrom<ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>>\n for RouterData<F, T, PaymentsResponseData>\n{\n type Error = error_stack::Report<errors::ConnectorError>;\n fn try_from(\n item: ResponseRouterData<F, VoltPaymentsResponseData, T, PaymentsResponseData>,\n ) -> Result<Self, Self::Error> {\n match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: payment_response.status.clone().to_string(),\n message: payment_response.status.clone().to_string(),\n reason: Some(payment_response.status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(payment_response.id),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n payment_response.id.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: payment_response\n .merchant_internal_reference\n .or(Some(payment_response.id)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n VoltPaymentsResponseData::WebhookResponse(webhook_response) => {\n let detailed_status = webhook_response.detailed_status.clone();\n let status = enums::AttemptStatus::from(webhook_response.status);\n Ok(Self {\n status,\n response: if is_payment_failure(status) {\n Err(ErrorResponse {\n code: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_CODE.to_owned()),\n message: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string())\n .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_owned()),\n reason: detailed_status\n .clone()\n .map(|volt_status| volt_status.to_string()),\n status_code: item.http_code,\n attempt_status: None,\n connector_transaction_id: Some(webhook_response.payment.clone()),\n })\n } else {\n Ok(PaymentsResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\n webhook_response.payment.clone(),\n ),\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: webhook_response\n .merchant_internal_reference\n .or(Some(webhook_response.payment)),\n incremental_authorization_allowed: None,\n charge_id: None,\n })\n },\n ..item.data\n })\n }\n }\n }\n}",
|
| 47 |
+
"diff_span": {
|
| 48 |
+
"before": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = enums::AttemptStatus::from(payment_response.status.clone());\n Ok(Self {\n status,",
|
| 49 |
+
"after": " match item.response {\n VoltPaymentsResponseData::PsyncResponse(payment_response) => {\n let status = get_attempt_status((payment_response.status.clone(), item.data.status));\n Ok(Self {\n status,"
|
| 50 |
+
},
|
| 51 |
+
"commit_sha": "e0c465579af0fb25b6ec05e452674c16e33c4d63"
|
| 52 |
+
},
|
| 53 |
+
{
|
| 54 |
+
"id": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs::function::get_attempt_status",
|
| 55 |
+
"file": "crates/hyperswitch_connectors/src/connectors/volt/transformers.rs",
|
| 56 |
+
"kind": "function_item",
|
| 57 |
+
"status": "added",
|
| 58 |
+
"before_code": null,
|
| 59 |
+
"after_code": "fn get_attempt_status(\n (item, current_status): (VoltPaymentStatus, enums::AttemptStatus),\n) -> enums::AttemptStatus {\n match item {\n VoltPaymentStatus::Received | VoltPaymentStatus::Settled => enums::AttemptStatus::Charged,\n VoltPaymentStatus::Completed | VoltPaymentStatus::DelayedAtBank => {\n enums::AttemptStatus::Pending\n }\n VoltPaymentStatus::NewPayment\n | VoltPaymentStatus::BankRedirect\n | VoltPaymentStatus::AwaitingCheckoutAuthorisation => {\n enums::AttemptStatus::AuthenticationPending\n }\n VoltPaymentStatus::RefusedByBank\n | VoltPaymentStatus::RefusedByRisk\n | VoltPaymentStatus::NotReceived\n | VoltPaymentStatus::ErrorAtBank\n | VoltPaymentStatus::CancelledByUser\n | VoltPaymentStatus::AbandonedByUser\n | VoltPaymentStatus::Failed => enums::AttemptStatus::Failure,\n VoltPaymentStatus::Unknown => current_status,\n }\n}",
|
| 60 |
+
"diff_span": null,
|
| 61 |
+
"commit_sha": "e0c465579af0fb25b6ec05e452674c16e33c4d63"
|
| 62 |
+
}
|
| 63 |
+
]
|
| 64 |
+
}
|
diffs/pr_6851/34ca118/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "34ca11869e557b2958abd813421dbf4ec3f6e0c0",
|
| 3 |
+
"pr_number": 6851,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/router/src/connector/adyen/transformers.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_7938/50cb59e/diff.json
ADDED
|
The diff for this file is too large to render.
See raw diff
|
|
|
diffs/pr_7953/00fbb77/diff.json
ADDED
|
@@ -0,0 +1,625 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 3 |
+
"pr_number": 7953,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/riskified.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": [
|
| 8 |
+
{
|
| 9 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::mod::transformers",
|
| 10 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 11 |
+
"kind": "mod_item",
|
| 12 |
+
"status": "modified",
|
| 13 |
+
"code_changed": false,
|
| 14 |
+
"imports_changed": true,
|
| 15 |
+
"before_code": "pub mod transformers;",
|
| 16 |
+
"after_code": "pub mod transformers;",
|
| 17 |
+
"diff_span": {
|
| 18 |
+
"before": "",
|
| 19 |
+
"after": ""
|
| 20 |
+
},
|
| 21 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 22 |
+
"before_imports": [
|
| 23 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 24 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 25 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 26 |
+
],
|
| 27 |
+
"after_imports": [
|
| 28 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 29 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 30 |
+
]
|
| 31 |
+
},
|
| 32 |
+
{
|
| 33 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::new",
|
| 34 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 35 |
+
"kind": "function_item",
|
| 36 |
+
"status": "modified",
|
| 37 |
+
"code_changed": true,
|
| 38 |
+
"imports_changed": true,
|
| 39 |
+
"before_code": "pub fn new() -> &'static Self {\n &Self {\n amount_converter: &StringMajorUnitForConnector,\n }\n }",
|
| 40 |
+
"after_code": "pub fn new() -> &'static Self {\n &Self {\n #[cfg(feature = \"frm\")]\n amount_converter: &StringMajorUnitForConnector,\n }\n }",
|
| 41 |
+
"diff_span": {
|
| 42 |
+
"before": "",
|
| 43 |
+
"after": "pub fn new() -> &'static Self {\n &Self {\n #[cfg(feature = \"frm\")]\n amount_converter: &StringMajorUnitForConnector,\n }"
|
| 44 |
+
},
|
| 45 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 46 |
+
"before_imports": [
|
| 47 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 48 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 49 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 50 |
+
],
|
| 51 |
+
"after_imports": [
|
| 52 |
+
"use common_utils::types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector};",
|
| 53 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 54 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 55 |
+
]
|
| 56 |
+
},
|
| 57 |
+
{
|
| 58 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_webhook_source_verification_algorithm",
|
| 59 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 60 |
+
"kind": "function_item",
|
| 61 |
+
"status": "modified",
|
| 62 |
+
"code_changed": false,
|
| 63 |
+
"imports_changed": true,
|
| 64 |
+
"before_code": "fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, ConnectorError> {\n Ok(Box::new(crypto::HmacSha256))\n }",
|
| 65 |
+
"after_code": "fn get_webhook_source_verification_algorithm(\n &self,\n _request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn crypto::VerifySignature + Send>, ConnectorError> {\n Ok(Box::new(crypto::HmacSha256))\n }",
|
| 66 |
+
"diff_span": {
|
| 67 |
+
"before": "",
|
| 68 |
+
"after": ""
|
| 69 |
+
},
|
| 70 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 71 |
+
"before_imports": [
|
| 72 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 73 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 74 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 75 |
+
],
|
| 76 |
+
"after_imports": [
|
| 77 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 78 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 79 |
+
]
|
| 80 |
+
},
|
| 81 |
+
{
|
| 82 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_content_type",
|
| 83 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 84 |
+
"kind": "function_item",
|
| 85 |
+
"status": "modified",
|
| 86 |
+
"code_changed": false,
|
| 87 |
+
"imports_changed": true,
|
| 88 |
+
"before_code": "fn get_content_type(&self) -> &'static str {\n self.common_get_content_type()\n }",
|
| 89 |
+
"after_code": "fn get_content_type(&self) -> &'static str {\n self.common_get_content_type()\n }",
|
| 90 |
+
"diff_span": {
|
| 91 |
+
"before": "",
|
| 92 |
+
"after": ""
|
| 93 |
+
},
|
| 94 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 95 |
+
"before_imports": [
|
| 96 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 97 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 98 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 99 |
+
],
|
| 100 |
+
"after_imports": [
|
| 101 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 102 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 103 |
+
]
|
| 104 |
+
},
|
| 105 |
+
{
|
| 106 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_headers",
|
| 107 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 108 |
+
"kind": "function_item",
|
| 109 |
+
"status": "modified",
|
| 110 |
+
"code_changed": false,
|
| 111 |
+
"imports_changed": true,
|
| 112 |
+
"before_code": "fn get_headers(\n &self,\n req: &FrmFulfillmentRouterData,\n connectors: &Connectors,\n ) -> CustomResult<Vec<(String, Maskable<String>)>, ConnectorError> {\n self.build_headers(req, connectors)\n }",
|
| 113 |
+
"after_code": "fn get_headers(\n &self,\n req: &FrmFulfillmentRouterData,\n connectors: &Connectors,\n ) -> CustomResult<Vec<(String, Maskable<String>)>, ConnectorError> {\n self.build_headers(req, connectors)\n }",
|
| 114 |
+
"diff_span": {
|
| 115 |
+
"before": "",
|
| 116 |
+
"after": ""
|
| 117 |
+
},
|
| 118 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 119 |
+
"before_imports": [
|
| 120 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 121 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 122 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 123 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 124 |
+
"use crate::constants::headers;",
|
| 125 |
+
"use masking::Maskable;"
|
| 126 |
+
],
|
| 127 |
+
"after_imports": [
|
| 128 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 129 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 130 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 131 |
+
"use crate::constants::headers;",
|
| 132 |
+
"use masking::Maskable;"
|
| 133 |
+
]
|
| 134 |
+
},
|
| 135 |
+
{
|
| 136 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_webhook_object_reference_id",
|
| 137 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 138 |
+
"kind": "function_item",
|
| 139 |
+
"status": "modified",
|
| 140 |
+
"code_changed": false,
|
| 141 |
+
"imports_changed": true,
|
| 142 |
+
"before_code": "fn get_webhook_object_reference_id(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<ObjectReferenceId, ConnectorError> {\n let resource: riskified::RiskifiedWebhookBody = request\n .body\n .parse_struct(\"RiskifiedWebhookBody\")\n .change_context(ConnectorError::WebhookReferenceIdNotFound)?;\n Ok(ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::PaymentAttemptId(resource.id),\n ))\n }",
|
| 143 |
+
"after_code": "fn get_webhook_object_reference_id(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<ObjectReferenceId, ConnectorError> {\n let resource: riskified::RiskifiedWebhookBody = request\n .body\n .parse_struct(\"RiskifiedWebhookBody\")\n .change_context(ConnectorError::WebhookReferenceIdNotFound)?;\n Ok(ObjectReferenceId::PaymentId(\n api_models::payments::PaymentIdType::PaymentAttemptId(resource.id),\n ))\n }",
|
| 144 |
+
"diff_span": {
|
| 145 |
+
"before": "",
|
| 146 |
+
"after": ""
|
| 147 |
+
},
|
| 148 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 149 |
+
"before_imports": [
|
| 150 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 151 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 152 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 153 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 154 |
+
],
|
| 155 |
+
"after_imports": [
|
| 156 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 157 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 158 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 159 |
+
]
|
| 160 |
+
},
|
| 161 |
+
{
|
| 162 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_webhook_resource_object",
|
| 163 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 164 |
+
"kind": "function_item",
|
| 165 |
+
"status": "modified",
|
| 166 |
+
"code_changed": false,
|
| 167 |
+
"imports_changed": true,
|
| 168 |
+
"before_code": "fn get_webhook_resource_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, ConnectorError> {\n let resource: riskified::RiskifiedWebhookBody = request\n .body\n .parse_struct(\"RiskifiedWebhookBody\")\n .change_context(ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(Box::new(resource))\n }",
|
| 169 |
+
"after_code": "fn get_webhook_resource_object(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<Box<dyn masking::ErasedMaskSerialize>, ConnectorError> {\n let resource: riskified::RiskifiedWebhookBody = request\n .body\n .parse_struct(\"RiskifiedWebhookBody\")\n .change_context(ConnectorError::WebhookResourceObjectNotFound)?;\n Ok(Box::new(resource))\n }",
|
| 170 |
+
"diff_span": {
|
| 171 |
+
"before": "",
|
| 172 |
+
"after": ""
|
| 173 |
+
},
|
| 174 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 175 |
+
"before_imports": [
|
| 176 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 177 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 178 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 179 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 180 |
+
],
|
| 181 |
+
"after_imports": [
|
| 182 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 183 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 184 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 185 |
+
]
|
| 186 |
+
},
|
| 187 |
+
{
|
| 188 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_error_response",
|
| 189 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 190 |
+
"kind": "function_item",
|
| 191 |
+
"status": "modified",
|
| 192 |
+
"code_changed": false,
|
| 193 |
+
"imports_changed": true,
|
| 194 |
+
"before_code": "fn get_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, ConnectorError> {\n self.build_error_response(res, event_builder)\n }",
|
| 195 |
+
"after_code": "fn get_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, ConnectorError> {\n self.build_error_response(res, event_builder)\n }",
|
| 196 |
+
"diff_span": {
|
| 197 |
+
"before": "",
|
| 198 |
+
"after": ""
|
| 199 |
+
},
|
| 200 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 201 |
+
"before_imports": [
|
| 202 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 203 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 204 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 205 |
+
],
|
| 206 |
+
"after_imports": [
|
| 207 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 208 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 209 |
+
]
|
| 210 |
+
},
|
| 211 |
+
{
|
| 212 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::common_get_content_type",
|
| 213 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 214 |
+
"kind": "function_item",
|
| 215 |
+
"status": "modified",
|
| 216 |
+
"code_changed": false,
|
| 217 |
+
"imports_changed": true,
|
| 218 |
+
"before_code": "fn common_get_content_type(&self) -> &'static str {\n \"application/json\"\n }",
|
| 219 |
+
"after_code": "fn common_get_content_type(&self) -> &'static str {\n \"application/json\"\n }",
|
| 220 |
+
"diff_span": {
|
| 221 |
+
"before": "",
|
| 222 |
+
"after": ""
|
| 223 |
+
},
|
| 224 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 225 |
+
"before_imports": [
|
| 226 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 227 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 228 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 229 |
+
],
|
| 230 |
+
"after_imports": [
|
| 231 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 232 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 233 |
+
]
|
| 234 |
+
},
|
| 235 |
+
{
|
| 236 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::id",
|
| 237 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 238 |
+
"kind": "function_item",
|
| 239 |
+
"status": "modified",
|
| 240 |
+
"code_changed": false,
|
| 241 |
+
"imports_changed": true,
|
| 242 |
+
"before_code": "fn id(&self) -> &'static str {\n \"riskified\"\n }",
|
| 243 |
+
"after_code": "fn id(&self) -> &'static str {\n \"riskified\"\n }",
|
| 244 |
+
"diff_span": {
|
| 245 |
+
"before": "",
|
| 246 |
+
"after": ""
|
| 247 |
+
},
|
| 248 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 249 |
+
"before_imports": [
|
| 250 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 251 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 252 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 253 |
+
],
|
| 254 |
+
"after_imports": [
|
| 255 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 256 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 257 |
+
]
|
| 258 |
+
},
|
| 259 |
+
{
|
| 260 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::build_error_response",
|
| 261 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 262 |
+
"kind": "function_item",
|
| 263 |
+
"status": "modified",
|
| 264 |
+
"code_changed": false,
|
| 265 |
+
"imports_changed": true,
|
| 266 |
+
"before_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, ConnectorError> {\n use hyperswitch_interfaces::consts::NO_ERROR_CODE;\n\n let response: riskified::ErrorResponse = res\n .response\n .parse_struct(\"ErrorResponse\")\n .change_context(ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_error_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n attempt_status: None,\n code: NO_ERROR_CODE.to_string(),\n message: response.error.message.clone(),\n reason: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n })\n }",
|
| 267 |
+
"after_code": "fn build_error_response(\n &self,\n res: Response,\n event_builder: Option<&mut ConnectorEvent>,\n ) -> CustomResult<ErrorResponse, ConnectorError> {\n use hyperswitch_interfaces::consts::NO_ERROR_CODE;\n\n let response: riskified::ErrorResponse = res\n .response\n .parse_struct(\"ErrorResponse\")\n .change_context(ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_error_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n Ok(ErrorResponse {\n status_code: res.status_code,\n attempt_status: None,\n code: NO_ERROR_CODE.to_string(),\n message: response.error.message.clone(),\n reason: None,\n connector_transaction_id: None,\n network_advice_code: None,\n network_decline_code: None,\n network_error_message: None,\n })\n }",
|
| 268 |
+
"diff_span": {
|
| 269 |
+
"before": "",
|
| 270 |
+
"after": ""
|
| 271 |
+
},
|
| 272 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 273 |
+
"before_imports": [
|
| 274 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 275 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 276 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 277 |
+
"use hyperswitch_interfaces::consts::NO_ERROR_CODE;"
|
| 278 |
+
],
|
| 279 |
+
"after_imports": [
|
| 280 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 281 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 282 |
+
"use hyperswitch_interfaces::consts::NO_ERROR_CODE;"
|
| 283 |
+
]
|
| 284 |
+
},
|
| 285 |
+
{
|
| 286 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_webhook_source_verification_signature",
|
| 287 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 288 |
+
"kind": "function_item",
|
| 289 |
+
"status": "modified",
|
| 290 |
+
"code_changed": false,
|
| 291 |
+
"imports_changed": true,
|
| 292 |
+
"before_code": "fn get_webhook_source_verification_signature(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, ConnectorError> {\n let header_value =\n crate::utils::get_header_key_value(\"x-riskified-hmac-sha256\", request.headers)?;\n Ok(header_value.as_bytes().to_vec())\n }",
|
| 293 |
+
"after_code": "fn get_webhook_source_verification_signature(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n _connector_webhook_secrets: &ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, ConnectorError> {\n let header_value =\n crate::utils::get_header_key_value(\"x-riskified-hmac-sha256\", request.headers)?;\n Ok(header_value.as_bytes().to_vec())\n }",
|
| 294 |
+
"diff_span": {
|
| 295 |
+
"before": "",
|
| 296 |
+
"after": ""
|
| 297 |
+
},
|
| 298 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 299 |
+
"before_imports": [
|
| 300 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 301 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 302 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 303 |
+
"use ring::hmac;",
|
| 304 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 305 |
+
"use crate::constants::headers;",
|
| 306 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 307 |
+
],
|
| 308 |
+
"after_imports": [
|
| 309 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 310 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 311 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 312 |
+
"use ring::hmac;",
|
| 313 |
+
"use crate::constants::headers;",
|
| 314 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 315 |
+
]
|
| 316 |
+
},
|
| 317 |
+
{
|
| 318 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::struct::Riskified",
|
| 319 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 320 |
+
"kind": "struct_item",
|
| 321 |
+
"status": "modified",
|
| 322 |
+
"code_changed": true,
|
| 323 |
+
"imports_changed": true,
|
| 324 |
+
"before_code": "pub struct Riskified {\n amount_converter: &'static (dyn AmountConvertor<Output = StringMajorUnit> + Sync),\n}",
|
| 325 |
+
"after_code": "pub struct Riskified {\n #[cfg(feature = \"frm\")]\n amount_converter: &'static (dyn AmountConvertor<Output = StringMajorUnit> + Sync),\n}",
|
| 326 |
+
"diff_span": {
|
| 327 |
+
"before": "",
|
| 328 |
+
"after": "pub struct Riskified {\n #[cfg(feature = \"frm\")]\n amount_converter: &'static (dyn AmountConvertor<Output = StringMajorUnit> + Sync),\n}"
|
| 329 |
+
},
|
| 330 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 331 |
+
"before_imports": [
|
| 332 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 333 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 334 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 335 |
+
],
|
| 336 |
+
"after_imports": [
|
| 337 |
+
"use common_utils::types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector};",
|
| 338 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 339 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 340 |
+
]
|
| 341 |
+
},
|
| 342 |
+
{
|
| 343 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::build_request",
|
| 344 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 345 |
+
"kind": "function_item",
|
| 346 |
+
"status": "modified",
|
| 347 |
+
"code_changed": false,
|
| 348 |
+
"imports_changed": true,
|
| 349 |
+
"before_code": "fn build_request(\n &self,\n _req: &RouterData<SetupMandate, SetupMandateRequestData, PaymentsResponseData>,\n _connectors: &Connectors,\n ) -> CustomResult<Option<Request>, ConnectorError> {\n Err(ConnectorError::NotImplemented(\"Setup Mandate flow for Riskified\".to_string()).into())\n }",
|
| 350 |
+
"after_code": "fn build_request(\n &self,\n _req: &RouterData<SetupMandate, SetupMandateRequestData, PaymentsResponseData>,\n _connectors: &Connectors,\n ) -> CustomResult<Option<Request>, ConnectorError> {\n Err(ConnectorError::NotImplemented(\"Setup Mandate flow for Riskified\".to_string()).into())\n }",
|
| 351 |
+
"diff_span": {
|
| 352 |
+
"before": "",
|
| 353 |
+
"after": ""
|
| 354 |
+
},
|
| 355 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 356 |
+
"before_imports": [
|
| 357 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 358 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 359 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 360 |
+
],
|
| 361 |
+
"after_imports": [
|
| 362 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 363 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 364 |
+
]
|
| 365 |
+
},
|
| 366 |
+
{
|
| 367 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::handle_response",
|
| 368 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 369 |
+
"kind": "function_item",
|
| 370 |
+
"status": "modified",
|
| 371 |
+
"code_changed": false,
|
| 372 |
+
"imports_changed": true,
|
| 373 |
+
"before_code": "fn handle_response(\n &self,\n data: &FrmFulfillmentRouterData,\n event_builder: Option<&mut ConnectorEvent>,\n res: Response,\n ) -> CustomResult<FrmFulfillmentRouterData, ConnectorError> {\n let response: riskified::RiskifiedFulfilmentResponse = res\n .response\n .parse_struct(\"RiskifiedFulfilmentResponse fulfilment\")\n .change_context(ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n FrmFulfillmentRouterData::try_from(ResponseRouterData {\n response,\n data: data.clone(),\n http_code: res.status_code,\n })\n }",
|
| 374 |
+
"after_code": "fn handle_response(\n &self,\n data: &FrmFulfillmentRouterData,\n event_builder: Option<&mut ConnectorEvent>,\n res: Response,\n ) -> CustomResult<FrmFulfillmentRouterData, ConnectorError> {\n let response: riskified::RiskifiedFulfilmentResponse = res\n .response\n .parse_struct(\"RiskifiedFulfilmentResponse fulfilment\")\n .change_context(ConnectorError::ResponseDeserializationFailed)?;\n\n event_builder.map(|i| i.set_response_body(&response));\n router_env::logger::info!(connector_response=?response);\n\n FrmFulfillmentRouterData::try_from(ResponseRouterData {\n response,\n data: data.clone(),\n http_code: res.status_code,\n })\n }",
|
| 375 |
+
"diff_span": {
|
| 376 |
+
"before": "",
|
| 377 |
+
"after": ""
|
| 378 |
+
},
|
| 379 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 380 |
+
"before_imports": [
|
| 381 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 382 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 383 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 384 |
+
],
|
| 385 |
+
"after_imports": [
|
| 386 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 387 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 388 |
+
]
|
| 389 |
+
},
|
| 390 |
+
{
|
| 391 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_webhook_event_type",
|
| 392 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 393 |
+
"kind": "function_item",
|
| 394 |
+
"status": "modified",
|
| 395 |
+
"code_changed": false,
|
| 396 |
+
"imports_changed": true,
|
| 397 |
+
"before_code": "fn get_webhook_event_type(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<IncomingWebhookEvent, ConnectorError> {\n let resource: riskified::RiskifiedWebhookBody = request\n .body\n .parse_struct(\"RiskifiedWebhookBody\")\n .change_context(ConnectorError::WebhookEventTypeNotFound)?;\n Ok(IncomingWebhookEvent::from(resource.status))\n }",
|
| 398 |
+
"after_code": "fn get_webhook_event_type(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n ) -> CustomResult<IncomingWebhookEvent, ConnectorError> {\n let resource: riskified::RiskifiedWebhookBody = request\n .body\n .parse_struct(\"RiskifiedWebhookBody\")\n .change_context(ConnectorError::WebhookEventTypeNotFound)?;\n Ok(IncomingWebhookEvent::from(resource.status))\n }",
|
| 399 |
+
"diff_span": {
|
| 400 |
+
"before": "",
|
| 401 |
+
"after": ""
|
| 402 |
+
},
|
| 403 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 404 |
+
"before_imports": [
|
| 405 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 406 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 407 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 408 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 409 |
+
],
|
| 410 |
+
"after_imports": [
|
| 411 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 412 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 413 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 414 |
+
]
|
| 415 |
+
},
|
| 416 |
+
{
|
| 417 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::base_url",
|
| 418 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 419 |
+
"kind": "function_item",
|
| 420 |
+
"status": "modified",
|
| 421 |
+
"code_changed": false,
|
| 422 |
+
"imports_changed": true,
|
| 423 |
+
"before_code": "fn base_url<'a>(&self, connectors: &'a Connectors) -> &'a str {\n connectors.riskified.base_url.as_ref()\n }",
|
| 424 |
+
"after_code": "fn base_url<'a>(&self, connectors: &'a Connectors) -> &'a str {\n connectors.riskified.base_url.as_ref()\n }",
|
| 425 |
+
"diff_span": {
|
| 426 |
+
"before": "",
|
| 427 |
+
"after": ""
|
| 428 |
+
},
|
| 429 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 430 |
+
"before_imports": [
|
| 431 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 432 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 433 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 434 |
+
],
|
| 435 |
+
"after_imports": [
|
| 436 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 437 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 438 |
+
]
|
| 439 |
+
},
|
| 440 |
+
{
|
| 441 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_request_body",
|
| 442 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 443 |
+
"kind": "function_item",
|
| 444 |
+
"status": "modified",
|
| 445 |
+
"code_changed": false,
|
| 446 |
+
"imports_changed": true,
|
| 447 |
+
"before_code": "fn get_request_body(\n &self,\n req: &FrmFulfillmentRouterData,\n _connectors: &Connectors,\n ) -> CustomResult<RequestContent, ConnectorError> {\n let req_obj = riskified::RiskifiedFulfillmentRequest::try_from(req)?;\n Ok(RequestContent::Json(Box::new(req_obj)))\n }",
|
| 448 |
+
"after_code": "fn get_request_body(\n &self,\n req: &FrmFulfillmentRouterData,\n _connectors: &Connectors,\n ) -> CustomResult<RequestContent, ConnectorError> {\n let req_obj = riskified::RiskifiedFulfillmentRequest::try_from(req)?;\n Ok(RequestContent::Json(Box::new(req_obj)))\n }",
|
| 449 |
+
"diff_span": {
|
| 450 |
+
"before": "",
|
| 451 |
+
"after": ""
|
| 452 |
+
},
|
| 453 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 454 |
+
"before_imports": [
|
| 455 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 456 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 457 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 458 |
+
],
|
| 459 |
+
"after_imports": [
|
| 460 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 461 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 462 |
+
]
|
| 463 |
+
},
|
| 464 |
+
{
|
| 465 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::impl::Riskified",
|
| 466 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 467 |
+
"kind": "impl_item",
|
| 468 |
+
"status": "modified",
|
| 469 |
+
"code_changed": false,
|
| 470 |
+
"imports_changed": true,
|
| 471 |
+
"before_code": "impl ConnectorSpecifications for Riskified {}",
|
| 472 |
+
"after_code": "impl ConnectorSpecifications for Riskified {}",
|
| 473 |
+
"diff_span": {
|
| 474 |
+
"before": "",
|
| 475 |
+
"after": ""
|
| 476 |
+
},
|
| 477 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 478 |
+
"before_imports": [
|
| 479 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 480 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 481 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 482 |
+
],
|
| 483 |
+
"after_imports": [
|
| 484 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 485 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 486 |
+
]
|
| 487 |
+
},
|
| 488 |
+
{
|
| 489 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::build_headers",
|
| 490 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 491 |
+
"kind": "function_item",
|
| 492 |
+
"status": "modified",
|
| 493 |
+
"code_changed": false,
|
| 494 |
+
"imports_changed": true,
|
| 495 |
+
"before_code": "fn build_headers(\n &self,\n req: &RouterData<Flow, Request, Response>,\n connectors: &Connectors,\n ) -> CustomResult<Vec<(String, Maskable<String>)>, ConnectorError> {\n let auth: riskified::RiskifiedAuthType =\n riskified::RiskifiedAuthType::try_from(&req.connector_auth_type)?;\n\n let riskified_req = self.get_request_body(req, connectors)?;\n\n let binding = riskified_req.get_inner_value();\n let payload = binding.peek();\n\n let digest = self\n .generate_authorization_signature(&auth, payload)\n .change_context(ConnectorError::RequestEncodingFailed)?;\n\n let header = vec![\n (\n headers::CONTENT_TYPE.to_string(),\n self.get_content_type().to_string().into(),\n ),\n (\n \"X-RISKIFIED-SHOP-DOMAIN\".to_string(),\n auth.domain_name.clone().into(),\n ),\n (\n \"X-RISKIFIED-HMAC-SHA256\".to_string(),\n Mask::into_masked(digest),\n ),\n (\n \"Accept\".to_string(),\n \"application/vnd.riskified.com; version=2\".into(),\n ),\n ];\n\n Ok(header)\n }",
|
| 496 |
+
"after_code": "fn build_headers(\n &self,\n req: &RouterData<Flow, Request, Response>,\n connectors: &Connectors,\n ) -> CustomResult<Vec<(String, Maskable<String>)>, ConnectorError> {\n let auth: riskified::RiskifiedAuthType =\n riskified::RiskifiedAuthType::try_from(&req.connector_auth_type)?;\n\n let riskified_req = self.get_request_body(req, connectors)?;\n\n let binding = riskified_req.get_inner_value();\n let payload = binding.peek();\n\n let digest = self\n .generate_authorization_signature(&auth, payload)\n .change_context(ConnectorError::RequestEncodingFailed)?;\n\n let header = vec![\n (\n headers::CONTENT_TYPE.to_string(),\n self.get_content_type().to_string().into(),\n ),\n (\n \"X-RISKIFIED-SHOP-DOMAIN\".to_string(),\n auth.domain_name.clone().into(),\n ),\n (\n \"X-RISKIFIED-HMAC-SHA256\".to_string(),\n Mask::into_masked(digest),\n ),\n (\n \"Accept\".to_string(),\n \"application/vnd.riskified.com; version=2\".into(),\n ),\n ];\n\n Ok(header)\n }",
|
| 497 |
+
"diff_span": {
|
| 498 |
+
"before": "",
|
| 499 |
+
"after": ""
|
| 500 |
+
},
|
| 501 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 502 |
+
"before_imports": [
|
| 503 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 504 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 505 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 506 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 507 |
+
"use crate::constants::headers;",
|
| 508 |
+
"use masking::Maskable;"
|
| 509 |
+
],
|
| 510 |
+
"after_imports": [
|
| 511 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 512 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 513 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 514 |
+
"use crate::constants::headers;",
|
| 515 |
+
"use masking::Maskable;"
|
| 516 |
+
]
|
| 517 |
+
},
|
| 518 |
+
{
|
| 519 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::generate_authorization_signature",
|
| 520 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 521 |
+
"kind": "function_item",
|
| 522 |
+
"status": "modified",
|
| 523 |
+
"code_changed": false,
|
| 524 |
+
"imports_changed": true,
|
| 525 |
+
"before_code": "pub fn generate_authorization_signature(\n &self,\n auth: &riskified::RiskifiedAuthType,\n payload: &str,\n ) -> CustomResult<String, ConnectorError> {\n let key = hmac::Key::new(\n hmac::HMAC_SHA256,\n auth.secret_token.clone().expose().as_bytes(),\n );\n\n let signature_value = hmac::sign(&key, payload.as_bytes());\n\n let digest = signature_value.as_ref();\n\n Ok(hex::encode(digest))\n }",
|
| 526 |
+
"after_code": "pub fn generate_authorization_signature(\n &self,\n auth: &riskified::RiskifiedAuthType,\n payload: &str,\n ) -> CustomResult<String, ConnectorError> {\n let key = hmac::Key::new(\n hmac::HMAC_SHA256,\n auth.secret_token.clone().expose().as_bytes(),\n );\n\n let signature_value = hmac::sign(&key, payload.as_bytes());\n\n let digest = signature_value.as_ref();\n\n Ok(hex::encode(digest))\n }",
|
| 527 |
+
"diff_span": {
|
| 528 |
+
"before": "",
|
| 529 |
+
"after": ""
|
| 530 |
+
},
|
| 531 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 532 |
+
"before_imports": [
|
| 533 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 534 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 535 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 536 |
+
"use ring::hmac;"
|
| 537 |
+
],
|
| 538 |
+
"after_imports": [
|
| 539 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 540 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 541 |
+
"use ring::hmac;"
|
| 542 |
+
]
|
| 543 |
+
},
|
| 544 |
+
{
|
| 545 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_url",
|
| 546 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 547 |
+
"kind": "function_item",
|
| 548 |
+
"status": "modified",
|
| 549 |
+
"code_changed": false,
|
| 550 |
+
"imports_changed": true,
|
| 551 |
+
"before_code": "fn get_url(\n &self,\n _req: &FrmFulfillmentRouterData,\n connectors: &Connectors,\n ) -> CustomResult<String, ConnectorError> {\n Ok(format!(\"{}{}\", self.base_url(connectors), \"/fulfill\"))\n }",
|
| 552 |
+
"after_code": "fn get_url(\n &self,\n _req: &FrmFulfillmentRouterData,\n connectors: &Connectors,\n ) -> CustomResult<String, ConnectorError> {\n Ok(format!(\"{}{}\", self.base_url(connectors), \"/fulfill\"))\n }",
|
| 553 |
+
"diff_span": {
|
| 554 |
+
"before": "",
|
| 555 |
+
"after": ""
|
| 556 |
+
},
|
| 557 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 558 |
+
"before_imports": [
|
| 559 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 560 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 561 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 562 |
+
],
|
| 563 |
+
"after_imports": [
|
| 564 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 565 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};"
|
| 566 |
+
]
|
| 567 |
+
},
|
| 568 |
+
{
|
| 569 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::verify_webhook_source",
|
| 570 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 571 |
+
"kind": "function_item",
|
| 572 |
+
"status": "modified",
|
| 573 |
+
"code_changed": false,
|
| 574 |
+
"imports_changed": true,
|
| 575 |
+
"before_code": "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_label: &str,\n ) -> CustomResult<bool, ConnectorError> {\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_label,\n connector_webhook_details,\n )\n .await\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(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(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signing_key = hmac::Key::new(hmac::HMAC_SHA256, &connector_webhook_secrets.secret);\n let signed_message = hmac::sign(&signing_key, &message);\n let payload_sign = BASE64_ENGINE.encode(signed_message.as_ref());\n Ok(payload_sign.as_bytes().eq(&signature))\n }",
|
| 576 |
+
"after_code": "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_label: &str,\n ) -> CustomResult<bool, ConnectorError> {\n let connector_webhook_secrets = self\n .get_webhook_source_verification_merchant_secret(\n merchant_id,\n connector_label,\n connector_webhook_details,\n )\n .await\n .change_context(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signature = self\n .get_webhook_source_verification_signature(request, &connector_webhook_secrets)\n .change_context(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(ConnectorError::WebhookSourceVerificationFailed)?;\n\n let signing_key = hmac::Key::new(hmac::HMAC_SHA256, &connector_webhook_secrets.secret);\n let signed_message = hmac::sign(&signing_key, &message);\n let payload_sign = BASE64_ENGINE.encode(signed_message.as_ref());\n Ok(payload_sign.as_bytes().eq(&signature))\n }",
|
| 577 |
+
"diff_span": {
|
| 578 |
+
"before": "",
|
| 579 |
+
"after": ""
|
| 580 |
+
},
|
| 581 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 582 |
+
"before_imports": [
|
| 583 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 584 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 585 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 586 |
+
"use ring::hmac;",
|
| 587 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};"
|
| 588 |
+
],
|
| 589 |
+
"after_imports": [
|
| 590 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 591 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 592 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 593 |
+
"use ring::hmac;"
|
| 594 |
+
]
|
| 595 |
+
},
|
| 596 |
+
{
|
| 597 |
+
"id": "crates/hyperswitch_connectors/src/connectors/riskified.rs::Riskified::function::get_webhook_source_verification_message",
|
| 598 |
+
"file": "crates/hyperswitch_connectors/src/connectors/riskified.rs",
|
| 599 |
+
"kind": "function_item",
|
| 600 |
+
"status": "modified",
|
| 601 |
+
"code_changed": false,
|
| 602 |
+
"imports_changed": true,
|
| 603 |
+
"before_code": "fn get_webhook_source_verification_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, ConnectorError> {\n Ok(request.body.to_vec())\n }",
|
| 604 |
+
"after_code": "fn get_webhook_source_verification_message(\n &self,\n request: &IncomingWebhookRequestDetails<'_>,\n _merchant_id: &common_utils::id_type::MerchantId,\n _connector_webhook_secrets: &ConnectorWebhookSecrets,\n ) -> CustomResult<Vec<u8>, ConnectorError> {\n Ok(request.body.to_vec())\n }",
|
| 605 |
+
"diff_span": {
|
| 606 |
+
"before": "",
|
| 607 |
+
"after": ""
|
| 608 |
+
},
|
| 609 |
+
"commit_sha": "00fbb7709edcdbbd69d44837384f72f21b3a0ed8",
|
| 610 |
+
"before_imports": [
|
| 611 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 612 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 613 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 614 |
+
"use common_utils::{\n errors::CustomResult,\n request::Request,\n types::{AmountConvertor, StringMajorUnit, StringMajorUnitForConnector},\n};",
|
| 615 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 616 |
+
],
|
| 617 |
+
"after_imports": [
|
| 618 |
+
"use masking::{ExposeInterface, Mask, PeekInterface, Secret};",
|
| 619 |
+
"use hyperswitch_domain_models::{\n router_data::{AccessToken, RouterData},\n router_flow_types::{\n AccessTokenAuth, Authorize, Capture, Execute, PSync, PaymentMethodToken, RSync, Session,\n SetupMandate, Void,\n },\n router_request_types::{\n AccessTokenRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n PaymentsCancelData, PaymentsCaptureData, PaymentsSessionData, PaymentsSyncData,\n RefundsData, SetupMandateRequestData,\n },\n router_response_types::{PaymentsResponseData, RefundsResponseData},\n};",
|
| 620 |
+
"use hyperswitch_interfaces::{\n api::{\n FraudCheck, FraudCheckCheckout, FraudCheckFulfillment, FraudCheckRecordReturn,\n FraudCheckSale, FraudCheckTransaction,\n },\n events::connector_api_logs::ConnectorEvent,\n types::Response,\n webhooks::{IncomingWebhook, IncomingWebhookRequestDetails},\n};",
|
| 621 |
+
"use api_models::webhooks::{ConnectorWebhookSecrets, IncomingWebhookEvent, ObjectReferenceId};"
|
| 622 |
+
]
|
| 623 |
+
}
|
| 624 |
+
]
|
| 625 |
+
}
|
diffs/pr_7953/181823a/diff.json
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "181823ae98b2c3e0768c2b59faa6725ed2183ad7",
|
| 3 |
+
"pr_number": 7953,
|
| 4 |
+
"rust_files": [],
|
| 5 |
+
"diffs": []
|
| 6 |
+
}
|
diffs/pr_7953/1ef9a54/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "1ef9a54d4573372c933c8ef335b2376dd2b08742",
|
| 3 |
+
"pr_number": 7953,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/default_implementations_v2.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|
diffs/pr_7953/20db763/diff.json
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
{
|
| 2 |
+
"commit_sha": "20db7634c9e903b1e7243043b794ef0a5de7a5a5",
|
| 3 |
+
"pr_number": 7953,
|
| 4 |
+
"rust_files": [
|
| 5 |
+
"crates/hyperswitch_connectors/src/connectors/payone.rs"
|
| 6 |
+
],
|
| 7 |
+
"diffs": []
|
| 8 |
+
}
|