diff --git "a/diffs/pr_6687/3f008e7/diff.json" "b/diffs/pr_6687/3f008e7/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6687/3f008e7/diff.json" @@ -0,0 +1,2235 @@ +{ + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "pr_number": 6687, + "rust_files": [ + "crates/api_models/src/payment_methods.rs", + "crates/common_utils/src/macros.rs", + "crates/diesel_models/src/payment_method.rs", + "crates/router/src/core/payment_methods/cards.rs", + "crates/router/src/core/payments/helpers.rs", + "crates/router/src/core/payouts.rs", + "crates/router/src/core/payouts/helpers.rs" + ], + "diffs": [ + { + "id": "crates/diesel_models/src/payment_method.rs::PayoutsMandateReference::function::deref_mut", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }", + "after_code": "fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts.rs::function::complete_payout_eligibility", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn complete_payout_eligibility(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n let payout_attempt = &payout_data.payout_attempt.to_owned();\n\n if !payout_data.should_terminate\n && payout_attempt.is_eligible.is_none()\n && connector_data\n .connector_name\n .supports_payout_eligibility(payout_data.payouts.payout_type)\n {\n check_payout_eligibility(state, merchant_account, connector_data, payout_data)\n .await\n .attach_printable(\"Eligibility failed for given Payout request\")?;\n }\n\n utils::when(\n !payout_attempt\n .is_eligible\n .unwrap_or(state.conf.payouts.payout_eligibility),\n || {\n Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(serde_json::json!({\n \"message\": \"Payout method data is invalid\"\n }))\n })\n .attach_printable(\"Payout data provided is invalid\"))\n },\n )?;\n\n Ok(())\n}", + "after_code": "pub async fn complete_payout_eligibility(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n let payout_attempt = &payout_data.payout_attempt.to_owned();\n\n if !payout_data.should_terminate\n && payout_attempt.is_eligible.is_none()\n && connector_data\n .connector_name\n .supports_payout_eligibility(payout_data.payouts.payout_type)\n {\n check_payout_eligibility(state, merchant_account, connector_data, payout_data)\n .await\n .attach_printable(\"Eligibility failed for given Payout request\")?;\n }\n\n utils::when(\n !payout_attempt\n .is_eligible\n .unwrap_or(state.conf.payouts.payout_eligibility),\n || {\n Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(serde_json::json!({\n \"message\": \"Payout method data is invalid\"\n }))\n })\n .attach_printable(\"Payout data provided is invalid\"))\n },\n )?;\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::get_additional_payout_data", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn get_additional_payout_data(\n pm_data: &api::PayoutMethodData,\n db: &dyn StorageInterface,\n profile_id: &id_type::ProfileId,\n) -> Option {\n match pm_data {\n api::PayoutMethodData::Card(card_data) => {\n let card_isin = Some(card_data.card_number.get_card_isin());\n let enable_extended_bin =db\n .find_config_by_key_unwrap_or(\n format!(\"{}_enable_extended_card_bin\", profile_id.get_string_repr()).as_str(),\n Some(\"false\".to_string()))\n .await.map_err(|err| services::logger::error!(message=\"Failed to fetch the config\", extended_card_bin_error=?err)).ok();\n\n let card_extended_bin = match enable_extended_bin {\n Some(config) if config.config == \"true\" => {\n Some(card_data.card_number.get_extended_card_bin())\n }\n _ => None,\n };\n let last4 = Some(card_data.card_number.get_last4());\n\n let card_info = card_isin\n .clone()\n .async_and_then(|card_isin| async move {\n db.get_card_info(&card_isin)\n .await\n .map_err(|error| services::logger::warn!(card_info_error=?error))\n .ok()\n })\n .await\n .flatten()\n .map(|card_info| {\n payout_additional::AdditionalPayoutMethodData::Card(Box::new(\n payout_additional::CardAdditionalData {\n card_issuer: card_info.card_issuer,\n card_network: card_info.card_network.clone(),\n bank_code: card_info.bank_code,\n card_type: card_info.card_type,\n card_issuing_country: card_info.card_issuing_country,\n last4: last4.clone(),\n card_isin: card_isin.clone(),\n card_extended_bin: card_extended_bin.clone(),\n card_exp_month: Some(card_data.expiry_month.clone()),\n card_exp_year: Some(card_data.expiry_year.clone()),\n card_holder_name: card_data.card_holder_name.clone(),\n },\n ))\n });\n Some(card_info.unwrap_or_else(|| {\n payout_additional::AdditionalPayoutMethodData::Card(Box::new(\n payout_additional::CardAdditionalData {\n card_issuer: None,\n card_network: None,\n bank_code: None,\n card_type: None,\n card_issuing_country: None,\n last4,\n card_isin,\n card_extended_bin,\n card_exp_month: Some(card_data.expiry_month.clone()),\n card_exp_year: Some(card_data.expiry_year.clone()),\n card_holder_name: card_data.card_holder_name.clone(),\n },\n ))\n }))\n }\n api::PayoutMethodData::Bank(bank_data) => {\n Some(payout_additional::AdditionalPayoutMethodData::Bank(\n Box::new(bank_data.to_owned().into()),\n ))\n }\n api::PayoutMethodData::Wallet(wallet_data) => {\n Some(payout_additional::AdditionalPayoutMethodData::Wallet(\n Box::new(wallet_data.to_owned().into()),\n ))\n }\n }\n}", + "after_code": "pub async fn get_additional_payout_data(\n pm_data: &api::PayoutMethodData,\n db: &dyn StorageInterface,\n profile_id: &id_type::ProfileId,\n) -> Option {\n match pm_data {\n api::PayoutMethodData::Card(card_data) => {\n let card_isin = Some(card_data.card_number.get_card_isin());\n let enable_extended_bin =db\n .find_config_by_key_unwrap_or(\n format!(\"{}_enable_extended_card_bin\", profile_id.get_string_repr()).as_str(),\n Some(\"false\".to_string()))\n .await.map_err(|err| services::logger::error!(message=\"Failed to fetch the config\", extended_card_bin_error=?err)).ok();\n\n let card_extended_bin = match enable_extended_bin {\n Some(config) if config.config == \"true\" => {\n Some(card_data.card_number.get_extended_card_bin())\n }\n _ => None,\n };\n let last4 = Some(card_data.card_number.get_last4());\n\n let card_info = card_isin\n .clone()\n .async_and_then(|card_isin| async move {\n db.get_card_info(&card_isin)\n .await\n .map_err(|error| services::logger::warn!(card_info_error=?error))\n .ok()\n })\n .await\n .flatten()\n .map(|card_info| {\n payout_additional::AdditionalPayoutMethodData::Card(Box::new(\n payout_additional::CardAdditionalData {\n card_issuer: card_info.card_issuer,\n card_network: card_info.card_network.clone(),\n bank_code: card_info.bank_code,\n card_type: card_info.card_type,\n card_issuing_country: card_info.card_issuing_country,\n last4: last4.clone(),\n card_isin: card_isin.clone(),\n card_extended_bin: card_extended_bin.clone(),\n card_exp_month: Some(card_data.expiry_month.clone()),\n card_exp_year: Some(card_data.expiry_year.clone()),\n card_holder_name: card_data.card_holder_name.clone(),\n },\n ))\n });\n Some(card_info.unwrap_or_else(|| {\n payout_additional::AdditionalPayoutMethodData::Card(Box::new(\n payout_additional::CardAdditionalData {\n card_issuer: None,\n card_network: None,\n bank_code: None,\n card_type: None,\n card_issuing_country: None,\n last4,\n card_isin,\n card_extended_bin,\n card_exp_month: Some(card_data.expiry_month.clone()),\n card_exp_year: Some(card_data.expiry_year.clone()),\n card_holder_name: card_data.card_holder_name.clone(),\n },\n ))\n }))\n }\n api::PayoutMethodData::Bank(bank_data) => {\n Some(payout_additional::AdditionalPayoutMethodData::Bank(\n Box::new(bank_data.to_owned().into()),\n ))\n }\n api::PayoutMethodData::Wallet(wallet_data) => {\n Some(payout_additional::AdditionalPayoutMethodData::Wallet(\n Box::new(wallet_data.to_owned().into()),\n ))\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use router_env::logger;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use router_env::logger;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::get_default_payout_connector", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn get_default_payout_connector(\n _state: &SessionState,\n request_connector: Option,\n) -> CustomResult {\n Ok(request_connector.map_or(\n api::ConnectorChoice::Decide,\n api::ConnectorChoice::StraightThrough,\n ))\n}", + "after_code": "pub async fn get_default_payout_connector(\n _state: &SessionState,\n request_connector: Option,\n) -> CustomResult {\n Ok(request_connector.map_or(\n api::ConnectorChoice::Decide,\n api::ConnectorChoice::StraightThrough,\n ))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::struct::PayoutData", + "file": "crates/router/src/core/payouts.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct PayoutData {\n pub billing_address: Option,\n pub business_profile: domain::Profile,\n pub customer_details: Option,\n pub merchant_connector_account: Option,\n pub payouts: storage::Payouts,\n pub payout_attempt: storage::PayoutAttempt,\n pub payout_method_data: Option,\n pub profile_id: common_utils::id_type::ProfileId,\n pub should_terminate: bool,\n pub payout_link: Option,\n pub current_locale: String,\n pub payment_method: Option,\n}", + "after_code": "pub struct PayoutData {\n pub billing_address: Option,\n pub business_profile: domain::Profile,\n pub customer_details: Option,\n pub merchant_connector_account: Option,\n pub payouts: storage::Payouts,\n pub payout_attempt: storage::PayoutAttempt,\n pub payout_method_data: Option,\n pub profile_id: common_utils::id_type::ProfileId,\n pub should_terminate: bool,\n pub payout_link: Option,\n pub current_locale: String,\n pub payment_method: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::make_connector_decision", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn make_connector_decision(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_call_type: api::ConnectorCallType,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n match connector_call_type {\n api::ConnectorCallType::PreDetermined(connector_data) => {\n Box::pin(call_connector_payout(\n state,\n merchant_account,\n key_store,\n &connector_data,\n payout_data,\n ))\n .await?;\n\n #[cfg(feature = \"payout_retry\")]\n {\n let config_bool = retry::config_should_call_gsm_payout(\n &*state.store,\n merchant_account.get_id(),\n PayoutRetryType::SingleConnector,\n )\n .await;\n\n if config_bool && payout_data.should_call_gsm() {\n Box::pin(retry::do_gsm_single_connector_actions(\n state,\n connector_data,\n payout_data,\n merchant_account,\n key_store,\n ))\n .await?;\n }\n }\n\n Ok(())\n }\n api::ConnectorCallType::Retryable(connectors) => {\n let mut connectors = connectors.into_iter();\n\n let connector_data = get_next_connector(&mut connectors)?;\n\n Box::pin(call_connector_payout(\n state,\n merchant_account,\n key_store,\n &connector_data,\n payout_data,\n ))\n .await?;\n\n #[cfg(feature = \"payout_retry\")]\n {\n let config_multiple_connector_bool = retry::config_should_call_gsm_payout(\n &*state.store,\n merchant_account.get_id(),\n PayoutRetryType::MultiConnector,\n )\n .await;\n\n if config_multiple_connector_bool && payout_data.should_call_gsm() {\n Box::pin(retry::do_gsm_multiple_connector_actions(\n state,\n connectors,\n connector_data.clone(),\n payout_data,\n merchant_account,\n key_store,\n ))\n .await?;\n }\n\n let config_single_connector_bool = retry::config_should_call_gsm_payout(\n &*state.store,\n merchant_account.get_id(),\n PayoutRetryType::SingleConnector,\n )\n .await;\n\n if config_single_connector_bool && payout_data.should_call_gsm() {\n Box::pin(retry::do_gsm_single_connector_actions(\n state,\n connector_data,\n payout_data,\n merchant_account,\n key_store,\n ))\n .await?;\n }\n }\n\n Ok(())\n }\n _ => Err(errors::ApiErrorResponse::InternalServerError).attach_printable({\n \"only PreDetermined and Retryable ConnectorCallTypes are supported\".to_string()\n })?,\n }\n}", + "after_code": "pub async fn make_connector_decision(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_call_type: api::ConnectorCallType,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n match connector_call_type {\n api::ConnectorCallType::PreDetermined(connector_data) => {\n Box::pin(call_connector_payout(\n state,\n merchant_account,\n key_store,\n &connector_data,\n payout_data,\n ))\n .await?;\n\n #[cfg(feature = \"payout_retry\")]\n {\n let config_bool = retry::config_should_call_gsm_payout(\n &*state.store,\n merchant_account.get_id(),\n PayoutRetryType::SingleConnector,\n )\n .await;\n\n if config_bool && payout_data.should_call_gsm() {\n Box::pin(retry::do_gsm_single_connector_actions(\n state,\n connector_data,\n payout_data,\n merchant_account,\n key_store,\n ))\n .await?;\n }\n }\n\n Ok(())\n }\n api::ConnectorCallType::Retryable(connectors) => {\n let mut connectors = connectors.into_iter();\n\n let connector_data = get_next_connector(&mut connectors)?;\n\n Box::pin(call_connector_payout(\n state,\n merchant_account,\n key_store,\n &connector_data,\n payout_data,\n ))\n .await?;\n\n #[cfg(feature = \"payout_retry\")]\n {\n let config_multiple_connector_bool = retry::config_should_call_gsm_payout(\n &*state.store,\n merchant_account.get_id(),\n PayoutRetryType::MultiConnector,\n )\n .await;\n\n if config_multiple_connector_bool && payout_data.should_call_gsm() {\n Box::pin(retry::do_gsm_multiple_connector_actions(\n state,\n connectors,\n connector_data.clone(),\n payout_data,\n merchant_account,\n key_store,\n ))\n .await?;\n }\n\n let config_single_connector_bool = retry::config_should_call_gsm_payout(\n &*state.store,\n merchant_account.get_id(),\n PayoutRetryType::SingleConnector,\n )\n .await;\n\n if config_single_connector_bool && payout_data.should_call_gsm() {\n Box::pin(retry::do_gsm_single_connector_actions(\n state,\n connector_data,\n payout_data,\n merchant_account,\n key_store,\n ))\n .await?;\n }\n }\n\n Ok(())\n }\n _ => Err(errors::ApiErrorResponse::InternalServerError).attach_printable({\n \"only PreDetermined and Retryable ConnectorCallTypes are supported\".to_string()\n })?,\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_enums::PayoutRetryType;", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_enums::PayoutRetryType;", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::get_connector_choice", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn get_connector_choice(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector: Option,\n routing_algorithm: Option,\n payout_data: &mut PayoutData,\n eligible_connectors: Option>,\n) -> RouterResult {\n let eligible_routable_connectors = eligible_connectors.map(|connectors| {\n connectors\n .into_iter()\n .map(api::enums::RoutableConnectors::from)\n .collect()\n });\n let connector_choice = helpers::get_default_payout_connector(state, routing_algorithm).await?;\n match connector_choice {\n api::ConnectorChoice::SessionMultiple(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector choice - SessionMultiple\")?\n }\n\n api::ConnectorChoice::StraightThrough(straight_through) => {\n let request_straight_through: api::routing::StraightThroughAlgorithm = straight_through\n .clone()\n .parse_value(\"StraightThroughAlgorithm\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid straight through routing rules format\")?;\n payout_data.payout_attempt.routing_info = Some(straight_through);\n let mut routing_data = storage::RoutingData {\n routed_through: connector,\n merchant_connector_id: None,\n algorithm: Some(request_straight_through.clone()),\n routing_info: PaymentRoutingInfo {\n algorithm: None,\n pre_routing_results: None,\n },\n };\n helpers::decide_payout_connector(\n state,\n merchant_account,\n key_store,\n Some(request_straight_through),\n &mut routing_data,\n payout_data,\n eligible_routable_connectors,\n )\n .await\n }\n\n api::ConnectorChoice::Decide => {\n let mut routing_data = storage::RoutingData {\n routed_through: connector,\n merchant_connector_id: None,\n algorithm: None,\n routing_info: PaymentRoutingInfo {\n algorithm: None,\n pre_routing_results: None,\n },\n };\n helpers::decide_payout_connector(\n state,\n merchant_account,\n key_store,\n None,\n &mut routing_data,\n payout_data,\n eligible_routable_connectors,\n )\n .await\n }\n }\n}", + "after_code": "pub async fn get_connector_choice(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector: Option,\n routing_algorithm: Option,\n payout_data: &mut PayoutData,\n eligible_connectors: Option>,\n) -> RouterResult {\n let eligible_routable_connectors = eligible_connectors.map(|connectors| {\n connectors\n .into_iter()\n .map(api::enums::RoutableConnectors::from)\n .collect()\n });\n let connector_choice = helpers::get_default_payout_connector(state, routing_algorithm).await?;\n match connector_choice {\n api::ConnectorChoice::SessionMultiple(_) => {\n Err(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector choice - SessionMultiple\")?\n }\n\n api::ConnectorChoice::StraightThrough(straight_through) => {\n let request_straight_through: api::routing::StraightThroughAlgorithm = straight_through\n .clone()\n .parse_value(\"StraightThroughAlgorithm\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid straight through routing rules format\")?;\n payout_data.payout_attempt.routing_info = Some(straight_through);\n let mut routing_data = storage::RoutingData {\n routed_through: connector,\n merchant_connector_id: None,\n algorithm: Some(request_straight_through.clone()),\n routing_info: PaymentRoutingInfo {\n algorithm: None,\n pre_routing_results: None,\n },\n };\n helpers::decide_payout_connector(\n state,\n merchant_account,\n key_store,\n Some(request_straight_through),\n &mut routing_data,\n payout_data,\n eligible_routable_connectors,\n )\n .await\n }\n\n api::ConnectorChoice::Decide => {\n let mut routing_data = storage::RoutingData {\n routed_through: connector,\n merchant_connector_id: None,\n algorithm: None,\n routing_info: PaymentRoutingInfo {\n algorithm: None,\n pre_routing_results: None,\n },\n };\n helpers::decide_payout_connector(\n state,\n merchant_account,\n key_store,\n None,\n &mut routing_data,\n payout_data,\n eligible_routable_connectors,\n )\n .await\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_create_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_create_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n // Validate create request\n let (payout_id, payout_method_data, profile_id, customer, payment_method) =\n validator::validate_create_request(&state, &merchant_account, &req, &key_store).await?;\n\n // Create DB entries\n let mut payout_data = payout_create_db_entries(\n &state,\n &merchant_account,\n &key_store,\n &req,\n &payout_id,\n &profile_id,\n payout_method_data.as_ref(),\n &state.locale,\n customer.as_ref(),\n payment_method.clone(),\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payout_type = payout_data.payouts.payout_type.to_owned();\n\n // Persist payout method data in temp locker\n if req.payout_method_data.is_some() {\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id when payout_method_data is provided\")?;\n payout_data.payout_method_data = helpers::make_payout_method_data(\n &state,\n req.payout_method_data.as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?;\n }\n\n if let Some(true) = payout_data.payouts.confirm {\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?\n };\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_create_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n // Validate create request\n let (payout_id, payout_method_data, profile_id, customer, payment_method) =\n validator::validate_create_request(&state, &merchant_account, &req, &key_store).await?;\n\n // Create DB entries\n let mut payout_data = payout_create_db_entries(\n &state,\n &merchant_account,\n &key_store,\n &req,\n &payout_id,\n &profile_id,\n payout_method_data.as_ref(),\n &state.locale,\n customer.as_ref(),\n payment_method.clone(),\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payout_type = payout_data.payouts.payout_type.to_owned();\n\n // Persist payout method data in temp locker\n if req.payout_method_data.is_some() {\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id when payout_method_data is provided\")?;\n payout_data.payout_method_data = helpers::make_payout_method_data(\n &state,\n req.payout_method_data.as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?;\n }\n\n if let Some(true) = payout_data.payouts.confirm {\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?\n };\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_payout_link", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn create_payout_link(\n state: &SessionState,\n business_profile: &domain::Profile,\n customer_id: &CustomerId,\n merchant_id: &common_utils::id_type::MerchantId,\n req: &payouts::PayoutCreateRequest,\n payout_id: &str,\n locale: &str,\n) -> RouterResult {\n let payout_link_config_req = req.payout_link_config.to_owned();\n\n // Fetch all configs\n let default_config = &state.conf.generic_link.payout_link;\n let profile_config = &business_profile.payout_link_config;\n let profile_ui_config = profile_config.as_ref().map(|c| c.config.ui_config.clone());\n let ui_config = payout_link_config_req\n .as_ref()\n .and_then(|config| config.ui_config.clone())\n .or(profile_ui_config);\n\n let test_mode_in_config = payout_link_config_req\n .as_ref()\n .and_then(|config| config.test_mode)\n .or_else(|| profile_config.as_ref().and_then(|c| c.payout_test_mode));\n let is_test_mode_enabled = test_mode_in_config.unwrap_or(false);\n\n let allowed_domains = match (router_env::which(), is_test_mode_enabled) {\n // Throw error in case test_mode was enabled in production\n (Env::Production, true) => Err(report!(errors::ApiErrorResponse::LinkConfigurationError {\n message: \"test_mode cannot be true for creating payout_links in production\".to_string()\n })),\n // Send empty set of whitelisted domains\n (_, true) => {\n Ok(HashSet::new())\n },\n // Otherwise, fetch and use allowed domains from profile config\n (_, false) => {\n profile_config\n .as_ref()\n .map(|config| config.config.allowed_domains.to_owned())\n .get_required_value(\"allowed_domains\")\n .change_context(errors::ApiErrorResponse::LinkConfigurationError {\n message:\n \"Payout links cannot be used without setting allowed_domains in profile. If you're using a non-production environment, you can set test_mode to true while in payout_link_config\"\n .to_string(),\n })\n }\n }?;\n\n // Form data to be injected in the link\n let (logo, merchant_name, theme) = match ui_config {\n Some(config) => (config.logo, config.merchant_name, config.theme),\n _ => (None, None, None),\n };\n let payout_link_config = GenericLinkUiConfig {\n logo,\n merchant_name,\n theme,\n };\n let client_secret = utils::generate_id(consts::ID_LENGTH, \"payout_link_secret\");\n let base_url = profile_config\n .as_ref()\n .and_then(|c| c.config.domain_name.as_ref())\n .map(|domain| format!(\"https://{}\", domain))\n .unwrap_or(state.base_url.clone());\n let session_expiry = req\n .session_expiry\n .as_ref()\n .map_or(default_config.expiry, |expiry| *expiry);\n let url = format!(\n \"{base_url}/payout_link/{}/{payout_id}?locale={}\",\n merchant_id.get_string_repr(),\n locale\n );\n let link = url::Url::parse(&url)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| format!(\"Failed to form payout link URL - {}\", url))?;\n let req_enabled_payment_methods = payout_link_config_req\n .as_ref()\n .and_then(|req| req.enabled_payment_methods.to_owned());\n let amount = req\n .amount\n .as_ref()\n .get_required_value(\"amount\")\n .attach_printable(\"amount is a required value when creating payout links\")?;\n let currency = req\n .currency\n .as_ref()\n .get_required_value(\"currency\")\n .attach_printable(\"currency is a required value when creating payout links\")?;\n let payout_link_id = core_utils::get_or_generate_id(\n \"payout_link_id\",\n &payout_link_config_req\n .as_ref()\n .and_then(|config| config.payout_link_id.clone()),\n \"payout_link\",\n )?;\n let form_layout = payout_link_config_req\n .as_ref()\n .and_then(|config| config.form_layout.to_owned())\n .or_else(|| {\n profile_config\n .as_ref()\n .and_then(|config| config.form_layout.to_owned())\n });\n\n let data = PayoutLinkData {\n payout_link_id: payout_link_id.clone(),\n customer_id: customer_id.clone(),\n payout_id: payout_id.to_string(),\n link,\n client_secret: Secret::new(client_secret),\n session_expiry,\n ui_config: payout_link_config,\n enabled_payment_methods: req_enabled_payment_methods,\n amount: MinorUnit::from(*amount),\n currency: *currency,\n allowed_domains,\n form_layout,\n test_mode: test_mode_in_config,\n };\n\n create_payout_link_db_entry(state, merchant_id, &data, req.return_url.clone()).await\n}", + "after_code": "pub async fn create_payout_link(\n state: &SessionState,\n business_profile: &domain::Profile,\n customer_id: &CustomerId,\n merchant_id: &common_utils::id_type::MerchantId,\n req: &payouts::PayoutCreateRequest,\n payout_id: &str,\n locale: &str,\n) -> RouterResult {\n let payout_link_config_req = req.payout_link_config.to_owned();\n\n // Fetch all configs\n let default_config = &state.conf.generic_link.payout_link;\n let profile_config = &business_profile.payout_link_config;\n let profile_ui_config = profile_config.as_ref().map(|c| c.config.ui_config.clone());\n let ui_config = payout_link_config_req\n .as_ref()\n .and_then(|config| config.ui_config.clone())\n .or(profile_ui_config);\n\n let test_mode_in_config = payout_link_config_req\n .as_ref()\n .and_then(|config| config.test_mode)\n .or_else(|| profile_config.as_ref().and_then(|c| c.payout_test_mode));\n let is_test_mode_enabled = test_mode_in_config.unwrap_or(false);\n\n let allowed_domains = match (router_env::which(), is_test_mode_enabled) {\n // Throw error in case test_mode was enabled in production\n (Env::Production, true) => Err(report!(errors::ApiErrorResponse::LinkConfigurationError {\n message: \"test_mode cannot be true for creating payout_links in production\".to_string()\n })),\n // Send empty set of whitelisted domains\n (_, true) => {\n Ok(HashSet::new())\n },\n // Otherwise, fetch and use allowed domains from profile config\n (_, false) => {\n profile_config\n .as_ref()\n .map(|config| config.config.allowed_domains.to_owned())\n .get_required_value(\"allowed_domains\")\n .change_context(errors::ApiErrorResponse::LinkConfigurationError {\n message:\n \"Payout links cannot be used without setting allowed_domains in profile. If you're using a non-production environment, you can set test_mode to true while in payout_link_config\"\n .to_string(),\n })\n }\n }?;\n\n // Form data to be injected in the link\n let (logo, merchant_name, theme) = match ui_config {\n Some(config) => (config.logo, config.merchant_name, config.theme),\n _ => (None, None, None),\n };\n let payout_link_config = GenericLinkUiConfig {\n logo,\n merchant_name,\n theme,\n };\n let client_secret = utils::generate_id(consts::ID_LENGTH, \"payout_link_secret\");\n let base_url = profile_config\n .as_ref()\n .and_then(|c| c.config.domain_name.as_ref())\n .map(|domain| format!(\"https://{}\", domain))\n .unwrap_or(state.base_url.clone());\n let session_expiry = req\n .session_expiry\n .as_ref()\n .map_or(default_config.expiry, |expiry| *expiry);\n let url = format!(\n \"{base_url}/payout_link/{}/{payout_id}?locale={}\",\n merchant_id.get_string_repr(),\n locale\n );\n let link = url::Url::parse(&url)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| format!(\"Failed to form payout link URL - {}\", url))?;\n let req_enabled_payment_methods = payout_link_config_req\n .as_ref()\n .and_then(|req| req.enabled_payment_methods.to_owned());\n let amount = req\n .amount\n .as_ref()\n .get_required_value(\"amount\")\n .attach_printable(\"amount is a required value when creating payout links\")?;\n let currency = req\n .currency\n .as_ref()\n .get_required_value(\"currency\")\n .attach_printable(\"currency is a required value when creating payout links\")?;\n let payout_link_id = core_utils::get_or_generate_id(\n \"payout_link_id\",\n &payout_link_config_req\n .as_ref()\n .and_then(|config| config.payout_link_id.clone()),\n \"payout_link\",\n )?;\n let form_layout = payout_link_config_req\n .as_ref()\n .and_then(|config| config.form_layout.to_owned())\n .or_else(|| {\n profile_config\n .as_ref()\n .and_then(|config| config.form_layout.to_owned())\n });\n\n let data = PayoutLinkData {\n payout_link_id: payout_link_id.clone(),\n customer_id: customer_id.clone(),\n payout_id: payout_id.to_string(),\n link,\n client_secret: Secret::new(client_secret),\n session_expiry,\n ui_config: payout_link_config,\n enabled_payment_methods: req_enabled_payment_methods,\n amount: MinorUnit::from(*amount),\n currency: *currency,\n allowed_domains,\n form_layout,\n test_mode: test_mode_in_config,\n };\n\n create_payout_link_db_entry(state, merchant_id, &data, req.return_url.clone()).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use masking::{PeekInterface, Secret};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use masking::{PeekInterface, Secret};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_retrieve_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_retrieve_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id: Option,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutRetrieveRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n profile_id,\n &key_store,\n &payouts::PayoutRequest::PayoutRetrieveRequest(req.to_owned()),\n &state.locale,\n )\n .await?;\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n if matches!(req.force_sync, Some(true)) && helpers::should_call_retrieve(status) {\n // Form connector data\n let connector_call_type = get_connector_choice(\n &state,\n &merchant_account,\n &key_store,\n payout_attempt.connector.clone(),\n None,\n &mut payout_data,\n None,\n )\n .await?;\n\n complete_payout_retrieve(\n &state,\n &merchant_account,\n connector_call_type,\n &mut payout_data,\n )\n .await?;\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_retrieve_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id: Option,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutRetrieveRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n profile_id,\n &key_store,\n &payouts::PayoutRequest::PayoutRetrieveRequest(req.to_owned()),\n &state.locale,\n )\n .await?;\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n if matches!(req.force_sync, Some(true)) && helpers::should_call_retrieve(status) {\n // Form connector data\n let connector_call_type = get_connector_choice(\n &state,\n &merchant_account,\n &key_store,\n payout_attempt.connector.clone(),\n None,\n &mut payout_data,\n None,\n )\n .await?;\n\n complete_payout_retrieve(\n &state,\n &merchant_account,\n connector_call_type,\n &mut payout_data,\n )\n .await?;\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::make_payout_data", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn make_payout_data(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n auth_profile_id: Option,\n key_store: &domain::MerchantKeyStore,\n req: &payouts::PayoutRequest,\n locale: &str,\n) -> RouterResult {\n let db = &*state.store;\n let merchant_id = merchant_account.get_id();\n let payout_id = match req {\n payouts::PayoutRequest::PayoutActionRequest(r) => r.payout_id.clone(),\n payouts::PayoutRequest::PayoutCreateRequest(r) => r.payout_id.clone().unwrap_or_default(),\n payouts::PayoutRequest::PayoutRetrieveRequest(r) => r.payout_id.clone(),\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_id,\n &payout_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n core_utils::validate_profile_id_from_auth_layer(auth_profile_id, &payouts)?;\n\n let payout_attempt_id = utils::get_payout_attempt_id(payout_id, payouts.attempt_count);\n\n let mut payout_attempt = db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_id,\n &payout_attempt_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n\n let customer_id = payouts.customer_id.as_ref();\n\n // We have to do this because the function that is being used to create / get address is from payments\n // which expects a payment_id\n let payout_id_as_payment_id_type = common_utils::id_type::PaymentId::try_from(\n std::borrow::Cow::Owned(payouts.payout_id.clone()),\n )\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n let billing_address = payment_helpers::create_or_find_address_for_payment_by_request(\n state,\n None,\n payouts.address_id.as_deref(),\n merchant_id,\n customer_id,\n key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await?;\n\n let payout_id = &payouts.payout_id;\n\n let customer_details = customer_id\n .async_map(|customer_id| async move {\n db.find_customer_optional_by_customer_id_merchant_id(\n &state.into(),\n customer_id,\n merchant_id,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .map_err(|err| err.change_context(errors::ApiErrorResponse::InternalServerError))\n .attach_printable_lazy(|| {\n format!(\n \"Failed while fetching optional customer [id - {:?}] for payout [id - {}]\",\n customer_id, payout_id\n )\n })\n })\n .await\n .transpose()?\n .and_then(|c| c);\n let profile_id = payout_attempt.profile_id.clone();\n\n // Validate whether profile_id passed in request is valid and is linked to the merchant\n let business_profile =\n validate_and_get_business_profile(state, key_store, &profile_id, merchant_id).await?;\n let payout_method_data_req = match req {\n payouts::PayoutRequest::PayoutCreateRequest(r) => r.payout_method_data.to_owned(),\n payouts::PayoutRequest::PayoutActionRequest(_) => {\n match payout_attempt.payout_token.to_owned() {\n Some(payout_token) => {\n let customer_id = customer_details\n .as_ref()\n .map(|cd| cd.customer_id.to_owned())\n .get_required_value(\"customer_id when payout_token is sent\")?;\n helpers::make_payout_method_data(\n state,\n None,\n Some(&payout_token),\n &customer_id,\n merchant_account.get_id(),\n payouts.payout_type,\n key_store,\n None,\n merchant_account.storage_scheme,\n )\n .await?\n }\n None => None,\n }\n }\n payouts::PayoutRequest::PayoutRetrieveRequest(_) => None,\n };\n\n if let Some(payout_method_data) = payout_method_data_req.clone() {\n let additional_payout_method_data =\n helpers::get_additional_payout_data(&payout_method_data, &*state.store, &profile_id)\n .await;\n\n let update_additional_payout_method_data =\n storage::PayoutAttemptUpdate::AdditionalPayoutMethodDataUpdate {\n additional_payout_method_data,\n };\n\n payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n update_additional_payout_method_data,\n &payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating additional payout method data in payout_attempt\")?;\n };\n\n let merchant_connector_account =\n if payout_attempt.connector.is_some() && payout_attempt.merchant_connector_id.is_some() {\n let connector_name = payout_attempt\n .connector\n .clone()\n .get_required_value(\"connector_name\")?;\n Some(\n payment_helpers::get_merchant_connector_account(\n state,\n merchant_account.get_id(),\n None,\n key_store,\n &profile_id,\n connector_name.as_str(),\n payout_attempt.merchant_connector_id.as_ref(),\n )\n .await?,\n )\n } else {\n None\n };\n\n let payout_link = payouts\n .payout_link_id\n .clone()\n .async_map(|link_id| async move {\n db.find_payout_link_by_link_id(&link_id)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error fetching payout links from db\")\n })\n .await\n .transpose()?;\n\n let payout_method_id = payouts.payout_method_id.clone();\n let mut payment_method: Option = None;\n\n if let Some(pm_id) = payout_method_id {\n payment_method = Some(\n db.find_payment_method(\n &(state.into()),\n key_store,\n &pm_id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?,\n );\n }\n\n Ok(PayoutData {\n billing_address,\n business_profile,\n customer_details,\n payouts,\n payout_attempt,\n payout_method_data: payout_method_data_req.to_owned(),\n merchant_connector_account,\n should_terminate: false,\n profile_id,\n payout_link,\n current_locale: locale.to_string(),\n payment_method,\n })\n}", + "after_code": "pub async fn make_payout_data(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n auth_profile_id: Option,\n key_store: &domain::MerchantKeyStore,\n req: &payouts::PayoutRequest,\n locale: &str,\n) -> RouterResult {\n let db = &*state.store;\n let merchant_id = merchant_account.get_id();\n let payout_id = match req {\n payouts::PayoutRequest::PayoutActionRequest(r) => r.payout_id.clone(),\n payouts::PayoutRequest::PayoutCreateRequest(r) => r.payout_id.clone().unwrap_or_default(),\n payouts::PayoutRequest::PayoutRetrieveRequest(r) => r.payout_id.clone(),\n };\n\n let payouts = db\n .find_payout_by_merchant_id_payout_id(\n merchant_id,\n &payout_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n core_utils::validate_profile_id_from_auth_layer(auth_profile_id, &payouts)?;\n\n let payout_attempt_id = utils::get_payout_attempt_id(payout_id, payouts.attempt_count);\n\n let mut payout_attempt = db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_id,\n &payout_attempt_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n\n let customer_id = payouts.customer_id.as_ref();\n\n // We have to do this because the function that is being used to create / get address is from payments\n // which expects a payment_id\n let payout_id_as_payment_id_type = common_utils::id_type::PaymentId::try_from(\n std::borrow::Cow::Owned(payouts.payout_id.clone()),\n )\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n let billing_address = payment_helpers::create_or_find_address_for_payment_by_request(\n state,\n None,\n payouts.address_id.as_deref(),\n merchant_id,\n customer_id,\n key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await?;\n\n let payout_id = &payouts.payout_id;\n\n let customer_details = customer_id\n .async_map(|customer_id| async move {\n db.find_customer_optional_by_customer_id_merchant_id(\n &state.into(),\n customer_id,\n merchant_id,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .map_err(|err| err.change_context(errors::ApiErrorResponse::InternalServerError))\n .attach_printable_lazy(|| {\n format!(\n \"Failed while fetching optional customer [id - {:?}] for payout [id - {}]\",\n customer_id, payout_id\n )\n })\n })\n .await\n .transpose()?\n .and_then(|c| c);\n let profile_id = payout_attempt.profile_id.clone();\n\n // Validate whether profile_id passed in request is valid and is linked to the merchant\n let business_profile =\n validate_and_get_business_profile(state, key_store, &profile_id, merchant_id).await?;\n let payout_method_data_req = match req {\n payouts::PayoutRequest::PayoutCreateRequest(r) => r.payout_method_data.to_owned(),\n payouts::PayoutRequest::PayoutActionRequest(_) => {\n match payout_attempt.payout_token.to_owned() {\n Some(payout_token) => {\n let customer_id = customer_details\n .as_ref()\n .map(|cd| cd.customer_id.to_owned())\n .get_required_value(\"customer_id when payout_token is sent\")?;\n helpers::make_payout_method_data(\n state,\n None,\n Some(&payout_token),\n &customer_id,\n merchant_account.get_id(),\n payouts.payout_type,\n key_store,\n None,\n merchant_account.storage_scheme,\n )\n .await?\n }\n None => None,\n }\n }\n payouts::PayoutRequest::PayoutRetrieveRequest(_) => None,\n };\n\n if let Some(payout_method_data) = payout_method_data_req.clone() {\n let additional_payout_method_data =\n helpers::get_additional_payout_data(&payout_method_data, &*state.store, &profile_id)\n .await;\n\n let update_additional_payout_method_data =\n storage::PayoutAttemptUpdate::AdditionalPayoutMethodDataUpdate {\n additional_payout_method_data,\n };\n\n payout_attempt = db\n .update_payout_attempt(\n &payout_attempt,\n update_additional_payout_method_data,\n &payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating additional payout method data in payout_attempt\")?;\n };\n\n let merchant_connector_account =\n if payout_attempt.connector.is_some() && payout_attempt.merchant_connector_id.is_some() {\n let connector_name = payout_attempt\n .connector\n .clone()\n .get_required_value(\"connector_name\")?;\n Some(\n payment_helpers::get_merchant_connector_account(\n state,\n merchant_account.get_id(),\n None,\n key_store,\n &profile_id,\n connector_name.as_str(),\n payout_attempt.merchant_connector_id.as_ref(),\n )\n .await?,\n )\n } else {\n None\n };\n\n let payout_link = payouts\n .payout_link_id\n .clone()\n .async_map(|link_id| async move {\n db.find_payout_link_by_link_id(&link_id)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error fetching payout links from db\")\n })\n .await\n .transpose()?;\n\n let payout_method_id = payouts.payout_method_id.clone();\n let mut payment_method: Option = None;\n\n if let Some(pm_id) = payout_method_id {\n payment_method = Some(\n db.find_payment_method(\n &(state.into()),\n key_store,\n &pm_id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?,\n );\n }\n\n Ok(PayoutData {\n billing_address,\n business_profile,\n customer_details,\n payouts,\n payout_attempt,\n payout_method_data: payout_method_data_req.to_owned(),\n merchant_connector_account,\n should_terminate: false,\n profile_id,\n payout_link,\n current_locale: locale.to_string(),\n payment_method,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::PaymentMethod", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl From<&PaymentMethodNew> for PaymentMethod {\n fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }\n}", + "after_code": "impl From<&PaymentMethodNew> for PaymentMethod {\n fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts.rs::function::fulfill_payout", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn fulfill_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let mut router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Get/Create access token\n access_token::create_access_token(\n state,\n connector_data,\n merchant_account,\n &mut router_data,\n payout_data.payouts.payout_type.to_owned(),\n )\n .await?;\n\n // 3. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoFulfill,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 4. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 5. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let status = payout_response_data\n .status\n .unwrap_or(payout_data.payout_attempt.status.to_owned());\n payout_data.payouts.status = status;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_data.payout_attempt.error_message.as_ref(), \"error_code\": payout_data.payout_attempt.error_code.as_ref()})\n ),\n }));\n } else if payout_data.payouts.recurring\n && payout_data.payouts.payout_method_id.clone().is_none()\n {\n let payout_method_data = payout_data\n .payout_method_data\n .clone()\n .get_required_value(\"payout_method_data\")?;\n payout_data\n .payouts\n .customer_id\n .clone()\n .async_map(|customer_id| async move {\n helpers::save_payout_data_to_locker(\n state,\n payout_data,\n &customer_id,\n &payout_method_data,\n None,\n merchant_account,\n key_store,\n )\n .await\n })\n .await\n .transpose()\n .attach_printable(\"Failed to save payout data to locker\")?;\n }\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "after_code": "pub async fn fulfill_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let mut router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Get/Create access token\n access_token::create_access_token(\n state,\n connector_data,\n merchant_account,\n &mut router_data,\n payout_data.payouts.payout_type.to_owned(),\n )\n .await?;\n\n // 3. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoFulfill,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 4. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 5. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let status = payout_response_data\n .status\n .unwrap_or(payout_data.payout_attempt.status.to_owned());\n payout_data.payouts.status = status;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_data.payout_attempt.error_message.as_ref(), \"error_code\": payout_data.payout_attempt.error_code.as_ref()})\n ),\n }));\n } else if payout_data.payouts.recurring\n && payout_data.payouts.payout_method_id.clone().is_none()\n {\n let payout_method_data = payout_data\n .payout_method_data\n .clone()\n .get_required_value(\"payout_method_data\")?;\n payout_data\n .payouts\n .customer_id\n .clone()\n .async_map(|customer_id| async move {\n helpers::save_payout_data_to_locker(\n state,\n payout_data,\n &customer_id,\n &payout_method_data,\n None,\n merchant_account,\n key_store,\n )\n .await\n })\n .await\n .transpose()\n .attach_printable(\"Failed to save payout data to locker\")?;\n }\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::complete_create_recipient", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn complete_create_recipient(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n if !payout_data.should_terminate\n && matches!(\n payout_data.payout_attempt.status,\n common_enums::PayoutStatus::RequiresCreation\n | common_enums::PayoutStatus::RequiresConfirmation\n | common_enums::PayoutStatus::RequiresPayoutMethodData\n )\n && connector_data\n .connector_name\n .supports_create_recipient(payout_data.payouts.payout_type)\n {\n create_recipient(\n state,\n merchant_account,\n key_store,\n connector_data,\n payout_data,\n )\n .await\n .attach_printable(\"Creation of customer failed\")?;\n }\n\n Ok(())\n}", + "after_code": "pub async fn complete_create_recipient(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n if !payout_data.should_terminate\n && matches!(\n payout_data.payout_attempt.status,\n common_enums::PayoutStatus::RequiresCreation\n | common_enums::PayoutStatus::RequiresConfirmation\n | common_enums::PayoutStatus::RequiresPayoutMethodData\n )\n && connector_data\n .connector_name\n .supports_create_recipient(payout_data.payouts.payout_type)\n {\n create_recipient(\n state,\n merchant_account,\n key_store,\n connector_data,\n payout_data,\n )\n .await\n .attach_printable(\"Creation of customer failed\")?;\n }\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::should_call_retrieve", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn should_call_retrieve(status: api_enums::PayoutStatus) -> bool {\n matches!(\n status,\n api_enums::PayoutStatus::Pending | api_enums::PayoutStatus::Initiated\n )\n}", + "after_code": "pub fn should_call_retrieve(status: api_enums::PayoutStatus) -> bool {\n matches!(\n status,\n api_enums::PayoutStatus::Pending | api_enums::PayoutStatus::Initiated\n )\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::get_customer_details_from_request", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub(super) fn get_customer_details_from_request(\n request: &payouts::PayoutCreateRequest,\n) -> CustomerDetails {\n let customer_id = request.get_customer_id().map(ToOwned::to_owned);\n\n let customer_name = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.name.clone())\n .or(request.name.clone());\n\n let customer_email = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.email.clone())\n .or(request.email.clone());\n\n let customer_phone = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.phone.clone())\n .or(request.phone.clone());\n\n let customer_phone_code = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.phone_country_code.clone())\n .or(request.phone_country_code.clone());\n\n CustomerDetails {\n customer_id,\n name: customer_name,\n email: customer_email,\n phone: customer_phone,\n phone_country_code: customer_phone_code,\n }\n}", + "after_code": "pub(super) fn get_customer_details_from_request(\n request: &payouts::PayoutCreateRequest,\n) -> CustomerDetails {\n let customer_id = request.get_customer_id().map(ToOwned::to_owned);\n\n let customer_name = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.name.clone())\n .or(request.name.clone());\n\n let customer_email = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.email.clone())\n .or(request.email.clone());\n\n let customer_phone = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.phone.clone())\n .or(request.phone.clone());\n\n let customer_phone_code = request\n .customer\n .as_ref()\n .and_then(|customer_details| customer_details.phone_country_code.clone())\n .or(request.phone_country_code.clone());\n\n CustomerDetails {\n customer_id,\n name: customer_name,\n email: customer_email,\n phone: customer_phone,\n phone_country_code: customer_phone_code,\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::CommonMandateReference::function::from_sql", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result {\n // Deserialize into a generic serde_json::Value first\n let value = >::from_sql(bytes)?;\n\n // Try to directly deserialize into CommonMandateReference\n if let Ok(common_reference) = serde_json::from_value::(value.clone()) {\n return Ok(common_reference);\n }\n\n // If that fails, try deserializing into PaymentsMandateReference\n if let Ok(payment_reference) = serde_json::from_value::(value) {\n // Convert PaymentsMandateReference to CommonMandateReference\n return Ok(Self::from(payment_reference));\n }\n\n // If neither succeeds, return an error\n Err(report!(ParsingError::StructParseFailure(\"CommonMandateReference\"))\n .attach_printable(\"Failed to parse JSON into CommonMandateReference or PaymentsMandateReference\"))?\n }", + "after_code": "fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result {\n // Deserialize into a generic serde_json::Value first\n let value = >::from_sql(bytes)?;\n\n // Try to directly deserialize into CommonMandateReference\n if let Ok(common_reference) = serde_json::from_value::(value.clone()) {\n return Ok(common_reference);\n }\n\n // If that fails, try deserializing into PaymentsMandateReference\n if let Ok(payment_reference) = serde_json::from_value::(value) {\n // Convert PaymentsMandateReference to CommonMandateReference\n return Ok(Self::from(payment_reference));\n }\n\n // If neither succeeds, return an error\n Err(\n report!(ParsingError::StructParseFailure(\"CommonMandateReference\")).attach_printable(\n \"Failed to parse JSON into CommonMandateReference or PaymentsMandateReference\",\n ),\n )?\n }", + "diff_span": { + "before": "fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result {\n // Deserialize into a generic serde_json::Value first\n let value = >::from_sql(bytes)?;\n\n // Try to directly deserialize into CommonMandateReference\n if let Ok(common_reference) = serde_json::from_value::(value.clone()) {\n return Ok(common_reference);\n }\n\n // If that fails, try deserializing into PaymentsMandateReference\n if let Ok(payment_reference) = serde_json::from_value::(value) {\n // Convert PaymentsMandateReference to CommonMandateReference\n return Ok(Self::from(payment_reference));\n }\n\n // If neither succeeds, return an error\n Err(report!(ParsingError::StructParseFailure(\"CommonMandateReference\"))\n .attach_printable(\"Failed to parse JSON into CommonMandateReference or PaymentsMandateReference\"))?\n }", + "after": "fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result {\n // Deserialize into a generic serde_json::Value first\n let value = >::from_sql(bytes)?;\n\n // Try to directly deserialize into CommonMandateReference\n if let Ok(common_reference) = serde_json::from_value::(value.clone()) {\n return Ok(common_reference);\n }\n\n // If that fails, try deserializing into PaymentsMandateReference\n if let Ok(payment_reference) = serde_json::from_value::(value) {\n // Convert PaymentsMandateReference to CommonMandateReference\n return Ok(Self::from(payment_reference));\n }\n\n // If neither succeeds, return an error\n Err(\n report!(ParsingError::StructParseFailure(\"CommonMandateReference\")).attach_printable(\n \"Failed to parse JSON into CommonMandateReference or PaymentsMandateReference\",\n ),\n )?\n }" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use error_stack::report;", + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [ + "use error_stack::report;", + "use serde::{Deserialize, Serialize};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::complete_create_payout", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn complete_create_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n if !payout_data.should_terminate\n && matches!(\n payout_data.payout_attempt.status,\n storage_enums::PayoutStatus::RequiresCreation\n | storage_enums::PayoutStatus::RequiresConfirmation\n | storage_enums::PayoutStatus::RequiresPayoutMethodData\n )\n {\n if connector_data\n .connector_name\n .supports_instant_payout(payout_data.payouts.payout_type)\n {\n // create payout_object only in router\n let db = &*state.store;\n let payout_attempt = &payout_data.payout_attempt;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.clone(),\n status: storage::enums::PayoutStatus::RequiresFulfillment,\n error_code: None,\n error_message: None,\n is_eligible: None,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate {\n status: storage::enums::PayoutStatus::RequiresFulfillment,\n },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n } else {\n // create payout_object in connector as well as router\n Box::pin(create_payout(\n state,\n merchant_account,\n connector_data,\n payout_data,\n ))\n .await\n .attach_printable(\"Payout creation failed for given Payout request\")?;\n }\n }\n Ok(())\n}", + "after_code": "pub async fn complete_create_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n if !payout_data.should_terminate\n && matches!(\n payout_data.payout_attempt.status,\n storage_enums::PayoutStatus::RequiresCreation\n | storage_enums::PayoutStatus::RequiresConfirmation\n | storage_enums::PayoutStatus::RequiresPayoutMethodData\n )\n {\n if connector_data\n .connector_name\n .supports_instant_payout(payout_data.payouts.payout_type)\n {\n // create payout_object only in router\n let db = &*state.store;\n let payout_attempt = &payout_data.payout_attempt;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.clone(),\n status: storage::enums::PayoutStatus::RequiresFulfillment,\n error_code: None,\n error_message: None,\n is_eligible: None,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate {\n status: storage::enums::PayoutStatus::RequiresFulfillment,\n },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n } else {\n // create payout_object in connector as well as router\n Box::pin(create_payout(\n state,\n merchant_account,\n connector_data,\n payout_data,\n ))\n .await\n .attach_printable(\"Payout creation failed for given Payout request\")?;\n }\n }\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentsMandateReference::function::deref", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn deref(&self) -> &Self::Target {\n &self.0\n }", + "after_code": "fn deref(&self) -> &Self::Target {\n &self.0\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_fulfill_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_fulfill_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutActionRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutActionRequest(req.to_owned()),\n &state.locale,\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n // Verify if fulfillment can be triggered\n if helpers::is_payout_terminal_state(status)\n || status != api_enums::PayoutStatus::RequiresFulfillment\n {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be fulfilled for status {}\",\n payout_attempt.payout_id, status\n ),\n }));\n }\n\n // Form connector data\n let connector_data = match &payout_attempt.connector {\n Some(connector) => api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n connector,\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?,\n _ => Err(errors::ApplicationError::InvalidConfigurationValueError(\n \"Connector not found in payout_attempt - should not reach here.\".to_string(),\n ))\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"connector\",\n })\n .attach_printable(\"Connector not found for payout fulfillment\")?,\n };\n\n // Trigger fulfillment\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id\")?;\n payout_data.payout_method_data = Some(\n helpers::make_payout_method_data(\n &state,\n None,\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_data.payouts.payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?\n .get_required_value(\"payout_method_data\")?,\n );\n Box::pin(fulfill_payout(\n &state,\n &merchant_account,\n &key_store,\n &connector_data,\n &mut payout_data,\n ))\n .await\n .attach_printable(\"Payout fulfillment failed for given Payout request\")?;\n\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_attempt.error_message, \"error_code\": payout_attempt.error_code})\n ),\n }));\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_fulfill_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutActionRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutActionRequest(req.to_owned()),\n &state.locale,\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n // Verify if fulfillment can be triggered\n if helpers::is_payout_terminal_state(status)\n || status != api_enums::PayoutStatus::RequiresFulfillment\n {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be fulfilled for status {}\",\n payout_attempt.payout_id, status\n ),\n }));\n }\n\n // Form connector data\n let connector_data = match &payout_attempt.connector {\n Some(connector) => api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n connector,\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?,\n _ => Err(errors::ApplicationError::InvalidConfigurationValueError(\n \"Connector not found in payout_attempt - should not reach here.\".to_string(),\n ))\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"connector\",\n })\n .attach_printable(\"Connector not found for payout fulfillment\")?,\n };\n\n // Trigger fulfillment\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id\")?;\n payout_data.payout_method_data = Some(\n helpers::make_payout_method_data(\n &state,\n None,\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_data.payouts.payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?\n .get_required_value(\"payout_method_data\")?,\n );\n Box::pin(fulfill_payout(\n &state,\n &merchant_account,\n &key_store,\n &connector_data,\n &mut payout_data,\n ))\n .await\n .attach_printable(\"Payout fulfillment failed for given Payout request\")?;\n\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_attempt.error_message, \"error_code\": payout_attempt.error_code})\n ),\n }));\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_filtered_list_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_filtered_list_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id_list: Option>,\n key_store: domain::MerchantKeyStore,\n filters: payouts::PayoutListFilterConstraints,\n) -> RouterResponse {\n let limit = &filters.limit;\n validator::validate_payout_list_request_for_joins(*limit)?;\n let db = state.store.as_ref();\n let constraints = filters.clone().into();\n let list: Vec<(\n storage::Payouts,\n storage::PayoutAttempt,\n Option,\n Option,\n )> = db\n .filter_payouts_and_attempts(\n merchant_account.get_id(),\n &constraints,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n let list = core_utils::filter_objects_based_on_profile_id_list(profile_id_list, list);\n let data: Vec =\n join_all(list.into_iter().map(|(p, pa, customer, address)| async {\n let customer: Option = customer\n .async_and_then(|cust| async {\n domain::Customer::convert_back(\n &(&state).into(),\n cust,\n &key_store.key,\n key_store.merchant_id.clone().into(),\n )\n .await\n .map_err(|err| {\n let msg = format!(\"failed to convert customer for id: {:?}\", p.customer_id);\n logger::warn!(?err, msg);\n })\n .ok()\n })\n .await;\n\n let payout_addr: Option = address\n .async_and_then(|addr| async {\n domain::Address::convert_back(\n &(&state).into(),\n addr,\n &key_store.key,\n key_store.merchant_id.clone().into(),\n )\n .await\n .map(ForeignFrom::foreign_from)\n .map_err(|err| {\n let msg = format!(\"failed to convert address for id: {:?}\", p.address_id);\n logger::warn!(?err, msg);\n })\n .ok()\n })\n .await;\n\n Some((p, pa, customer, payout_addr))\n }))\n .await\n .into_iter()\n .flatten()\n .map(ForeignFrom::foreign_from)\n .collect();\n\n let active_payout_ids = db\n .filter_active_payout_ids_by_constraints(merchant_account.get_id(), &constraints)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to filter active payout ids based on the constraints\")?;\n\n let total_count = db\n .get_total_count_of_filtered_payouts(\n merchant_account.get_id(),\n &active_payout_ids,\n filters.connector.clone(),\n filters.currency.clone(),\n filters.status.clone(),\n filters.payout_method.clone(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed to fetch total count of filtered payouts for the given constraints - {:?}\",\n filters\n )\n })?;\n\n Ok(services::ApplicationResponse::Json(\n api::PayoutListResponse {\n size: data.len(),\n data,\n total_count: Some(total_count),\n },\n ))\n}", + "after_code": "pub async fn payouts_filtered_list_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id_list: Option>,\n key_store: domain::MerchantKeyStore,\n filters: payouts::PayoutListFilterConstraints,\n) -> RouterResponse {\n let limit = &filters.limit;\n validator::validate_payout_list_request_for_joins(*limit)?;\n let db = state.store.as_ref();\n let constraints = filters.clone().into();\n let list: Vec<(\n storage::Payouts,\n storage::PayoutAttempt,\n Option,\n Option,\n )> = db\n .filter_payouts_and_attempts(\n merchant_account.get_id(),\n &constraints,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n let list = core_utils::filter_objects_based_on_profile_id_list(profile_id_list, list);\n let data: Vec =\n join_all(list.into_iter().map(|(p, pa, customer, address)| async {\n let customer: Option = customer\n .async_and_then(|cust| async {\n domain::Customer::convert_back(\n &(&state).into(),\n cust,\n &key_store.key,\n key_store.merchant_id.clone().into(),\n )\n .await\n .map_err(|err| {\n let msg = format!(\"failed to convert customer for id: {:?}\", p.customer_id);\n logger::warn!(?err, msg);\n })\n .ok()\n })\n .await;\n\n let payout_addr: Option = address\n .async_and_then(|addr| async {\n domain::Address::convert_back(\n &(&state).into(),\n addr,\n &key_store.key,\n key_store.merchant_id.clone().into(),\n )\n .await\n .map(ForeignFrom::foreign_from)\n .map_err(|err| {\n let msg = format!(\"failed to convert address for id: {:?}\", p.address_id);\n logger::warn!(?err, msg);\n })\n .ok()\n })\n .await;\n\n Some((p, pa, customer, payout_addr))\n }))\n .await\n .into_iter()\n .flatten()\n .map(ForeignFrom::foreign_from)\n .collect();\n\n let active_payout_ids = db\n .filter_active_payout_ids_by_constraints(merchant_account.get_id(), &constraints)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to filter active payout ids based on the constraints\")?;\n\n let total_count = db\n .get_total_count_of_filtered_payouts(\n merchant_account.get_id(),\n &active_payout_ids,\n filters.connector.clone(),\n filters.currency.clone(),\n filters.status.clone(),\n filters.payout_method.clone(),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed to fetch total count of filtered payouts for the given constraints - {:?}\",\n filters\n )\n })?;\n\n Ok(services::ApplicationResponse::Json(\n api::PayoutListResponse {\n size: data.len(),\n data,\n total_count: Some(total_count),\n },\n ))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use futures::future::join_all;", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use futures::future::join_all;" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_payout_retrieve", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn create_payout_retrieve(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let mut router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Get/Create access token\n access_token::create_access_token(\n state,\n connector_data,\n merchant_account,\n &mut router_data,\n payout_data.payouts.payout_type.to_owned(),\n )\n .await?;\n\n // 3. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoSync,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 4. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 5. Process data returned by the connector\n update_retrieve_payout_tracker(state, merchant_account, payout_data, &router_data_resp).await?;\n\n Ok(())\n}", + "after_code": "pub async fn create_payout_retrieve(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let mut router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Get/Create access token\n access_token::create_access_token(\n state,\n connector_data,\n merchant_account,\n &mut router_data,\n payout_data.payouts.payout_type.to_owned(),\n )\n .await?;\n\n // 3. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoSync,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 4. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 5. Process data returned by the connector\n update_retrieve_payout_tracker(state, merchant_account, payout_data, &router_data_resp).await?;\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::get_translated_unified_code_and_message", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn get_translated_unified_code_and_message(\n state: &SessionState,\n unified_code: Option<&UnifiedCode>,\n unified_message: Option<&UnifiedMessage>,\n locale: &str,\n) -> CustomResult, errors::ApiErrorResponse> {\n Ok(unified_code\n .zip(unified_message)\n .async_and_then(|(code, message)| async {\n payment_helpers::get_unified_translation(\n state,\n code.0.clone(),\n message.0.clone(),\n locale.to_string(),\n )\n .await\n .map(UnifiedMessage::try_from)\n })\n .await\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?\n .or_else(|| unified_message.cloned()))\n}", + "after_code": "pub async fn get_translated_unified_code_and_message(\n state: &SessionState,\n unified_code: Option<&UnifiedCode>,\n unified_message: Option<&UnifiedMessage>,\n locale: &str,\n) -> CustomResult, errors::ApiErrorResponse> {\n Ok(unified_code\n .zip(unified_message)\n .async_and_then(|(code, message)| async {\n payment_helpers::get_unified_translation(\n state,\n code.0.clone(),\n message.0.clone(),\n locale.to_string(),\n )\n .await\n .map(UnifiedMessage::try_from)\n })\n .await\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?\n .or_else(|| unified_message.cloned()))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethod", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}", + "after_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use time::PrimitiveDateTime;", + "use serde::{de, Deserialize, Deserializer, Serialize};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use time::PrimitiveDateTime;", + "use masking::{ExposeInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::response_handler", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn response_handler(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n payout_data: &PayoutData,\n) -> RouterResponse {\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payouts = payout_data.payouts.to_owned();\n\n let payout_method_id: Option = payout_data.payment_method.as_ref().map(|pm| {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n {\n pm.payment_method_id.clone()\n }\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n {\n pm.id.clone().get_string_repr().to_string()\n }\n });\n\n let payout_link = payout_data.payout_link.to_owned();\n let billing_address = payout_data.billing_address.to_owned();\n let customer_details = payout_data.customer_details.to_owned();\n let customer_id = payouts.customer_id;\n let billing = billing_address\n .as_ref()\n .map(hyperswitch_domain_models::address::Address::from)\n .map(From::from);\n\n let translated_unified_message = helpers::get_translated_unified_code_and_message(\n state,\n payout_attempt.unified_code.as_ref(),\n payout_attempt.unified_message.as_ref(),\n &payout_data.current_locale,\n )\n .await?;\n\n let additional_payout_method_data = payout_attempt.additional_payout_method_data.clone();\n\n let payout_method_data =\n additional_payout_method_data.map(payouts::PayoutMethodDataResponse::from);\n\n let response = api::PayoutCreateResponse {\n payout_id: payouts.payout_id.to_owned(),\n merchant_id: merchant_account.get_id().to_owned(),\n amount: payouts.amount,\n currency: payouts.destination_currency.to_owned(),\n connector: payout_attempt.connector,\n payout_type: payouts.payout_type.to_owned(),\n payout_method_data,\n billing,\n auto_fulfill: payouts.auto_fulfill,\n customer_id,\n email: customer_details.as_ref().and_then(|c| c.email.clone()),\n name: customer_details.as_ref().and_then(|c| c.name.clone()),\n phone: customer_details.as_ref().and_then(|c| c.phone.clone()),\n phone_country_code: customer_details\n .as_ref()\n .and_then(|c| c.phone_country_code.clone()),\n customer: customer_details\n .as_ref()\n .map(payment_api_types::CustomerDetailsResponse::foreign_from),\n client_secret: payouts.client_secret.to_owned(),\n return_url: payouts.return_url.to_owned(),\n business_country: payout_attempt.business_country,\n business_label: payout_attempt.business_label,\n description: payouts.description.to_owned(),\n entity_type: payouts.entity_type.to_owned(),\n recurring: payouts.recurring,\n metadata: payouts.metadata,\n merchant_connector_id: payout_attempt.merchant_connector_id.to_owned(),\n status: payout_attempt.status.to_owned(),\n error_message: payout_attempt.error_message.to_owned(),\n error_code: payout_attempt.error_code,\n profile_id: payout_attempt.profile_id,\n created: Some(payouts.created_at),\n connector_transaction_id: payout_attempt.connector_payout_id,\n priority: payouts.priority,\n attempts: None,\n unified_code: payout_attempt.unified_code,\n unified_message: translated_unified_message,\n payout_link: payout_link\n .map(|payout_link| {\n url::Url::parse(payout_link.url.peek()).map(|link| PayoutLinkResponse {\n payout_link_id: payout_link.link_id,\n link: link.into(),\n })\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse payout link's URL\")?,\n payout_method_id,\n };\n Ok(services::ApplicationResponse::Json(response))\n}", + "after_code": "pub async fn response_handler(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n payout_data: &PayoutData,\n) -> RouterResponse {\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payouts = payout_data.payouts.to_owned();\n\n let payout_method_id: Option = payout_data.payment_method.as_ref().map(|pm| {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n {\n pm.payment_method_id.clone()\n }\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n {\n pm.id.clone().get_string_repr().to_string()\n }\n });\n\n let payout_link = payout_data.payout_link.to_owned();\n let billing_address = payout_data.billing_address.to_owned();\n let customer_details = payout_data.customer_details.to_owned();\n let customer_id = payouts.customer_id;\n let billing = billing_address\n .as_ref()\n .map(hyperswitch_domain_models::address::Address::from)\n .map(From::from);\n\n let translated_unified_message = helpers::get_translated_unified_code_and_message(\n state,\n payout_attempt.unified_code.as_ref(),\n payout_attempt.unified_message.as_ref(),\n &payout_data.current_locale,\n )\n .await?;\n\n let additional_payout_method_data = payout_attempt.additional_payout_method_data.clone();\n\n let payout_method_data =\n additional_payout_method_data.map(payouts::PayoutMethodDataResponse::from);\n\n let response = api::PayoutCreateResponse {\n payout_id: payouts.payout_id.to_owned(),\n merchant_id: merchant_account.get_id().to_owned(),\n amount: payouts.amount,\n currency: payouts.destination_currency.to_owned(),\n connector: payout_attempt.connector,\n payout_type: payouts.payout_type.to_owned(),\n payout_method_data,\n billing,\n auto_fulfill: payouts.auto_fulfill,\n customer_id,\n email: customer_details.as_ref().and_then(|c| c.email.clone()),\n name: customer_details.as_ref().and_then(|c| c.name.clone()),\n phone: customer_details.as_ref().and_then(|c| c.phone.clone()),\n phone_country_code: customer_details\n .as_ref()\n .and_then(|c| c.phone_country_code.clone()),\n customer: customer_details\n .as_ref()\n .map(payment_api_types::CustomerDetailsResponse::foreign_from),\n client_secret: payouts.client_secret.to_owned(),\n return_url: payouts.return_url.to_owned(),\n business_country: payout_attempt.business_country,\n business_label: payout_attempt.business_label,\n description: payouts.description.to_owned(),\n entity_type: payouts.entity_type.to_owned(),\n recurring: payouts.recurring,\n metadata: payouts.metadata,\n merchant_connector_id: payout_attempt.merchant_connector_id.to_owned(),\n status: payout_attempt.status.to_owned(),\n error_message: payout_attempt.error_message.to_owned(),\n error_code: payout_attempt.error_code,\n profile_id: payout_attempt.profile_id,\n created: Some(payouts.created_at),\n connector_transaction_id: payout_attempt.connector_payout_id,\n priority: payouts.priority,\n attempts: None,\n unified_code: payout_attempt.unified_code,\n unified_message: translated_unified_message,\n payout_link: payout_link\n .map(|payout_link| {\n url::Url::parse(payout_link.url.peek()).map(|link| PayoutLinkResponse {\n payout_link_id: payout_link.link_id,\n link: link.into(),\n })\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse payout link's URL\")?,\n payout_method_id,\n };\n Ok(services::ApplicationResponse::Json(response))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::is_payout_terminal_state", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn is_payout_terminal_state(status: api_enums::PayoutStatus) -> bool {\n !matches!(\n status,\n api_enums::PayoutStatus::RequiresCreation\n | api_enums::PayoutStatus::RequiresConfirmation\n | api_enums::PayoutStatus::RequiresPayoutMethodData\n | api_enums::PayoutStatus::RequiresVendorAccountCreation\n // Initiated by the underlying connector\n | api_enums::PayoutStatus::Pending\n | api_enums::PayoutStatus::Initiated\n | api_enums::PayoutStatus::RequiresFulfillment\n )\n}", + "after_code": "pub fn is_payout_terminal_state(status: api_enums::PayoutStatus) -> bool {\n !matches!(\n status,\n api_enums::PayoutStatus::RequiresCreation\n | api_enums::PayoutStatus::RequiresConfirmation\n | api_enums::PayoutStatus::RequiresPayoutMethodData\n | api_enums::PayoutStatus::RequiresVendorAccountCreation\n // Initiated by the underlying connector\n | api_enums::PayoutStatus::Pending\n | api_enums::PayoutStatus::Initiated\n | api_enums::PayoutStatus::RequiresFulfillment\n )\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::is_eligible_for_local_payout_cancellation", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn is_eligible_for_local_payout_cancellation(status: api_enums::PayoutStatus) -> bool {\n matches!(\n status,\n api_enums::PayoutStatus::RequiresCreation\n | api_enums::PayoutStatus::RequiresConfirmation\n | api_enums::PayoutStatus::RequiresPayoutMethodData\n | api_enums::PayoutStatus::RequiresVendorAccountCreation\n )\n}", + "after_code": "pub fn is_eligible_for_local_payout_cancellation(status: api_enums::PayoutStatus) -> bool {\n matches!(\n status,\n api_enums::PayoutStatus::RequiresCreation\n | api_enums::PayoutStatus::RequiresConfirmation\n | api_enums::PayoutStatus::RequiresPayoutMethodData\n | api_enums::PayoutStatus::RequiresVendorAccountCreation\n )\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_payout", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn create_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let mut router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Get/Create access token\n access_token::create_access_token(\n state,\n connector_data,\n merchant_account,\n &mut router_data,\n payout_data.payouts.payout_type.to_owned(),\n )\n .await?;\n\n // 3. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoCreate,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 4. Execute pretasks\n complete_payout_quote_steps_if_required(state, connector_data, &mut router_data).await?;\n\n // 5. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 6. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_data.payout_attempt.error_message.as_ref(), \"error_code\": payout_data.payout_attempt.error_code.as_ref()})\n ),\n }));\n }\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "after_code": "pub async fn create_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let mut router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Get/Create access token\n access_token::create_access_token(\n state,\n connector_data,\n merchant_account,\n &mut router_data,\n payout_data.payouts.payout_type.to_owned(),\n )\n .await?;\n\n // 3. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoCreate,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 4. Execute pretasks\n complete_payout_quote_steps_if_required(state, connector_data, &mut router_data).await?;\n\n // 5. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 6. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_data.payout_attempt.error_message.as_ref(), \"error_code\": payout_data.payout_attempt.error_code.as_ref()})\n ),\n }));\n }\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_update_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_update_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n let payout_id = req.payout_id.clone().get_required_value(\"payout_id\")?;\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutCreateRequest(Box::new(req.to_owned())),\n &state.locale,\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n // Verify update feasibility\n if helpers::is_payout_terminal_state(status) || helpers::is_payout_initiated(status) {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be updated for status {}\",\n payout_id, status\n ),\n }));\n }\n helpers::update_payouts_and_payout_attempt(\n &mut payout_data,\n &merchant_account,\n &req,\n &state,\n &key_store,\n )\n .await?;\n let payout_attempt = payout_data.payout_attempt.to_owned();\n\n if (req.connector.is_none(), payout_attempt.connector.is_some()) != (true, true) {\n // if the connector is not updated but was provided during payout create\n payout_data.payout_attempt.connector = None;\n payout_data.payout_attempt.routing_info = None;\n };\n\n // Update payout method data in temp locker\n if req.payout_method_data.is_some() {\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id when payout_method_data is provided\")?;\n payout_data.payout_method_data = helpers::make_payout_method_data(\n &state,\n req.payout_method_data.as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_data.payouts.payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?;\n }\n\n if let Some(true) = payout_data.payouts.confirm {\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?;\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_update_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n let payout_id = req.payout_id.clone().get_required_value(\"payout_id\")?;\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutCreateRequest(Box::new(req.to_owned())),\n &state.locale,\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n // Verify update feasibility\n if helpers::is_payout_terminal_state(status) || helpers::is_payout_initiated(status) {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be updated for status {}\",\n payout_id, status\n ),\n }));\n }\n helpers::update_payouts_and_payout_attempt(\n &mut payout_data,\n &merchant_account,\n &req,\n &state,\n &key_store,\n )\n .await?;\n let payout_attempt = payout_data.payout_attempt.to_owned();\n\n if (req.connector.is_none(), payout_attempt.connector.is_some()) != (true, true) {\n // if the connector is not updated but was provided during payout create\n payout_data.payout_attempt.connector = None;\n payout_data.payout_attempt.routing_info = None;\n };\n\n // Update payout method data in temp locker\n if req.payout_method_data.is_some() {\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id when payout_method_data is provided\")?;\n payout_data.payout_method_data = helpers::make_payout_method_data(\n &state,\n req.payout_method_data.as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_data.payouts.payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?;\n }\n\n if let Some(true) = payout_data.payouts.confirm {\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?;\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethodUpdateInternal::function::from", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }", + "after_code": "fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::enum::PaymentMethodUpdate", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub enum PaymentMethodUpdate {\n UpdatePaymentMethodDataAndLastUsed {\n payment_method_data: Option,\n scheme: Option,\n last_used_at: PrimitiveDateTime,\n },\n PaymentMethodDataUpdate {\n payment_method_data: Option,\n },\n LastUsedUpdate {\n last_used_at: PrimitiveDateTime,\n },\n NetworkTransactionIdAndStatusUpdate {\n network_transaction_id: Option,\n status: Option,\n },\n StatusUpdate {\n status: Option,\n },\n AdditionalDataUpdate {\n payment_method_data: Option,\n status: Option,\n locker_id: Option,\n payment_method_type_v2: Option,\n payment_method_subtype: Option,\n network_token_requestor_reference_id: Option,\n network_token_locker_id: Option,\n network_token_payment_method_data: Option,\n locker_fingerprint_id: Option,\n },\n ConnectorMandateDetailsUpdate {\n connector_mandate_details: Option,\n },\n}", + "after_code": "pub enum PaymentMethodUpdate {\n UpdatePaymentMethodDataAndLastUsed {\n payment_method_data: Option,\n scheme: Option,\n last_used_at: PrimitiveDateTime,\n },\n PaymentMethodDataUpdate {\n payment_method_data: Option,\n },\n LastUsedUpdate {\n last_used_at: PrimitiveDateTime,\n },\n NetworkTransactionIdAndStatusUpdate {\n network_transaction_id: Option,\n status: Option,\n },\n StatusUpdate {\n status: Option,\n },\n AdditionalDataUpdate {\n payment_method_data: Option,\n status: Option,\n locker_id: Option,\n payment_method_type_v2: Option,\n payment_method_subtype: Option,\n network_token_requestor_reference_id: Option,\n network_token_locker_id: Option,\n network_token_payment_method_data: Option,\n locker_fingerprint_id: Option,\n },\n ConnectorMandateDetailsUpdate {\n connector_mandate_details: Option,\n },\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use time::PrimitiveDateTime;", + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [ + "use time::PrimitiveDateTime;" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::mod::retry", + "file": "crates/router/src/core/payouts.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod retry;", + "after_code": "pub mod retry;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentsMandateReference::function::deref_mut", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }", + "after_code": "fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::is_payout_initiated", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn is_payout_initiated(status: api_enums::PayoutStatus) -> bool {\n !matches!(\n status,\n api_enums::PayoutStatus::RequiresCreation\n | api_enums::PayoutStatus::RequiresConfirmation\n | api_enums::PayoutStatus::RequiresPayoutMethodData\n | api_enums::PayoutStatus::RequiresVendorAccountCreation\n | api_enums::PayoutStatus::Initiated\n )\n}", + "after_code": "pub fn is_payout_initiated(status: api_enums::PayoutStatus) -> bool {\n !matches!(\n status,\n api_enums::PayoutStatus::RequiresCreation\n | api_enums::PayoutStatus::RequiresConfirmation\n | api_enums::PayoutStatus::RequiresPayoutMethodData\n | api_enums::PayoutStatus::RequiresVendorAccountCreation\n | api_enums::PayoutStatus::Initiated\n )\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethod::function::from", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }", + "after_code": "fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts.rs::function::call_connector_payout", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn call_connector_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n let payout_attempt = &payout_data.payout_attempt.to_owned();\n let payouts = &payout_data.payouts.to_owned();\n\n // fetch merchant connector account if not present\n if payout_data.merchant_connector_account.is_none()\n || payout_data.payout_attempt.merchant_connector_id.is_none()\n {\n let merchant_connector_account = get_mca_from_profile_id(\n state,\n merchant_account,\n &payout_data.profile_id,\n &connector_data.connector_name.to_string(),\n payout_attempt\n .merchant_connector_id\n .clone()\n .or(connector_data.merchant_connector_id.clone())\n .as_ref(),\n key_store,\n )\n .await?;\n payout_data.payout_attempt.merchant_connector_id = merchant_connector_account.get_mca_id();\n payout_data.merchant_connector_account = Some(merchant_connector_account);\n }\n\n // update connector_name\n if payout_data.payout_attempt.connector.is_none()\n || payout_data.payout_attempt.connector != Some(connector_data.connector_name.to_string())\n {\n payout_data.payout_attempt.connector = Some(connector_data.connector_name.to_string());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::UpdateRouting {\n connector: connector_data.connector_name.to_string(),\n routing_info: payout_data.payout_attempt.routing_info.clone(),\n merchant_connector_id: payout_data.payout_attempt.merchant_connector_id.clone(),\n };\n let db = &*state.store;\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating routing info in payout_attempt\")?;\n };\n\n // Fetch / store payout_method_data\n if payout_data.payout_method_data.is_none() || payout_attempt.payout_token.is_none() {\n let customer_id = payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id\")?;\n payout_data.payout_method_data = Some(\n helpers::make_payout_method_data(\n state,\n payout_data.payout_method_data.to_owned().as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payouts.payout_type,\n key_store,\n Some(payout_data),\n merchant_account.storage_scheme,\n )\n .await?\n .get_required_value(\"payout_method_data\")?,\n );\n }\n // Eligibility flow\n complete_payout_eligibility(state, merchant_account, connector_data, payout_data).await?;\n // Create customer flow\n complete_create_recipient(\n state,\n merchant_account,\n key_store,\n connector_data,\n payout_data,\n )\n .await?;\n // Create customer's disbursement account flow\n Box::pin(complete_create_recipient_disburse_account(\n state,\n merchant_account,\n connector_data,\n payout_data,\n key_store,\n ))\n .await?;\n // Payout creation flow\n Box::pin(complete_create_payout(\n state,\n merchant_account,\n connector_data,\n payout_data,\n ))\n .await?;\n\n // Auto fulfillment flow\n let status = payout_data.payout_attempt.status;\n if payouts.auto_fulfill && status == storage_enums::PayoutStatus::RequiresFulfillment {\n Box::pin(fulfill_payout(\n state,\n merchant_account,\n key_store,\n connector_data,\n payout_data,\n ))\n .await\n .attach_printable(\"Payout fulfillment failed for given Payout request\")?;\n }\n\n Ok(())\n}", + "after_code": "pub async fn call_connector_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n let payout_attempt = &payout_data.payout_attempt.to_owned();\n let payouts = &payout_data.payouts.to_owned();\n\n // fetch merchant connector account if not present\n if payout_data.merchant_connector_account.is_none()\n || payout_data.payout_attempt.merchant_connector_id.is_none()\n {\n let merchant_connector_account = get_mca_from_profile_id(\n state,\n merchant_account,\n &payout_data.profile_id,\n &connector_data.connector_name.to_string(),\n payout_attempt\n .merchant_connector_id\n .clone()\n .or(connector_data.merchant_connector_id.clone())\n .as_ref(),\n key_store,\n )\n .await?;\n payout_data.payout_attempt.merchant_connector_id = merchant_connector_account.get_mca_id();\n payout_data.merchant_connector_account = Some(merchant_connector_account);\n }\n\n // update connector_name\n if payout_data.payout_attempt.connector.is_none()\n || payout_data.payout_attempt.connector != Some(connector_data.connector_name.to_string())\n {\n payout_data.payout_attempt.connector = Some(connector_data.connector_name.to_string());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::UpdateRouting {\n connector: connector_data.connector_name.to_string(),\n routing_info: payout_data.payout_attempt.routing_info.clone(),\n merchant_connector_id: payout_data.payout_attempt.merchant_connector_id.clone(),\n };\n let db = &*state.store;\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating routing info in payout_attempt\")?;\n };\n\n // Fetch / store payout_method_data\n if payout_data.payout_method_data.is_none() || payout_attempt.payout_token.is_none() {\n let customer_id = payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id\")?;\n payout_data.payout_method_data = Some(\n helpers::make_payout_method_data(\n state,\n payout_data.payout_method_data.to_owned().as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payouts.payout_type,\n key_store,\n Some(payout_data),\n merchant_account.storage_scheme,\n )\n .await?\n .get_required_value(\"payout_method_data\")?,\n );\n }\n // Eligibility flow\n complete_payout_eligibility(state, merchant_account, connector_data, payout_data).await?;\n // Create customer flow\n complete_create_recipient(\n state,\n merchant_account,\n key_store,\n connector_data,\n payout_data,\n )\n .await?;\n // Create customer's disbursement account flow\n Box::pin(complete_create_recipient_disburse_account(\n state,\n merchant_account,\n connector_data,\n payout_data,\n key_store,\n ))\n .await?;\n // Payout creation flow\n Box::pin(complete_create_payout(\n state,\n merchant_account,\n connector_data,\n payout_data,\n ))\n .await?;\n\n // Auto fulfillment flow\n let status = payout_data.payout_attempt.status;\n if payouts.auto_fulfill && status == storage_enums::PayoutStatus::RequiresFulfillment {\n Box::pin(fulfill_payout(\n state,\n merchant_account,\n key_store,\n connector_data,\n payout_data,\n ))\n .await\n .attach_printable(\"Payout fulfillment failed for given Payout request\")?;\n }\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::get_gsm_record", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn get_gsm_record(\n state: &SessionState,\n error_code: Option,\n error_message: Option,\n connector_name: Option,\n flow: &str,\n) -> Option {\n let connector_name = connector_name.unwrap_or_default();\n let get_gsm = || async {\n state.store.find_gsm_rule(\n connector_name.clone(),\n flow.to_string(),\n \"sub_flow\".to_string(),\n error_code.clone().unwrap_or_default(), // TODO: make changes in connector to get a mandatory code in case of success or error response\n error_message.clone().unwrap_or_default(),\n )\n .await\n .map_err(|err| {\n if err.current_context().is_db_not_found() {\n logger::warn!(\n \"GSM miss for connector - {}, flow - {}, error_code - {:?}, error_message - {:?}\",\n connector_name,\n flow,\n error_code,\n error_message\n );\n metrics::AUTO_PAYOUT_RETRY_GSM_MISS_COUNT.add( 1, &[]);\n } else {\n metrics::AUTO_PAYOUT_RETRY_GSM_FETCH_FAILURE_COUNT.add( 1, &[]);\n };\n err.change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed to fetch decision from gsm\")\n })\n };\n get_gsm()\n .await\n .inspect_err(|err| {\n // warn log should suffice here because we are not propagating this error\n logger::warn!(get_gsm_decision_fetch_error=?err, \"error fetching gsm decision\");\n })\n .ok()\n}", + "after_code": "pub async fn get_gsm_record(\n state: &SessionState,\n error_code: Option,\n error_message: Option,\n connector_name: Option,\n flow: &str,\n) -> Option {\n let connector_name = connector_name.unwrap_or_default();\n let get_gsm = || async {\n state.store.find_gsm_rule(\n connector_name.clone(),\n flow.to_string(),\n \"sub_flow\".to_string(),\n error_code.clone().unwrap_or_default(), // TODO: make changes in connector to get a mandatory code in case of success or error response\n error_message.clone().unwrap_or_default(),\n )\n .await\n .map_err(|err| {\n if err.current_context().is_db_not_found() {\n logger::warn!(\n \"GSM miss for connector - {}, flow - {}, error_code - {:?}, error_message - {:?}\",\n connector_name,\n flow,\n error_code,\n error_message\n );\n metrics::AUTO_PAYOUT_RETRY_GSM_MISS_COUNT.add( 1, &[]);\n } else {\n metrics::AUTO_PAYOUT_RETRY_GSM_FETCH_FAILURE_COUNT.add( 1, &[]);\n };\n err.change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed to fetch decision from gsm\")\n })\n };\n get_gsm()\n .await\n .inspect_err(|err| {\n // warn log should suffice here because we are not propagating this error\n logger::warn!(get_gsm_decision_fetch_error=?err, \"error fetching gsm decision\");\n })\n .ok()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use router_env::logger;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use router_env::logger;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_list_available_filters_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_list_available_filters_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id_list: Option>,\n time_range: common_utils::types::TimeRange,\n) -> RouterResponse {\n let db = state.store.as_ref();\n let payouts = db\n .filter_payouts_by_time_range_constraints(\n merchant_account.get_id(),\n &time_range,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payouts = core_utils::filter_objects_based_on_profile_id_list(profile_id_list, payouts);\n\n let filters = db\n .get_filters_for_payouts(\n payouts.as_slice(),\n merchant_account.get_id(),\n storage_enums::MerchantStorageScheme::PostgresOnly,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n Ok(services::ApplicationResponse::Json(\n api::PayoutListFilters {\n connector: filters.connector,\n currency: filters.currency,\n status: filters.status,\n payout_method: filters.payout_method,\n },\n ))\n}", + "after_code": "pub async fn payouts_list_available_filters_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id_list: Option>,\n time_range: common_utils::types::TimeRange,\n) -> RouterResponse {\n let db = state.store.as_ref();\n let payouts = db\n .filter_payouts_by_time_range_constraints(\n merchant_account.get_id(),\n &time_range,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n let payouts = core_utils::filter_objects_based_on_profile_id_list(profile_id_list, payouts);\n\n let filters = db\n .get_filters_for_payouts(\n payouts.as_slice(),\n merchant_account.get_id(),\n storage_enums::MerchantStorageScheme::PostgresOnly,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PaymentNotFound)?;\n\n Ok(services::ApplicationResponse::Json(\n api::PayoutListFilters {\n connector: filters.connector,\n currency: filters.currency,\n status: filters.status,\n payout_method: filters.payout_method,\n },\n ))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_recipient_disburse_account", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn create_recipient_disburse_account(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoRecipientAccount,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n\n if let (\n true,\n Some(ref payout_method_data),\n Some(connector_payout_id),\n Some(customer_details),\n Some(merchant_connector_id),\n ) = (\n payout_data.payouts.recurring,\n payout_data.payout_method_data.clone(),\n payout_response_data.connector_payout_id.clone(),\n payout_data.customer_details.clone(),\n connector_data.merchant_connector_id.clone(),\n ) {\n let connector_mandate_details = HashMap::from([(\n merchant_connector_id.clone(),\n PayoutsMandateReferenceRecord {\n transfer_method_id: Some(connector_payout_id),\n },\n )]);\n\n let common_connector_mandate = CommonMandateReference {\n payments: None, // doubt here, i think i need to fetch it here.\n payouts: Some(PayoutsMandateReference(connector_mandate_details)),\n };\n\n let connector_mandate_details_value =\n serde_json::to_value(common_connector_mandate.clone()).ok();\n\n if let Some(pm_method) = payout_data.payment_method.clone() {\n let pm_update =\n diesel_models::PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n connector_mandate_details: connector_mandate_details_value,\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n connector_mandate_details: Some(common_connector_mandate),\n };\n\n payout_data.payment_method = Some(\n db.update_payment_method(\n &(state.into()),\n key_store,\n pm_method,\n pm_update,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?,\n );\n } else {\n #[cfg(all(any(feature = \"v1\", feature = \"v2\"), not(feature = \"customer_v2\")))]\n let customer_id = Some(customer_details.customer_id);\n\n #[cfg(all(feature = \"v2\", feature = \"customer_v2\"))]\n let customer_id = customer_details.merchant_reference_id;\n\n if let Some(customer_id) = customer_id {\n helpers::save_payout_data_to_locker(\n state,\n payout_data,\n &customer_id,\n payout_method_data,\n connector_mandate_details_value,\n merchant_account,\n key_store,\n )\n .await\n .attach_printable(\"Failed to save payout data to locker\")?;\n }\n };\n }\n }\n Err(err) => {\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status: storage_enums::PayoutStatus::Failed,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n }\n };\n\n Ok(())\n}", + "after_code": "pub async fn create_recipient_disburse_account(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoRecipientAccount,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n\n if let (\n true,\n Some(ref payout_method_data),\n Some(connector_payout_id),\n Some(customer_details),\n Some(merchant_connector_id),\n ) = (\n payout_data.payouts.recurring,\n payout_data.payout_method_data.clone(),\n payout_response_data.connector_payout_id.clone(),\n payout_data.customer_details.clone(),\n connector_data.merchant_connector_id.clone(),\n ) {\n let connector_mandate_details = HashMap::from([(\n merchant_connector_id.clone(),\n PayoutsMandateReferenceRecord {\n transfer_method_id: Some(connector_payout_id),\n },\n )]);\n\n let common_connector_mandate = CommonMandateReference {\n payments: None, // doubt here, i think i need to fetch it here.\n payouts: Some(PayoutsMandateReference(connector_mandate_details)),\n };\n\n let connector_mandate_details_value =\n serde_json::to_value(common_connector_mandate.clone()).ok();\n\n if let Some(pm_method) = payout_data.payment_method.clone() {\n let pm_update =\n diesel_models::PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n connector_mandate_details: connector_mandate_details_value,\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n connector_mandate_details: Some(common_connector_mandate),\n };\n\n payout_data.payment_method = Some(\n db.update_payment_method(\n &(state.into()),\n key_store,\n pm_method,\n pm_update,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?,\n );\n } else {\n #[cfg(all(any(feature = \"v1\", feature = \"v2\"), not(feature = \"customer_v2\")))]\n let customer_id = Some(customer_details.customer_id);\n\n #[cfg(all(feature = \"v2\", feature = \"customer_v2\"))]\n let customer_id = customer_details.merchant_reference_id;\n\n if let Some(customer_id) = customer_id {\n helpers::save_payout_data_to_locker(\n state,\n payout_data,\n &customer_id,\n payout_method_data,\n connector_mandate_details_value,\n merchant_account,\n key_store,\n )\n .await\n .attach_printable(\"Failed to save payout data to locker\")?;\n }\n };\n }\n }\n Err(err) => {\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status: storage_enums::PayoutStatus::Failed,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n }\n };\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethod::function::get_common_mandate_reference", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_common_mandate_reference(\n connector_mandate_details: Option,\n ) -> Result {\n if let Some(value) = connector_mandate_details {\n match serde_json::from_value::(value.clone()) {\n Ok(common_mandate_reference) => Ok(common_mandate_reference),\n Err(_) => match serde_json::from_value::(value.clone()) {\n Ok(payment_mandate_reference) => Ok(CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: None,\n }),\n Err(_) => Err(ParsingError::StructParseFailure(\n \"Faild to deserialize PaymentMethod\",\n ))?,\n },\n }\n } else {\n Err(ParsingError::StructParseFailure(\n \"Faild to deserialize PaymentMethod\",\n ))?\n }\n }", + "after_code": "pub fn get_common_mandate_reference(\n connector_mandate_details: Option,\n ) -> Result {\n if let Some(value) = connector_mandate_details {\n match serde_json::from_value::(value.clone()) {\n Ok(common_mandate_reference) => Ok(common_mandate_reference),\n Err(_) => match serde_json::from_value::(value.clone()) {\n Ok(payment_mandate_reference) => Ok(CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: None,\n }),\n Err(_) => Err(ParsingError::StructParseFailure(\n \"Faild to deserialize PaymentMethod\",\n ))?,\n },\n }\n } else {\n Err(ParsingError::StructParseFailure(\n \"Faild to deserialize PaymentMethod\",\n ))?\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts.rs::function::add_external_account_addition_task", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn add_external_account_addition_task(\n db: &dyn StorageInterface,\n payout_data: &PayoutData,\n schedule_time: time::PrimitiveDateTime,\n) -> CustomResult<(), errors::StorageError> {\n let runner = storage::ProcessTrackerRunner::AttachPayoutAccountWorkflow;\n let task = \"STRPE_ATTACH_EXTERNAL_ACCOUNT\";\n let tag = [\"PAYOUTS\", \"STRIPE\", \"ACCOUNT\", \"CREATE\"];\n let process_tracker_id = pt_utils::get_process_tracker_id(\n runner,\n task,\n &payout_data.payout_attempt.payout_attempt_id,\n &payout_data.payout_attempt.merchant_id,\n );\n let tracking_data = api::PayoutRetrieveRequest {\n payout_id: payout_data.payouts.payout_id.to_owned(),\n force_sync: None,\n merchant_id: Some(payout_data.payouts.merchant_id.to_owned()),\n };\n let process_tracker_entry = storage::ProcessTrackerNew::new(\n process_tracker_id,\n task,\n runner,\n tag,\n tracking_data,\n schedule_time,\n )\n .map_err(errors::StorageError::from)?;\n\n db.insert_process(process_tracker_entry).await?;\n Ok(())\n}", + "after_code": "pub async fn add_external_account_addition_task(\n db: &dyn StorageInterface,\n payout_data: &PayoutData,\n schedule_time: time::PrimitiveDateTime,\n) -> CustomResult<(), errors::StorageError> {\n let runner = storage::ProcessTrackerRunner::AttachPayoutAccountWorkflow;\n let task = \"STRPE_ATTACH_EXTERNAL_ACCOUNT\";\n let tag = [\"PAYOUTS\", \"STRIPE\", \"ACCOUNT\", \"CREATE\"];\n let process_tracker_id = pt_utils::get_process_tracker_id(\n runner,\n task,\n &payout_data.payout_attempt.payout_attempt_id,\n &payout_data.payout_attempt.merchant_id,\n );\n let tracking_data = api::PayoutRetrieveRequest {\n payout_id: payout_data.payouts.payout_id.to_owned(),\n force_sync: None,\n merchant_id: Some(payout_data.payouts.merchant_id.to_owned()),\n };\n let process_tracker_entry = storage::ProcessTrackerNew::new(\n process_tracker_id,\n task,\n runner,\n tag,\n tracking_data,\n schedule_time,\n )\n .map_err(errors::StorageError::from)?;\n\n db.insert_process(process_tracker_entry).await?;\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::mod::access_token", + "file": "crates/router/src/core/payouts.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod access_token;", + "after_code": "pub mod access_token;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PayoutsMandateReference::function::deref", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn deref(&self) -> &Self::Target {\n &self.0\n }", + "after_code": "fn deref(&self) -> &Self::Target {\n &self.0\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::is_payout_err_state", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn is_payout_err_state(status: api_enums::PayoutStatus) -> bool {\n matches!(\n status,\n api_enums::PayoutStatus::Cancelled\n | api_enums::PayoutStatus::Failed\n | api_enums::PayoutStatus::Ineligible\n )\n}", + "after_code": "pub fn is_payout_err_state(status: api_enums::PayoutStatus) -> bool {\n matches!(\n status,\n api_enums::PayoutStatus::Cancelled\n | api_enums::PayoutStatus::Failed\n | api_enums::PayoutStatus::Ineligible\n )\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::make_payout_method_data", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn make_payout_method_data(\n state: &SessionState,\n payout_method_data: Option<&api::PayoutMethodData>,\n payout_token: Option<&str>,\n customer_id: &id_type::CustomerId,\n merchant_id: &id_type::MerchantId,\n payout_type: Option,\n merchant_key_store: &domain::MerchantKeyStore,\n payout_data: Option<&mut PayoutData>,\n storage_scheme: storage::enums::MerchantStorageScheme,\n) -> RouterResult> {\n let db = &*state.store;\n let hyperswitch_token = if let Some(payout_token) = payout_token {\n if payout_token.starts_with(\"temporary_token_\") {\n Some(payout_token.to_string())\n } else {\n let certain_payout_type = payout_type.get_required_value(\"payout_type\")?.to_owned();\n let key = format!(\n \"pm_token_{}_{}_hyperswitch\",\n payout_token,\n api_enums::PaymentMethod::foreign_from(certain_payout_type)\n );\n\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let hyperswitch_token = redis_conn\n .get_key::>(&key)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to fetch the token from redis\")?\n .ok_or(error_stack::Report::new(\n errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Token is invalid or expired\".to_owned(),\n },\n ))?;\n let payment_token_data = hyperswitch_token\n .clone()\n .parse_struct(\"PaymentTokenData\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed to deserialize hyperswitch token data\")?;\n\n let payment_token = match payment_token_data {\n storage::PaymentTokenData::PermanentCard(storage::CardTokenData {\n locker_id,\n token,\n ..\n }) => locker_id.or(Some(token)),\n storage::PaymentTokenData::TemporaryGeneric(storage::GenericTokenData {\n token,\n }) => Some(token),\n _ => None,\n };\n payment_token.or(Some(payout_token.to_string()))\n }\n } else {\n None\n };\n\n match (\n payout_method_data.to_owned(),\n hyperswitch_token,\n payout_data,\n ) {\n // Get operation\n (None, Some(payout_token), _) => {\n if payout_token.starts_with(\"temporary_token_\")\n || payout_type == Some(api_enums::PayoutType::Bank)\n {\n let (pm, supplementary_data) = vault::Vault::get_payout_method_data_from_temporary_locker(\n state,\n &payout_token,\n merchant_key_store,\n )\n .await\n .attach_printable(\n \"Payout method for given token not found or there was a problem fetching it\",\n )?;\n utils::when(\n supplementary_data\n .customer_id\n .ne(&Some(customer_id.to_owned())),\n || {\n Err(errors::ApiErrorResponse::PreconditionFailed { message: \"customer associated with payout method and customer passed in payout are not same\".into() })\n },\n )?;\n Ok(pm)\n } else {\n let resp = cards::get_card_from_locker(\n state,\n customer_id,\n merchant_id,\n payout_token.as_ref(),\n )\n .await\n .attach_printable(\"Payout method [card] could not be fetched from HS locker\")?;\n Ok(Some({\n api::PayoutMethodData::Card(api::CardPayout {\n card_number: resp.card_number,\n expiry_month: resp.card_exp_month,\n expiry_year: resp.card_exp_year,\n card_holder_name: resp.name_on_card,\n })\n }))\n }\n }\n\n // Create / Update operation\n (Some(payout_method), payout_token, Some(payout_data)) => {\n let lookup_key = vault::Vault::store_payout_method_data_in_locker(\n state,\n payout_token.to_owned(),\n payout_method,\n Some(customer_id.to_owned()),\n merchant_key_store,\n )\n .await?;\n\n // Update payout_token in payout_attempt table\n if payout_token.is_none() {\n let updated_payout_attempt = storage::PayoutAttemptUpdate::PayoutTokenUpdate {\n payout_token: lookup_key,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating token in payout attempt\")?;\n }\n Ok(Some(payout_method.clone()))\n }\n\n // Ignore if nothing is passed\n _ => Ok(None),\n }\n}", + "after_code": "pub async fn make_payout_method_data(\n state: &SessionState,\n payout_method_data: Option<&api::PayoutMethodData>,\n payout_token: Option<&str>,\n customer_id: &id_type::CustomerId,\n merchant_id: &id_type::MerchantId,\n payout_type: Option,\n merchant_key_store: &domain::MerchantKeyStore,\n payout_data: Option<&mut PayoutData>,\n storage_scheme: storage::enums::MerchantStorageScheme,\n) -> RouterResult> {\n let db = &*state.store;\n let hyperswitch_token = if let Some(payout_token) = payout_token {\n if payout_token.starts_with(\"temporary_token_\") {\n Some(payout_token.to_string())\n } else {\n let certain_payout_type = payout_type.get_required_value(\"payout_type\")?.to_owned();\n let key = format!(\n \"pm_token_{}_{}_hyperswitch\",\n payout_token,\n api_enums::PaymentMethod::foreign_from(certain_payout_type)\n );\n\n let redis_conn = state\n .store\n .get_redis_conn()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get redis connection\")?;\n\n let hyperswitch_token = redis_conn\n .get_key::>(&key)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to fetch the token from redis\")?\n .ok_or(error_stack::Report::new(\n errors::ApiErrorResponse::UnprocessableEntity {\n message: \"Token is invalid or expired\".to_owned(),\n },\n ))?;\n let payment_token_data = hyperswitch_token\n .clone()\n .parse_struct(\"PaymentTokenData\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed to deserialize hyperswitch token data\")?;\n\n let payment_token = match payment_token_data {\n storage::PaymentTokenData::PermanentCard(storage::CardTokenData {\n locker_id,\n token,\n ..\n }) => locker_id.or(Some(token)),\n storage::PaymentTokenData::TemporaryGeneric(storage::GenericTokenData {\n token,\n }) => Some(token),\n _ => None,\n };\n payment_token.or(Some(payout_token.to_string()))\n }\n } else {\n None\n };\n\n match (\n payout_method_data.to_owned(),\n hyperswitch_token,\n payout_data,\n ) {\n // Get operation\n (None, Some(payout_token), _) => {\n if payout_token.starts_with(\"temporary_token_\")\n || payout_type == Some(api_enums::PayoutType::Bank)\n {\n let (pm, supplementary_data) = vault::Vault::get_payout_method_data_from_temporary_locker(\n state,\n &payout_token,\n merchant_key_store,\n )\n .await\n .attach_printable(\n \"Payout method for given token not found or there was a problem fetching it\",\n )?;\n utils::when(\n supplementary_data\n .customer_id\n .ne(&Some(customer_id.to_owned())),\n || {\n Err(errors::ApiErrorResponse::PreconditionFailed { message: \"customer associated with payout method and customer passed in payout are not same\".into() })\n },\n )?;\n Ok(pm)\n } else {\n let resp = cards::get_card_from_locker(\n state,\n customer_id,\n merchant_id,\n payout_token.as_ref(),\n )\n .await\n .attach_printable(\"Payout method [card] could not be fetched from HS locker\")?;\n Ok(Some({\n api::PayoutMethodData::Card(api::CardPayout {\n card_number: resp.card_number,\n expiry_month: resp.card_exp_month,\n expiry_year: resp.card_exp_year,\n card_holder_name: resp.name_on_card,\n })\n }))\n }\n }\n\n // Create / Update operation\n (Some(payout_method), payout_token, Some(payout_data)) => {\n let lookup_key = vault::Vault::store_payout_method_data_in_locker(\n state,\n payout_token.to_owned(),\n payout_method,\n Some(customer_id.to_owned()),\n merchant_key_store,\n )\n .await?;\n\n // Update payout_token in payout_attempt table\n if payout_token.is_none() {\n let updated_payout_attempt = storage::PayoutAttemptUpdate::PayoutTokenUpdate {\n payout_token: lookup_key,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating token in payout attempt\")?;\n }\n Ok(Some(payout_method.clone()))\n }\n\n // Ignore if nothing is passed\n _ => Ok(None),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use super::PayoutData;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use super::PayoutData;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::cancel_payout", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn cancel_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoCancel,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let status = payout_response_data\n .status\n .unwrap_or(payout_data.payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "after_code": "pub async fn cancel_payout(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoCancel,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let status = payout_response_data\n .status\n .unwrap_or(payout_data.payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/api_models/src/payment_methods.rs::struct::PaymentMethodMigrate", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct PaymentMethodMigrate {\n /// Merchant id\n pub merchant_id: id_type::MerchantId,\n\n /// The type of payment method use for the payment.\n pub payment_method: Option,\n\n /// This is a sub-category of payment method.\n pub payment_method_type: Option,\n\n /// The name of the bank/ provider issuing the payment method to the end user\n pub payment_method_issuer: Option,\n\n /// A standard code representing the issuer of payment method\n pub payment_method_issuer_code: Option,\n\n /// Card Details\n pub card: Option,\n\n /// Network token details\n pub network_token: Option,\n\n /// You can specify up to 50 keys, with key names up to 40 characters long and values up to 500 characters long. Metadata is useful for storing additional, structured information on an object.\n pub metadata: Option,\n\n /// The unique identifier of the customer.\n pub customer_id: Option,\n\n /// The card network\n pub card_network: Option,\n\n /// Payment method details from locker\n #[cfg(feature = \"payouts\")]\n pub bank_transfer: Option,\n\n /// Payment method details from locker\n #[cfg(feature = \"payouts\")]\n pub wallet: Option,\n\n /// Payment method data to be passed in case of client\n /// based flow\n pub payment_method_data: Option,\n\n /// The billing details of the payment method\n pub billing: Option,\n\n /// The connector mandate details of the payment method\n pub connector_mandate_details: Option,\n\n // The CIT (customer initiated transaction) transaction id associated with the payment method\n pub network_transaction_id: Option,\n}", + "after_code": "pub struct PaymentMethodMigrate {\n /// Merchant id\n pub merchant_id: id_type::MerchantId,\n\n /// The type of payment method use for the payment.\n pub payment_method: Option,\n\n /// This is a sub-category of payment method.\n pub payment_method_type: Option,\n\n /// The name of the bank/ provider issuing the payment method to the end user\n pub payment_method_issuer: Option,\n\n /// A standard code representing the issuer of payment method\n pub payment_method_issuer_code: Option,\n\n /// Card Details\n pub card: Option,\n\n /// Network token details\n pub network_token: Option,\n\n /// You can specify up to 50 keys, with key names up to 40 characters long and values up to 500 characters long. Metadata is useful for storing additional, structured information on an object.\n pub metadata: Option,\n\n /// The unique identifier of the customer.\n pub customer_id: Option,\n\n /// The card network\n pub card_network: Option,\n\n /// Payment method details from locker\n #[cfg(feature = \"payouts\")]\n pub bank_transfer: Option,\n\n /// Payment method details from locker\n #[cfg(feature = \"payouts\")]\n pub wallet: Option,\n\n /// Payment method data to be passed in case of client\n /// based flow\n pub payment_method_data: Option,\n\n /// The billing details of the payment method\n pub billing: Option,\n\n /// The connector mandate details of the payment method\n pub connector_mandate_details: Option,\n\n // The CIT (customer initiated transaction) transaction id associated with the payment method\n pub network_transaction_id: Option,\n}", + "diff_span": { + "before": "\n /// The connector mandate details of the payment method\n pub connector_mandate_details: Option,\n\n // The CIT (customer initiated transaction) transaction id associated with the payment method", + "after": "\n /// The connector mandate details of the payment method\n pub connector_mandate_details: Option,\n\n // The CIT (customer initiated transaction) transaction id associated with the payment method" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::should_create_connector_transfer_method", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub fn should_create_connector_transfer_method(\n payout_data: &PayoutData,\n connector_data: &api::ConnectorData,\n) -> RouterResult> {\n let connector_transfer_method_id = if let Some(pm) = &payout_data.payment_method {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n let common_mandate_reference = storage::PaymentMethod::get_common_mandate_reference(\n pm.connector_mandate_details.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")?;\n\n \n\n if let Some(merchant_connector_id) = connector_data.merchant_connector_id.as_ref() {\n common_mandate_reference\n .payouts\n .and_then(|payouts_mandate_reference| {\n payouts_mandate_reference.get(merchant_connector_id).map(\n |payouts_mandate_reference_record| {\n payouts_mandate_reference_record.transfer_method_id.clone()\n },\n )\n })\n .flatten()\n } else {\n None\n }\n } else {\n None\n };\n Ok(connector_transfer_method_id)\n}", + "after_code": "pub fn should_create_connector_transfer_method(\n payout_data: &PayoutData,\n connector_data: &api::ConnectorData,\n) -> RouterResult> {\n let connector_transfer_method_id = if let Some(pm) = &payout_data.payment_method {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n let common_mandate_reference = storage::PaymentMethod::get_common_mandate_reference(\n pm.connector_mandate_details.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")?;\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n let common_mandate_reference = pm.connector_mandate_details.clone().unwrap_or_default();\n\n if let Some(merchant_connector_id) = connector_data.merchant_connector_id.as_ref() {\n common_mandate_reference\n .payouts\n .and_then(|payouts_mandate_reference| {\n payouts_mandate_reference.get(merchant_connector_id).map(\n |payouts_mandate_reference_record| {\n payouts_mandate_reference_record.transfer_method_id.clone()\n },\n )\n })\n .flatten()\n } else {\n None\n }\n } else {\n None\n };\n Ok(connector_transfer_method_id)\n}", + "diff_span": { + "before": " .attach_printable(\"unable to deserialize connector mandate details\")?;\n\n \n\n if let Some(merchant_connector_id) = connector_data.merchant_connector_id.as_ref() {", + "after": " .attach_printable(\"unable to deserialize connector mandate details\")?;\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n let common_mandate_reference = pm.connector_mandate_details.clone().unwrap_or_default();\n\n if let Some(merchant_connector_id) = connector_data.merchant_connector_id.as_ref() {" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use super::PayoutData;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use super::PayoutData;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::CommonMandateReference", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl From for CommonMandateReference {\n fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self{\n payments: Some(payment_reference),\n payouts: None,\n }\n }\n}", + "after_code": "impl From for CommonMandateReference {\n fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self {\n payments: Some(payment_reference),\n payouts: None,\n }\n }\n}", + "diff_span": { + "before": "impl From for CommonMandateReference {\n fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self{\n payments: Some(payment_reference),\n payouts: None,", + "after": "impl From for CommonMandateReference {\n fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self {\n payments: Some(payment_reference),\n payouts: None," + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_confirm_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_confirm_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutCreateRequest(Box::new(req.to_owned())),\n &state.locale,\n )\n .await?;\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n helpers::validate_payout_status_against_not_allowed_statuses(\n status,\n &[\n storage_enums::PayoutStatus::Cancelled,\n storage_enums::PayoutStatus::Success,\n storage_enums::PayoutStatus::Failed,\n storage_enums::PayoutStatus::Pending,\n storage_enums::PayoutStatus::Ineligible,\n storage_enums::PayoutStatus::RequiresFulfillment,\n storage_enums::PayoutStatus::RequiresVendorAccountCreation,\n ],\n \"confirm\",\n )?;\n\n helpers::update_payouts_and_payout_attempt(\n &mut payout_data,\n &merchant_account,\n &req,\n &state,\n &key_store,\n )\n .await?;\n\n let db = &*state.store;\n\n payout_data.payout_link = payout_data\n .payout_link\n .clone()\n .async_map(|pl| async move {\n let payout_link_update = storage::PayoutLinkUpdate::StatusUpdate {\n link_status: PayoutLinkStatus::Submitted,\n };\n db.update_payout_link(pl, payout_link_update)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout links in db\")\n })\n .await\n .transpose()?;\n\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?;\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_confirm_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutCreateRequest(Box::new(req.to_owned())),\n &state.locale,\n )\n .await?;\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n helpers::validate_payout_status_against_not_allowed_statuses(\n status,\n &[\n storage_enums::PayoutStatus::Cancelled,\n storage_enums::PayoutStatus::Success,\n storage_enums::PayoutStatus::Failed,\n storage_enums::PayoutStatus::Pending,\n storage_enums::PayoutStatus::Ineligible,\n storage_enums::PayoutStatus::RequiresFulfillment,\n storage_enums::PayoutStatus::RequiresVendorAccountCreation,\n ],\n \"confirm\",\n )?;\n\n helpers::update_payouts_and_payout_attempt(\n &mut payout_data,\n &merchant_account,\n &req,\n &state,\n &key_store,\n )\n .await?;\n\n let db = &*state.store;\n\n payout_data.payout_link = payout_data\n .payout_link\n .clone()\n .async_map(|pl| async move {\n let payout_link_update = storage::PayoutLinkUpdate::StatusUpdate {\n link_status: PayoutLinkStatus::Submitted,\n };\n db.update_payout_link(pl, payout_link_update)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout links in db\")\n })\n .await\n .transpose()?;\n\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?;\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::validate_and_get_business_profile", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn validate_and_get_business_profile(\n state: &SessionState,\n merchant_key_store: &domain::MerchantKeyStore,\n profile_id: &common_utils::id_type::ProfileId,\n merchant_id: &common_utils::id_type::MerchantId,\n) -> RouterResult {\n let db = &*state.store;\n let key_manager_state = &state.into();\n\n if let Some(business_profile) = core_utils::validate_and_get_business_profile(\n db,\n key_manager_state,\n merchant_key_store,\n Some(profile_id),\n merchant_id,\n )\n .await?\n {\n Ok(business_profile)\n } else {\n db.find_business_profile_by_profile_id(key_manager_state, merchant_key_store, profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })\n }\n}", + "after_code": "async fn validate_and_get_business_profile(\n state: &SessionState,\n merchant_key_store: &domain::MerchantKeyStore,\n profile_id: &common_utils::id_type::ProfileId,\n merchant_id: &common_utils::id_type::MerchantId,\n) -> RouterResult {\n let db = &*state.store;\n let key_manager_state = &state.into();\n\n if let Some(business_profile) = core_utils::validate_and_get_business_profile(\n db,\n key_manager_state,\n merchant_key_store,\n Some(profile_id),\n merchant_id,\n )\n .await?\n {\n Ok(business_profile)\n } else {\n db.find_business_profile_by_profile_id(key_manager_state, merchant_key_store, profile_id)\n .await\n .to_not_found_response(errors::ApiErrorResponse::ProfileNotFound {\n id: profile_id.get_string_repr().to_owned(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/api_models/src/payment_methods.rs::PaymentMethodMigrate::function::try_from", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn try_from(\n item: (\n PaymentMethodRecord,\n id_type::MerchantId,\n Option,\n ),\n ) -> Result {\n let (record, merchant_id, mca_id) = item;\n\n // if payment instrument id is present then only construct this\n let connector_mandate_details = if record.payment_instrument_id.is_some() {\n Some(PaymentsMandateReference(HashMap::from([(\n mca_id.get_required_value(\"merchant_connector_id\")?,\n PaymentsMandateReferenceRecord {\n connector_mandate_id: record\n .payment_instrument_id\n .get_required_value(\"payment_instrument_id\")?\n .peek()\n .to_string(),\n payment_method_type: record.payment_method_type,\n original_payment_authorized_amount: record.original_transaction_amount,\n original_payment_authorized_currency: record.original_transaction_currency,\n },\n )])))\n } else {\n None\n };\n Ok(Self {\n merchant_id,\n customer_id: Some(record.customer_id),\n card: Some(MigrateCardDetail {\n card_number: record.raw_card_number.unwrap_or(record.card_number_masked),\n card_exp_month: record.card_expiry_month,\n card_exp_year: record.card_expiry_year,\n card_holder_name: record.name.clone(),\n card_network: None,\n card_type: None,\n card_issuer: None,\n card_issuing_country: None,\n nick_name: Some(record.nick_name.clone()),\n }),\n network_token: Some(MigrateNetworkTokenDetail {\n network_token_data: MigrateNetworkTokenData {\n network_token_number: record.network_token_number.unwrap_or_default(),\n network_token_exp_month: record.network_token_expiry_month.unwrap_or_default(),\n network_token_exp_year: record.network_token_expiry_year.unwrap_or_default(),\n card_holder_name: record.name,\n nick_name: Some(record.nick_name.clone()),\n card_issuing_country: None,\n card_network: None,\n card_issuer: None,\n card_type: None,\n },\n network_token_requestor_ref_id: record\n .network_token_requestor_ref_id\n .unwrap_or_default(),\n }),\n payment_method: record.payment_method,\n payment_method_type: record.payment_method_type,\n payment_method_issuer: None,\n billing: Some(payments::Address {\n address: Some(payments::AddressDetails {\n city: Some(record.billing_address_city),\n country: record.billing_address_country,\n line1: Some(record.billing_address_line1),\n line2: record.billing_address_line2,\n state: Some(record.billing_address_state),\n line3: record.billing_address_line3,\n zip: Some(record.billing_address_zip),\n first_name: Some(record.billing_address_first_name),\n last_name: Some(record.billing_address_last_name),\n }),\n phone: Some(payments::PhoneDetails {\n number: record.phone,\n country_code: record.phone_country_code,\n }),\n email: record.email,\n }),\n connector_mandate_details,\n metadata: None,\n payment_method_issuer_code: None,\n card_network: None,\n #[cfg(feature = \"payouts\")]\n bank_transfer: None,\n #[cfg(feature = \"payouts\")]\n wallet: None,\n payment_method_data: None,\n network_transaction_id: record.original_transaction_id,\n })\n }", + "after_code": "fn try_from(\n item: (\n PaymentMethodRecord,\n id_type::MerchantId,\n Option,\n ),\n ) -> Result {\n let (record, merchant_id, mca_id) = item;\n\n // if payment instrument id is present then only construct this\n let connector_mandate_details = if record.payment_instrument_id.is_some() {\n Some(PaymentsMandateReference(HashMap::from([(\n mca_id.get_required_value(\"merchant_connector_id\")?,\n PaymentsMandateReferenceRecord {\n connector_mandate_id: record\n .payment_instrument_id\n .get_required_value(\"payment_instrument_id\")?\n .peek()\n .to_string(),\n payment_method_type: record.payment_method_type,\n original_payment_authorized_amount: record.original_transaction_amount,\n original_payment_authorized_currency: record.original_transaction_currency,\n },\n )])))\n } else {\n None\n };\n Ok(Self {\n merchant_id,\n customer_id: Some(record.customer_id),\n card: Some(MigrateCardDetail {\n card_number: record.raw_card_number.unwrap_or(record.card_number_masked),\n card_exp_month: record.card_expiry_month,\n card_exp_year: record.card_expiry_year,\n card_holder_name: record.name.clone(),\n card_network: None,\n card_type: None,\n card_issuer: None,\n card_issuing_country: None,\n nick_name: Some(record.nick_name.clone()),\n }),\n network_token: Some(MigrateNetworkTokenDetail {\n network_token_data: MigrateNetworkTokenData {\n network_token_number: record.network_token_number.unwrap_or_default(),\n network_token_exp_month: record.network_token_expiry_month.unwrap_or_default(),\n network_token_exp_year: record.network_token_expiry_year.unwrap_or_default(),\n card_holder_name: record.name,\n nick_name: Some(record.nick_name.clone()),\n card_issuing_country: None,\n card_network: None,\n card_issuer: None,\n card_type: None,\n },\n network_token_requestor_ref_id: record\n .network_token_requestor_ref_id\n .unwrap_or_default(),\n }),\n payment_method: record.payment_method,\n payment_method_type: record.payment_method_type,\n payment_method_issuer: None,\n billing: Some(payments::Address {\n address: Some(payments::AddressDetails {\n city: Some(record.billing_address_city),\n country: record.billing_address_country,\n line1: Some(record.billing_address_line1),\n line2: record.billing_address_line2,\n state: Some(record.billing_address_state),\n line3: record.billing_address_line3,\n zip: Some(record.billing_address_zip),\n first_name: Some(record.billing_address_first_name),\n last_name: Some(record.billing_address_last_name),\n }),\n phone: Some(payments::PhoneDetails {\n number: record.phone,\n country_code: record.phone_country_code,\n }),\n email: record.email,\n }),\n connector_mandate_details: convert_to_common_reference(connector_mandate_details),\n metadata: None,\n payment_method_issuer_code: None,\n card_network: None,\n #[cfg(feature = \"payouts\")]\n bank_transfer: None,\n #[cfg(feature = \"payouts\")]\n wallet: None,\n payment_method_data: None,\n network_transaction_id: record.original_transaction_id,\n })\n }", + "diff_span": { + "before": " email: record.email,\n }),\n connector_mandate_details,\n metadata: None,\n payment_method_issuer_code: None,", + "after": " email: record.email,\n }),\n connector_mandate_details: convert_to_common_reference(connector_mandate_details),\n metadata: None,\n payment_method_issuer_code: None," + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_cancel_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_cancel_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutActionRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutActionRequest(req.to_owned()),\n &state.locale,\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n // Verify if cancellation can be triggered\n if helpers::is_payout_terminal_state(status) {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be cancelled for status {}\",\n payout_attempt.payout_id, status\n ),\n }));\n\n // Make local cancellation\n } else if helpers::is_eligible_for_local_payout_cancellation(status) {\n let status = storage_enums::PayoutStatus::Cancelled;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.to_owned(),\n status,\n error_message: Some(\"Cancelled by user\".to_string()),\n error_code: None,\n is_eligible: None,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = state\n .store\n .update_payout_attempt(\n &payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = state\n .store\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n\n // Trigger connector's cancellation\n } else {\n // Form connector data\n let connector_data = match &payout_attempt.connector {\n Some(connector) => api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n connector,\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?,\n _ => Err(errors::ApplicationError::InvalidConfigurationValueError(\n \"Connector not found in payout_attempt - should not reach here\".to_string(),\n ))\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"connector\",\n })\n .attach_printable(\"Connector not found for payout cancellation\")?,\n };\n\n cancel_payout(&state, &merchant_account, &connector_data, &mut payout_data)\n .await\n .attach_printable(\"Payout cancellation failed for given Payout request\")?;\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_cancel_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutActionRequest,\n) -> RouterResponse {\n let mut payout_data = make_payout_data(\n &state,\n &merchant_account,\n None,\n &key_store,\n &payouts::PayoutRequest::PayoutActionRequest(req.to_owned()),\n &state.locale,\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n\n // Verify if cancellation can be triggered\n if helpers::is_payout_terminal_state(status) {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be cancelled for status {}\",\n payout_attempt.payout_id, status\n ),\n }));\n\n // Make local cancellation\n } else if helpers::is_eligible_for_local_payout_cancellation(status) {\n let status = storage_enums::PayoutStatus::Cancelled;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_attempt.connector_payout_id.to_owned(),\n status,\n error_message: Some(\"Cancelled by user\".to_string()),\n error_code: None,\n is_eligible: None,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = state\n .store\n .update_payout_attempt(\n &payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = state\n .store\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n\n // Trigger connector's cancellation\n } else {\n // Form connector data\n let connector_data = match &payout_attempt.connector {\n Some(connector) => api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n connector,\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to get the connector data\")?,\n _ => Err(errors::ApplicationError::InvalidConfigurationValueError(\n \"Connector not found in payout_attempt - should not reach here\".to_string(),\n ))\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"connector\",\n })\n .attach_printable(\"Connector not found for payout cancellation\")?,\n };\n\n cancel_payout(&state, &merchant_account, &connector_data, &mut payout_data)\n .await\n .attach_printable(\"Payout cancellation failed for given Payout request\")?;\n }\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::CommonMandateReference::function::to_sql", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn to_sql<'b>(\n &'b self,\n out: &mut diesel::serialize::Output<'b, '_, diesel::pg::Pg>,\n ) -> diesel::serialize::Result {\n let value = serde_json::to_value(self)?;\n >::to_sql(&value, &mut out.reborrow())\n }", + "after_code": "fn to_sql<'b>(\n &'b self,\n out: &mut diesel::serialize::Output<'b, '_, diesel::pg::Pg>,\n ) -> diesel::serialize::Result {\n let value = serde_json::to_value(self)?;\n >::to_sql(&value, &mut out.reborrow())\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::update_payouts_and_payout_attempt", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn update_payouts_and_payout_attempt(\n payout_data: &mut PayoutData,\n merchant_account: &domain::MerchantAccount,\n req: &payouts::PayoutCreateRequest,\n state: &SessionState,\n merchant_key_store: &domain::MerchantKeyStore,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n let payout_id = payout_attempt.payout_id.clone();\n // Verify update feasibility\n if is_payout_terminal_state(status) || is_payout_initiated(status) {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be updated for status {}\",\n payout_id, status\n ),\n }));\n }\n\n // Fetch customer details from request and create new or else use existing customer that was attached\n let customer = get_customer_details_from_request(req);\n let customer_id = if customer.customer_id.is_some()\n || customer.name.is_some()\n || customer.email.is_some()\n || customer.phone.is_some()\n || customer.phone_country_code.is_some()\n {\n payout_data.customer_details =\n get_or_create_customer_details(state, &customer, merchant_account, merchant_key_store)\n .await?;\n payout_data\n .customer_details\n .as_ref()\n .map(|customer| customer.customer_id.clone())\n } else {\n payout_data.payouts.customer_id.clone()\n };\n\n // We have to do this because the function that is being used to create / get address is from payments\n // which expects a payment_id\n let payout_id_as_payment_id_type =\n id_type::PaymentId::try_from(std::borrow::Cow::Owned(payout_id.clone()))\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n // Fetch address details from request and create new or else use existing address that was attached\n let billing_address = payment_helpers::create_or_find_address_for_payment_by_request(\n state,\n req.billing.as_ref(),\n None,\n merchant_account.get_id(),\n customer_id.as_ref(),\n merchant_key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await?;\n let address_id = if billing_address.is_some() {\n payout_data.billing_address = billing_address;\n payout_data\n .billing_address\n .as_ref()\n .map(|address| address.address_id.clone())\n } else {\n payout_data.payouts.address_id.clone()\n };\n\n // Update DB with new data\n let payouts = payout_data.payouts.to_owned();\n let amount = MinorUnit::from(req.amount.unwrap_or(payouts.amount.into()));\n let updated_payouts = storage::PayoutsUpdate::Update {\n amount,\n destination_currency: req\n .currency\n .to_owned()\n .unwrap_or(payouts.destination_currency),\n source_currency: req.currency.to_owned().unwrap_or(payouts.source_currency),\n description: req\n .description\n .to_owned()\n .clone()\n .or(payouts.description.clone()),\n recurring: req.recurring.to_owned().unwrap_or(payouts.recurring),\n auto_fulfill: req.auto_fulfill.to_owned().unwrap_or(payouts.auto_fulfill),\n return_url: req\n .return_url\n .to_owned()\n .clone()\n .or(payouts.return_url.clone()),\n entity_type: req.entity_type.to_owned().unwrap_or(payouts.entity_type),\n metadata: req.metadata.clone().or(payouts.metadata.clone()),\n status: Some(status),\n profile_id: Some(payout_attempt.profile_id.clone()),\n confirm: req.confirm.to_owned(),\n payout_type: req\n .payout_type\n .to_owned()\n .or(payouts.payout_type.to_owned()),\n address_id: address_id.clone(),\n customer_id: customer_id.clone(),\n };\n let db = &*state.store;\n payout_data.payouts = db\n .update_payout(\n &payouts,\n updated_payouts,\n &payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts\")?;\n let updated_business_country =\n payout_attempt\n .business_country\n .map_or(req.business_country.to_owned(), |c| {\n req.business_country\n .to_owned()\n .and_then(|nc| if nc != c { Some(nc) } else { None })\n });\n let updated_business_label =\n payout_attempt\n .business_label\n .map_or(req.business_label.to_owned(), |l| {\n req.business_label\n .to_owned()\n .and_then(|nl| if nl != l { Some(nl) } else { None })\n });\n if updated_business_country.is_some()\n || updated_business_label.is_some()\n || customer_id.is_some()\n || address_id.is_some()\n {\n let payout_attempt = &payout_data.payout_attempt;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::BusinessUpdate {\n business_country: updated_business_country,\n business_label: updated_business_label,\n address_id,\n customer_id,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt\")?;\n }\n Ok(())\n}", + "after_code": "pub async fn update_payouts_and_payout_attempt(\n payout_data: &mut PayoutData,\n merchant_account: &domain::MerchantAccount,\n req: &payouts::PayoutCreateRequest,\n state: &SessionState,\n merchant_key_store: &domain::MerchantKeyStore,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let status = payout_attempt.status;\n let payout_id = payout_attempt.payout_id.clone();\n // Verify update feasibility\n if is_payout_terminal_state(status) || is_payout_initiated(status) {\n return Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\n \"Payout {} cannot be updated for status {}\",\n payout_id, status\n ),\n }));\n }\n\n // Fetch customer details from request and create new or else use existing customer that was attached\n let customer = get_customer_details_from_request(req);\n let customer_id = if customer.customer_id.is_some()\n || customer.name.is_some()\n || customer.email.is_some()\n || customer.phone.is_some()\n || customer.phone_country_code.is_some()\n {\n payout_data.customer_details =\n get_or_create_customer_details(state, &customer, merchant_account, merchant_key_store)\n .await?;\n payout_data\n .customer_details\n .as_ref()\n .map(|customer| customer.customer_id.clone())\n } else {\n payout_data.payouts.customer_id.clone()\n };\n\n // We have to do this because the function that is being used to create / get address is from payments\n // which expects a payment_id\n let payout_id_as_payment_id_type =\n id_type::PaymentId::try_from(std::borrow::Cow::Owned(payout_id.clone()))\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n // Fetch address details from request and create new or else use existing address that was attached\n let billing_address = payment_helpers::create_or_find_address_for_payment_by_request(\n state,\n req.billing.as_ref(),\n None,\n merchant_account.get_id(),\n customer_id.as_ref(),\n merchant_key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await?;\n let address_id = if billing_address.is_some() {\n payout_data.billing_address = billing_address;\n payout_data\n .billing_address\n .as_ref()\n .map(|address| address.address_id.clone())\n } else {\n payout_data.payouts.address_id.clone()\n };\n\n // Update DB with new data\n let payouts = payout_data.payouts.to_owned();\n let amount = MinorUnit::from(req.amount.unwrap_or(payouts.amount.into()));\n let updated_payouts = storage::PayoutsUpdate::Update {\n amount,\n destination_currency: req\n .currency\n .to_owned()\n .unwrap_or(payouts.destination_currency),\n source_currency: req.currency.to_owned().unwrap_or(payouts.source_currency),\n description: req\n .description\n .to_owned()\n .clone()\n .or(payouts.description.clone()),\n recurring: req.recurring.to_owned().unwrap_or(payouts.recurring),\n auto_fulfill: req.auto_fulfill.to_owned().unwrap_or(payouts.auto_fulfill),\n return_url: req\n .return_url\n .to_owned()\n .clone()\n .or(payouts.return_url.clone()),\n entity_type: req.entity_type.to_owned().unwrap_or(payouts.entity_type),\n metadata: req.metadata.clone().or(payouts.metadata.clone()),\n status: Some(status),\n profile_id: Some(payout_attempt.profile_id.clone()),\n confirm: req.confirm.to_owned(),\n payout_type: req\n .payout_type\n .to_owned()\n .or(payouts.payout_type.to_owned()),\n address_id: address_id.clone(),\n customer_id: customer_id.clone(),\n };\n let db = &*state.store;\n payout_data.payouts = db\n .update_payout(\n &payouts,\n updated_payouts,\n &payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts\")?;\n let updated_business_country =\n payout_attempt\n .business_country\n .map_or(req.business_country.to_owned(), |c| {\n req.business_country\n .to_owned()\n .and_then(|nc| if nc != c { Some(nc) } else { None })\n });\n let updated_business_label =\n payout_attempt\n .business_label\n .map_or(req.business_label.to_owned(), |l| {\n req.business_label\n .to_owned()\n .and_then(|nl| if nl != l { Some(nl) } else { None })\n });\n if updated_business_country.is_some()\n || updated_business_label.is_some()\n || customer_id.is_some()\n || address_id.is_some()\n {\n let payout_attempt = &payout_data.payout_attempt;\n let updated_payout_attempt = storage::PayoutAttemptUpdate::BusinessUpdate {\n business_country: updated_business_country,\n business_label: updated_business_label,\n address_id,\n customer_id,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt\")?;\n }\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use super::PayoutData;", + "use error_stack::{report, ResultExt};", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use super::PayoutData;", + "use error_stack::{report, ResultExt};", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::get_or_create_customer_details", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub(super) async fn get_or_create_customer_details(\n state: &SessionState,\n customer_details: &CustomerDetails,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult> {\n let db: &dyn StorageInterface = &*state.store;\n // Create customer_id if not passed in request\n let customer_id = customer_details\n .customer_id\n .clone()\n .unwrap_or_else(generate_customer_id_of_default_length);\n\n let merchant_id = merchant_account.get_id();\n let key = key_store.key.get_inner().peek();\n let key_manager_state = &state.into();\n\n match db\n .find_customer_optional_by_customer_id_merchant_id(\n key_manager_state,\n &customer_id,\n merchant_id,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)?\n {\n // Customer found\n Some(customer) => Ok(Some(customer)),\n\n // Customer not found\n // create only if atleast one of the fields were provided for customer creation or else throw error\n None => {\n if customer_details.name.is_some()\n || customer_details.email.is_some()\n || customer_details.phone.is_some()\n || customer_details.phone_country_code.is_some()\n {\n let encrypted_data = crypto_operation(\n &state.into(),\n type_name!(domain::Customer),\n CryptoOperation::BatchEncrypt(\n domain::FromRequestEncryptableCustomer::to_encryptable(\n domain::FromRequestEncryptableCustomer {\n name: customer_details.name.clone(),\n email: customer_details\n .email\n .clone()\n .map(|a| a.expose().switch_strategy()),\n phone: customer_details.phone.clone(),\n },\n ),\n ),\n Identifier::Merchant(key_store.merchant_id.clone()),\n key,\n )\n .await\n .and_then(|val| val.try_into_batchoperation())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encrypt customer\")?;\n let encryptable_customer =\n domain::FromRequestEncryptableCustomer::from_encryptable(encrypted_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to form EncryptableCustomer\")?;\n\n let customer = domain::Customer {\n customer_id: customer_id.clone(),\n merchant_id: merchant_id.to_owned().clone(),\n name: encryptable_customer.name,\n email: encryptable_customer.email.map(|email| {\n let encryptable: Encryptable> =\n Encryptable::new(\n email.clone().into_inner().switch_strategy(),\n email.into_encrypted(),\n );\n encryptable\n }),\n phone: encryptable_customer.phone,\n description: None,\n phone_country_code: customer_details.phone_country_code.to_owned(),\n metadata: None,\n connector_customer: None,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n address_id: None,\n default_payment_method_id: None,\n updated_by: None,\n version: hyperswitch_domain_models::consts::API_VERSION,\n };\n\n Ok(Some(\n db.insert_customer(\n customer,\n key_manager_state,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed to insert customer [id - {:?}] for merchant [id - {:?}]\",\n customer_id, merchant_id\n )\n })?,\n ))\n } else {\n Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\"customer for id - {:?} not found\", customer_id),\n }))\n }\n }\n }\n}", + "after_code": "pub(super) async fn get_or_create_customer_details(\n state: &SessionState,\n customer_details: &CustomerDetails,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult> {\n let db: &dyn StorageInterface = &*state.store;\n // Create customer_id if not passed in request\n let customer_id = customer_details\n .customer_id\n .clone()\n .unwrap_or_else(generate_customer_id_of_default_length);\n\n let merchant_id = merchant_account.get_id();\n let key = key_store.key.get_inner().peek();\n let key_manager_state = &state.into();\n\n match db\n .find_customer_optional_by_customer_id_merchant_id(\n key_manager_state,\n &customer_id,\n merchant_id,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)?\n {\n // Customer found\n Some(customer) => Ok(Some(customer)),\n\n // Customer not found\n // create only if atleast one of the fields were provided for customer creation or else throw error\n None => {\n if customer_details.name.is_some()\n || customer_details.email.is_some()\n || customer_details.phone.is_some()\n || customer_details.phone_country_code.is_some()\n {\n let encrypted_data = crypto_operation(\n &state.into(),\n type_name!(domain::Customer),\n CryptoOperation::BatchEncrypt(\n domain::FromRequestEncryptableCustomer::to_encryptable(\n domain::FromRequestEncryptableCustomer {\n name: customer_details.name.clone(),\n email: customer_details\n .email\n .clone()\n .map(|a| a.expose().switch_strategy()),\n phone: customer_details.phone.clone(),\n },\n ),\n ),\n Identifier::Merchant(key_store.merchant_id.clone()),\n key,\n )\n .await\n .and_then(|val| val.try_into_batchoperation())\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to encrypt customer\")?;\n let encryptable_customer =\n domain::FromRequestEncryptableCustomer::from_encryptable(encrypted_data)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to form EncryptableCustomer\")?;\n\n let customer = domain::Customer {\n customer_id: customer_id.clone(),\n merchant_id: merchant_id.to_owned().clone(),\n name: encryptable_customer.name,\n email: encryptable_customer.email.map(|email| {\n let encryptable: Encryptable> =\n Encryptable::new(\n email.clone().into_inner().switch_strategy(),\n email.into_encrypted(),\n );\n encryptable\n }),\n phone: encryptable_customer.phone,\n description: None,\n phone_country_code: customer_details.phone_country_code.to_owned(),\n metadata: None,\n connector_customer: None,\n created_at: common_utils::date_time::now(),\n modified_at: common_utils::date_time::now(),\n address_id: None,\n default_payment_method_id: None,\n updated_by: None,\n version: hyperswitch_domain_models::consts::API_VERSION,\n };\n\n Ok(Some(\n db.insert_customer(\n customer,\n key_manager_state,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable_lazy(|| {\n format!(\n \"Failed to insert customer [id - {:?}] for merchant [id - {:?}]\",\n customer_id, merchant_id\n )\n })?,\n ))\n } else {\n Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: format!(\"customer for id - {:?} not found\", customer_id),\n }))\n }\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use masking::{ExposeInterface, PeekInterface, Secret, SwitchStrategy};", + "use error_stack::{report, ResultExt};", + "use hyperswitch_domain_models::type_encryption::{crypto_operation, CryptoOperation};", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use masking::{ExposeInterface, PeekInterface, Secret, SwitchStrategy};", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use error_stack::{report, ResultExt};", + "use hyperswitch_domain_models::type_encryption::{crypto_operation, CryptoOperation};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::payout_create_db_entries", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payout_create_db_entries(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n req: &payouts::PayoutCreateRequest,\n payout_id: &String,\n profile_id: &common_utils::id_type::ProfileId,\n stored_payout_method_data: Option<&payouts::PayoutMethodData>,\n locale: &str,\n customer: Option<&domain::Customer>,\n payment_method: Option,\n) -> RouterResult {\n let db = &*state.store;\n let merchant_id = merchant_account.get_id();\n let customer_id = customer.map(|cust| cust.customer_id.clone());\n\n // Validate whether profile_id passed in request is valid and is linked to the merchant\n let business_profile =\n validate_and_get_business_profile(state, key_store, profile_id, merchant_id).await?;\n\n let payout_link = match req.payout_link {\n Some(true) => Some(\n create_payout_link(\n state,\n &business_profile,\n &customer_id\n .clone()\n .get_required_value(\"customer.id when payout_link is true\")?,\n merchant_id,\n req,\n payout_id,\n locale,\n )\n .await?,\n ),\n _ => None,\n };\n\n // We have to do this because the function that is being used to create / get address is from payments\n // which expects a payment_id\n let payout_id_as_payment_id_type =\n common_utils::id_type::PaymentId::try_from(std::borrow::Cow::Owned(payout_id.to_string()))\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n // Get or create address\n let billing_address = payment_helpers::create_or_find_address_for_payment_by_request(\n state,\n req.billing.as_ref(),\n None,\n merchant_id,\n customer_id.as_ref(),\n key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await?;\n let address_id = billing_address.to_owned().map(|address| address.address_id);\n\n // Make payouts entry\n let currency = req.currency.to_owned().get_required_value(\"currency\")?;\n\n let (payout_method_id, payout_type) = match stored_payout_method_data {\n Some(payout_method_data) => (\n req.payout_token.to_owned(),\n Some(api_enums::PayoutType::foreign_from(payout_method_data)),\n ),\n None => (\n payment_method.clone().map(|pm| pm.payment_method_id),\n req.payout_type.to_owned(),\n ),\n };\n\n let client_secret = utils::generate_id(\n consts::ID_LENGTH,\n format!(\"payout_{payout_id}_secret\").as_str(),\n );\n let amount = MinorUnit::from(req.amount.unwrap_or(api::Amount::Zero));\n let status = if req.payout_method_data.is_some()\n || req.payout_token.is_some()\n || stored_payout_method_data.is_some()\n {\n match req.confirm {\n Some(true) => storage_enums::PayoutStatus::RequiresCreation,\n _ => storage_enums::PayoutStatus::RequiresConfirmation,\n }\n } else {\n storage_enums::PayoutStatus::RequiresPayoutMethodData\n };\n\n let payouts_req = storage::PayoutsNew {\n payout_id: payout_id.to_string(),\n merchant_id: merchant_id.to_owned(),\n customer_id: customer_id.to_owned(),\n address_id: address_id.to_owned(),\n payout_type,\n amount,\n destination_currency: currency,\n source_currency: currency,\n description: req.description.to_owned(),\n recurring: req.recurring.unwrap_or(false),\n auto_fulfill: req.auto_fulfill.unwrap_or(false),\n return_url: req.return_url.to_owned(),\n entity_type: req.entity_type.unwrap_or_default(),\n payout_method_id,\n profile_id: profile_id.to_owned(),\n attempt_count: 1,\n metadata: req.metadata.clone(),\n confirm: req.confirm,\n payout_link_id: payout_link\n .clone()\n .map(|link_data| link_data.link_id.clone()),\n client_secret: Some(client_secret),\n priority: req.priority,\n status,\n created_at: common_utils::date_time::now(),\n last_modified_at: common_utils::date_time::now(),\n };\n let payouts = db\n .insert_payout(payouts_req, merchant_account.storage_scheme)\n .await\n .to_duplicate_response(errors::ApiErrorResponse::DuplicatePayout {\n payout_id: payout_id.to_owned(),\n })\n .attach_printable(\"Error inserting payouts in db\")?;\n // Make payout_attempt entry\n let payout_attempt_id = utils::get_payout_attempt_id(payout_id, 1);\n\n let additional_pm_data_value = req\n .payout_method_data\n .clone()\n .or(stored_payout_method_data.cloned())\n .async_and_then(|payout_method_data| async move {\n helpers::get_additional_payout_data(&payout_method_data, &*state.store, profile_id)\n .await\n })\n .await;\n\n let payout_attempt_req = storage::PayoutAttemptNew {\n payout_attempt_id: payout_attempt_id.to_string(),\n payout_id: payout_id.to_owned(),\n additional_payout_method_data: additional_pm_data_value,\n merchant_id: merchant_id.to_owned(),\n status,\n business_country: req.business_country.to_owned(),\n business_label: req.business_label.to_owned(),\n payout_token: req.payout_token.to_owned(),\n profile_id: profile_id.to_owned(),\n customer_id,\n address_id,\n connector: None,\n connector_payout_id: None,\n is_eligible: None,\n error_message: None,\n error_code: None,\n created_at: common_utils::date_time::now(),\n last_modified_at: common_utils::date_time::now(),\n merchant_connector_id: None,\n routing_info: None,\n unified_code: None,\n unified_message: None,\n };\n let payout_attempt = db\n .insert_payout_attempt(\n payout_attempt_req,\n &payouts,\n merchant_account.storage_scheme,\n )\n .await\n .to_duplicate_response(errors::ApiErrorResponse::DuplicatePayout {\n payout_id: payout_id.to_owned(),\n })\n .attach_printable(\"Error inserting payout_attempt in db\")?;\n\n // Make PayoutData\n Ok(PayoutData {\n billing_address,\n business_profile,\n customer_details: customer.map(ToOwned::to_owned),\n merchant_connector_account: None,\n payouts,\n payout_attempt,\n payout_method_data: req\n .payout_method_data\n .as_ref()\n .cloned()\n .or(stored_payout_method_data.cloned()),\n should_terminate: false,\n profile_id: profile_id.to_owned(),\n payout_link,\n current_locale: locale.to_string(),\n payment_method,\n })\n}", + "after_code": "pub async fn payout_create_db_entries(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n req: &payouts::PayoutCreateRequest,\n payout_id: &String,\n profile_id: &common_utils::id_type::ProfileId,\n stored_payout_method_data: Option<&payouts::PayoutMethodData>,\n locale: &str,\n customer: Option<&domain::Customer>,\n payment_method: Option,\n) -> RouterResult {\n let db = &*state.store;\n let merchant_id = merchant_account.get_id();\n let customer_id = customer.map(|cust| cust.customer_id.clone());\n\n // Validate whether profile_id passed in request is valid and is linked to the merchant\n let business_profile =\n validate_and_get_business_profile(state, key_store, profile_id, merchant_id).await?;\n\n let payout_link = match req.payout_link {\n Some(true) => Some(\n create_payout_link(\n state,\n &business_profile,\n &customer_id\n .clone()\n .get_required_value(\"customer.id when payout_link is true\")?,\n merchant_id,\n req,\n payout_id,\n locale,\n )\n .await?,\n ),\n _ => None,\n };\n\n // We have to do this because the function that is being used to create / get address is from payments\n // which expects a payment_id\n let payout_id_as_payment_id_type =\n common_utils::id_type::PaymentId::try_from(std::borrow::Cow::Owned(payout_id.to_string()))\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n // Get or create address\n let billing_address = payment_helpers::create_or_find_address_for_payment_by_request(\n state,\n req.billing.as_ref(),\n None,\n merchant_id,\n customer_id.as_ref(),\n key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await?;\n let address_id = billing_address.to_owned().map(|address| address.address_id);\n\n // Make payouts entry\n let currency = req.currency.to_owned().get_required_value(\"currency\")?;\n\n let (payout_method_id, payout_type) = match stored_payout_method_data {\n Some(payout_method_data) => (\n req.payout_token.to_owned(),\n Some(api_enums::PayoutType::foreign_from(payout_method_data)),\n ),\n None => (\n payment_method.clone().map(|pm| pm.payment_method_id),\n req.payout_type.to_owned(),\n ),\n };\n\n let client_secret = utils::generate_id(\n consts::ID_LENGTH,\n format!(\"payout_{payout_id}_secret\").as_str(),\n );\n let amount = MinorUnit::from(req.amount.unwrap_or(api::Amount::Zero));\n let status = if req.payout_method_data.is_some()\n || req.payout_token.is_some()\n || stored_payout_method_data.is_some()\n {\n match req.confirm {\n Some(true) => storage_enums::PayoutStatus::RequiresCreation,\n _ => storage_enums::PayoutStatus::RequiresConfirmation,\n }\n } else {\n storage_enums::PayoutStatus::RequiresPayoutMethodData\n };\n\n let payouts_req = storage::PayoutsNew {\n payout_id: payout_id.to_string(),\n merchant_id: merchant_id.to_owned(),\n customer_id: customer_id.to_owned(),\n address_id: address_id.to_owned(),\n payout_type,\n amount,\n destination_currency: currency,\n source_currency: currency,\n description: req.description.to_owned(),\n recurring: req.recurring.unwrap_or(false),\n auto_fulfill: req.auto_fulfill.unwrap_or(false),\n return_url: req.return_url.to_owned(),\n entity_type: req.entity_type.unwrap_or_default(),\n payout_method_id,\n profile_id: profile_id.to_owned(),\n attempt_count: 1,\n metadata: req.metadata.clone(),\n confirm: req.confirm,\n payout_link_id: payout_link\n .clone()\n .map(|link_data| link_data.link_id.clone()),\n client_secret: Some(client_secret),\n priority: req.priority,\n status,\n created_at: common_utils::date_time::now(),\n last_modified_at: common_utils::date_time::now(),\n };\n let payouts = db\n .insert_payout(payouts_req, merchant_account.storage_scheme)\n .await\n .to_duplicate_response(errors::ApiErrorResponse::DuplicatePayout {\n payout_id: payout_id.to_owned(),\n })\n .attach_printable(\"Error inserting payouts in db\")?;\n // Make payout_attempt entry\n let payout_attempt_id = utils::get_payout_attempt_id(payout_id, 1);\n\n let additional_pm_data_value = req\n .payout_method_data\n .clone()\n .or(stored_payout_method_data.cloned())\n .async_and_then(|payout_method_data| async move {\n helpers::get_additional_payout_data(&payout_method_data, &*state.store, profile_id)\n .await\n })\n .await;\n\n let payout_attempt_req = storage::PayoutAttemptNew {\n payout_attempt_id: payout_attempt_id.to_string(),\n payout_id: payout_id.to_owned(),\n additional_payout_method_data: additional_pm_data_value,\n merchant_id: merchant_id.to_owned(),\n status,\n business_country: req.business_country.to_owned(),\n business_label: req.business_label.to_owned(),\n payout_token: req.payout_token.to_owned(),\n profile_id: profile_id.to_owned(),\n customer_id,\n address_id,\n connector: None,\n connector_payout_id: None,\n is_eligible: None,\n error_message: None,\n error_code: None,\n created_at: common_utils::date_time::now(),\n last_modified_at: common_utils::date_time::now(),\n merchant_connector_id: None,\n routing_info: None,\n unified_code: None,\n unified_message: None,\n };\n let payout_attempt = db\n .insert_payout_attempt(\n payout_attempt_req,\n &payouts,\n merchant_account.storage_scheme,\n )\n .await\n .to_duplicate_response(errors::ApiErrorResponse::DuplicatePayout {\n payout_id: payout_id.to_owned(),\n })\n .attach_printable(\"Error inserting payout_attempt in db\")?;\n\n // Make PayoutData\n Ok(PayoutData {\n billing_address,\n business_profile,\n customer_details: customer.map(ToOwned::to_owned),\n merchant_connector_account: None,\n payouts,\n payout_attempt,\n payout_method_data: req\n .payout_method_data\n .as_ref()\n .cloned()\n .or(stored_payout_method_data.cloned()),\n should_terminate: false,\n profile_id: profile_id.to_owned(),\n payout_link,\n current_locale: locale.to_string(),\n payment_method,\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::check_payout_eligibility", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn check_payout_eligibility(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoEligibility,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_data.payout_attempt.error_message.as_ref(), \"error_code\": payout_data.payout_attempt.error_code.as_ref()})\n ),\n }));\n }\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: Some(false),\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "after_code": "pub async fn check_payout_eligibility(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoEligibility,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id,\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n if helpers::is_payout_err_state(status) {\n return Err(report!(errors::ApiErrorResponse::PayoutFailed {\n data: Some(\n serde_json::json!({\"payout_status\": status.to_string(), \"error_message\": payout_data.payout_attempt.error_message.as_ref(), \"error_code\": payout_data.payout_attempt.error_code.as_ref()})\n ),\n }));\n }\n }\n Err(err) => {\n let status = storage_enums::PayoutStatus::Failed;\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status,\n error_code,\n error_message,\n is_eligible: Some(false),\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n };\n\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::get_mca_from_profile_id", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn get_mca_from_profile_id(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n profile_id: &common_utils::id_type::ProfileId,\n connector_name: &str,\n merchant_connector_id: Option<&common_utils::id_type::MerchantConnectorAccountId>,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult {\n let merchant_connector_account = payment_helpers::get_merchant_connector_account(\n state,\n merchant_account.get_id(),\n None,\n key_store,\n profile_id,\n connector_name,\n merchant_connector_id,\n )\n .await?;\n\n Ok(merchant_connector_account)\n}", + "after_code": "pub async fn get_mca_from_profile_id(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n profile_id: &common_utils::id_type::ProfileId,\n connector_name: &str,\n merchant_connector_id: Option<&common_utils::id_type::MerchantConnectorAccountId>,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult {\n let merchant_connector_account = payment_helpers::get_merchant_connector_account(\n state,\n merchant_account.get_id(),\n None,\n key_store,\n profile_id,\n connector_name,\n merchant_connector_id,\n )\n .await?;\n\n Ok(merchant_connector_account)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/api_models/src/payment_methods.rs::PaymentMethodCreate::function::get_payment_method_create_from_payment_method_migrate", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn get_payment_method_create_from_payment_method_migrate(\n card_number: CardNumber,\n payment_method_migrate: &PaymentMethodMigrate,\n ) -> Self {\n let card_details =\n payment_method_migrate\n .card\n .as_ref()\n .map(|payment_method_migrate_card| CardDetail {\n card_number,\n card_exp_month: payment_method_migrate_card.card_exp_month.clone(),\n card_exp_year: payment_method_migrate_card.card_exp_year.clone(),\n card_holder_name: payment_method_migrate_card.card_holder_name.clone(),\n nick_name: payment_method_migrate_card.nick_name.clone(),\n card_issuing_country: payment_method_migrate_card.card_issuing_country.clone(),\n card_network: payment_method_migrate_card.card_network.clone(),\n card_issuer: payment_method_migrate_card.card_issuer.clone(),\n card_type: payment_method_migrate_card.card_type.clone(),\n });\n\n Self {\n customer_id: payment_method_migrate.customer_id.clone(),\n payment_method: payment_method_migrate.payment_method,\n payment_method_type: payment_method_migrate.payment_method_type,\n payment_method_issuer: payment_method_migrate.payment_method_issuer.clone(),\n payment_method_issuer_code: payment_method_migrate.payment_method_issuer_code,\n metadata: payment_method_migrate.metadata.clone(),\n payment_method_data: payment_method_migrate.payment_method_data.clone(),\n connector_mandate_details: payment_method_migrate.connector_mandate_details.clone(),\n client_secret: None,\n billing: payment_method_migrate.billing.clone(),\n card: card_details,\n card_network: payment_method_migrate.card_network.clone(),\n #[cfg(feature = \"payouts\")]\n bank_transfer: payment_method_migrate.bank_transfer.clone(),\n #[cfg(feature = \"payouts\")]\n wallet: payment_method_migrate.wallet.clone(),\n network_transaction_id: payment_method_migrate.network_transaction_id.clone(),\n }\n }", + "after_code": "pub fn get_payment_method_create_from_payment_method_migrate(\n card_number: CardNumber,\n payment_method_migrate: &PaymentMethodMigrate,\n ) -> Self {\n let card_details =\n payment_method_migrate\n .card\n .as_ref()\n .map(|payment_method_migrate_card| CardDetail {\n card_number,\n card_exp_month: payment_method_migrate_card.card_exp_month.clone(),\n card_exp_year: payment_method_migrate_card.card_exp_year.clone(),\n card_holder_name: payment_method_migrate_card.card_holder_name.clone(),\n nick_name: payment_method_migrate_card.nick_name.clone(),\n card_issuing_country: payment_method_migrate_card.card_issuing_country.clone(),\n card_network: payment_method_migrate_card.card_network.clone(),\n card_issuer: payment_method_migrate_card.card_issuer.clone(),\n card_type: payment_method_migrate_card.card_type.clone(),\n });\n\n Self {\n customer_id: payment_method_migrate.customer_id.clone(),\n payment_method: payment_method_migrate.payment_method,\n payment_method_type: payment_method_migrate.payment_method_type,\n payment_method_issuer: payment_method_migrate.payment_method_issuer.clone(),\n payment_method_issuer_code: payment_method_migrate.payment_method_issuer_code,\n metadata: payment_method_migrate.metadata.clone(),\n payment_method_data: payment_method_migrate.payment_method_data.clone(),\n connector_mandate_details: convert_to_payments_reference(\n payment_method_migrate.connector_mandate_details.clone(),\n ),\n client_secret: None,\n billing: payment_method_migrate.billing.clone(),\n card: card_details,\n card_network: payment_method_migrate.card_network.clone(),\n #[cfg(feature = \"payouts\")]\n bank_transfer: payment_method_migrate.bank_transfer.clone(),\n #[cfg(feature = \"payouts\")]\n wallet: payment_method_migrate.wallet.clone(),\n network_transaction_id: payment_method_migrate.network_transaction_id.clone(),\n }\n }", + "diff_span": { + "before": " metadata: payment_method_migrate.metadata.clone(),\n payment_method_data: payment_method_migrate.payment_method_data.clone(),\n connector_mandate_details: payment_method_migrate.connector_mandate_details.clone(),\n client_secret: None,\n billing: payment_method_migrate.billing.clone(),", + "after": " metadata: payment_method_migrate.metadata.clone(),\n payment_method_data: payment_method_migrate.payment_method_data.clone(),\n connector_mandate_details: convert_to_payments_reference(\n payment_method_migrate.connector_mandate_details.clone(),\n ),\n client_secret: None,\n billing: payment_method_migrate.billing.clone()," + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_core(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n payout_data: &mut PayoutData,\n routing_algorithm: Option,\n eligible_connectors: Option>,\n) -> RouterResult<()> {\n todo!()\n}", + "after_code": "pub async fn payouts_core(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n payout_data: &mut PayoutData,\n routing_algorithm: Option,\n eligible_connectors: Option>,\n) -> RouterResult<()> {\n todo!()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::complete_create_recipient_disburse_account", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn complete_create_recipient_disburse_account(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n if !payout_data.should_terminate\n && matches!(\n payout_data.payout_attempt.status,\n storage_enums::PayoutStatus::RequiresVendorAccountCreation\n | storage_enums::PayoutStatus::RequiresCreation\n )\n && connector_data\n .connector_name\n .supports_vendor_disburse_account_create_for_payout()\n && helpers::should_create_connector_transfer_method(&*payout_data, connector_data)?\n .is_none()\n {\n Box::pin(create_recipient_disburse_account(\n state,\n merchant_account,\n connector_data,\n payout_data,\n key_store,\n ))\n .await\n .attach_printable(\"Creation of customer failed\")?;\n }\n Ok(())\n}", + "after_code": "pub async fn complete_create_recipient_disburse_account(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n if !payout_data.should_terminate\n && matches!(\n payout_data.payout_attempt.status,\n storage_enums::PayoutStatus::RequiresVendorAccountCreation\n | storage_enums::PayoutStatus::RequiresCreation\n )\n && connector_data\n .connector_name\n .supports_vendor_disburse_account_create_for_payout()\n && helpers::should_create_connector_transfer_method(&*payout_data, connector_data)?\n .is_none()\n {\n Box::pin(create_recipient_disburse_account(\n state,\n merchant_account,\n connector_data,\n payout_data,\n key_store,\n ))\n .await\n .attach_printable(\"Creation of customer failed\")?;\n }\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::PaymentsMandateReference", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl std::ops::DerefMut for PaymentsMandateReference {\n fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }\n}", + "after_code": "impl std::ops::DerefMut for PaymentsMandateReference {\n fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/api_models/src/payment_methods.rs::impl::PaymentMethodMigrate", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n TryFrom<(\n PaymentMethodRecord,\n id_type::MerchantId,\n Option,\n )> for PaymentMethodMigrate\n{\n type Error = error_stack::Report;\n fn try_from(\n item: (\n PaymentMethodRecord,\n id_type::MerchantId,\n Option,\n ),\n ) -> Result {\n let (record, merchant_id, mca_id) = item;\n\n // if payment instrument id is present then only construct this\n let connector_mandate_details = if record.payment_instrument_id.is_some() {\n Some(PaymentsMandateReference(HashMap::from([(\n mca_id.get_required_value(\"merchant_connector_id\")?,\n PaymentsMandateReferenceRecord {\n connector_mandate_id: record\n .payment_instrument_id\n .get_required_value(\"payment_instrument_id\")?\n .peek()\n .to_string(),\n payment_method_type: record.payment_method_type,\n original_payment_authorized_amount: record.original_transaction_amount,\n original_payment_authorized_currency: record.original_transaction_currency,\n },\n )])))\n } else {\n None\n };\n Ok(Self {\n merchant_id,\n customer_id: Some(record.customer_id),\n card: Some(MigrateCardDetail {\n card_number: record.raw_card_number.unwrap_or(record.card_number_masked),\n card_exp_month: record.card_expiry_month,\n card_exp_year: record.card_expiry_year,\n card_holder_name: record.name.clone(),\n card_network: None,\n card_type: None,\n card_issuer: None,\n card_issuing_country: None,\n nick_name: Some(record.nick_name.clone()),\n }),\n network_token: Some(MigrateNetworkTokenDetail {\n network_token_data: MigrateNetworkTokenData {\n network_token_number: record.network_token_number.unwrap_or_default(),\n network_token_exp_month: record.network_token_expiry_month.unwrap_or_default(),\n network_token_exp_year: record.network_token_expiry_year.unwrap_or_default(),\n card_holder_name: record.name,\n nick_name: Some(record.nick_name.clone()),\n card_issuing_country: None,\n card_network: None,\n card_issuer: None,\n card_type: None,\n },\n network_token_requestor_ref_id: record\n .network_token_requestor_ref_id\n .unwrap_or_default(),\n }),\n payment_method: record.payment_method,\n payment_method_type: record.payment_method_type,\n payment_method_issuer: None,\n billing: Some(payments::Address {\n address: Some(payments::AddressDetails {\n city: Some(record.billing_address_city),\n country: record.billing_address_country,\n line1: Some(record.billing_address_line1),\n line2: record.billing_address_line2,\n state: Some(record.billing_address_state),\n line3: record.billing_address_line3,\n zip: Some(record.billing_address_zip),\n first_name: Some(record.billing_address_first_name),\n last_name: Some(record.billing_address_last_name),\n }),\n phone: Some(payments::PhoneDetails {\n number: record.phone,\n country_code: record.phone_country_code,\n }),\n email: record.email,\n }),\n connector_mandate_details,\n metadata: None,\n payment_method_issuer_code: None,\n card_network: None,\n #[cfg(feature = \"payouts\")]\n bank_transfer: None,\n #[cfg(feature = \"payouts\")]\n wallet: None,\n payment_method_data: None,\n network_transaction_id: record.original_transaction_id,\n })\n }\n}", + "after_code": "impl\n TryFrom<(\n PaymentMethodRecord,\n id_type::MerchantId,\n Option,\n )> for PaymentMethodMigrate\n{\n type Error = error_stack::Report;\n fn try_from(\n item: (\n PaymentMethodRecord,\n id_type::MerchantId,\n Option,\n ),\n ) -> Result {\n let (record, merchant_id, mca_id) = item;\n\n // if payment instrument id is present then only construct this\n let connector_mandate_details = if record.payment_instrument_id.is_some() {\n Some(PaymentsMandateReference(HashMap::from([(\n mca_id.get_required_value(\"merchant_connector_id\")?,\n PaymentsMandateReferenceRecord {\n connector_mandate_id: record\n .payment_instrument_id\n .get_required_value(\"payment_instrument_id\")?\n .peek()\n .to_string(),\n payment_method_type: record.payment_method_type,\n original_payment_authorized_amount: record.original_transaction_amount,\n original_payment_authorized_currency: record.original_transaction_currency,\n },\n )])))\n } else {\n None\n };\n Ok(Self {\n merchant_id,\n customer_id: Some(record.customer_id),\n card: Some(MigrateCardDetail {\n card_number: record.raw_card_number.unwrap_or(record.card_number_masked),\n card_exp_month: record.card_expiry_month,\n card_exp_year: record.card_expiry_year,\n card_holder_name: record.name.clone(),\n card_network: None,\n card_type: None,\n card_issuer: None,\n card_issuing_country: None,\n nick_name: Some(record.nick_name.clone()),\n }),\n network_token: Some(MigrateNetworkTokenDetail {\n network_token_data: MigrateNetworkTokenData {\n network_token_number: record.network_token_number.unwrap_or_default(),\n network_token_exp_month: record.network_token_expiry_month.unwrap_or_default(),\n network_token_exp_year: record.network_token_expiry_year.unwrap_or_default(),\n card_holder_name: record.name,\n nick_name: Some(record.nick_name.clone()),\n card_issuing_country: None,\n card_network: None,\n card_issuer: None,\n card_type: None,\n },\n network_token_requestor_ref_id: record\n .network_token_requestor_ref_id\n .unwrap_or_default(),\n }),\n payment_method: record.payment_method,\n payment_method_type: record.payment_method_type,\n payment_method_issuer: None,\n billing: Some(payments::Address {\n address: Some(payments::AddressDetails {\n city: Some(record.billing_address_city),\n country: record.billing_address_country,\n line1: Some(record.billing_address_line1),\n line2: record.billing_address_line2,\n state: Some(record.billing_address_state),\n line3: record.billing_address_line3,\n zip: Some(record.billing_address_zip),\n first_name: Some(record.billing_address_first_name),\n last_name: Some(record.billing_address_last_name),\n }),\n phone: Some(payments::PhoneDetails {\n number: record.phone,\n country_code: record.phone_country_code,\n }),\n email: record.email,\n }),\n connector_mandate_details: convert_to_common_reference(connector_mandate_details),\n metadata: None,\n payment_method_issuer_code: None,\n card_network: None,\n #[cfg(feature = \"payouts\")]\n bank_transfer: None,\n #[cfg(feature = \"payouts\")]\n wallet: None,\n payment_method_data: None,\n network_transaction_id: record.original_transaction_id,\n })\n }\n}", + "diff_span": { + "before": " email: record.email,\n }),\n connector_mandate_details,\n metadata: None,\n payment_method_issuer_code: None,", + "after": " email: record.email,\n }),\n connector_mandate_details: convert_to_common_reference(connector_mandate_details),\n metadata: None,\n payment_method_issuer_code: None," + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::filter_by_constraints", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub(super) async fn filter_by_constraints(\n db: &dyn StorageInterface,\n constraints: &api::PayoutListConstraints,\n merchant_id: &id_type::MerchantId,\n storage_scheme: storage::enums::MerchantStorageScheme,\n) -> CustomResult, errors::DataStorageError> {\n let result = db\n .filter_payouts_by_constraints(merchant_id, &constraints.clone().into(), storage_scheme)\n .await?;\n Ok(result)\n}", + "after_code": "pub(super) async fn filter_by_constraints(\n db: &dyn StorageInterface,\n constraints: &api::PayoutListConstraints,\n merchant_id: &id_type::MerchantId,\n storage_scheme: storage::enums::MerchantStorageScheme,\n) -> CustomResult, errors::DataStorageError> {\n let result = db\n .filter_payouts_by_constraints(merchant_id, &constraints.clone().into(), storage_scheme)\n .await?;\n Ok(result)\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::decide_payout_connector", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn decide_payout_connector(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n request_straight_through: Option,\n routing_data: &mut storage::RoutingData,\n payout_data: &mut PayoutData,\n eligible_connectors: Option>,\n) -> RouterResult {\n // 1. For existing attempts, use stored connector\n let payout_attempt = &payout_data.payout_attempt;\n if let Some(connector_name) = payout_attempt.connector.clone() {\n // Connector was already decided previously, use the same connector\n let connector_data = api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n &connector_name,\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector name received in 'routed_through'\")?;\n\n routing_data.routed_through = Some(connector_name.clone());\n return Ok(api::ConnectorCallType::PreDetermined(connector_data));\n }\n\n // Validate and get the business_profile from payout_attempt\n let business_profile = core_utils::validate_and_get_business_profile(\n state.store.as_ref(),\n &(state).into(),\n key_store,\n Some(&payout_attempt.profile_id),\n merchant_account.get_id(),\n )\n .await?\n .get_required_value(\"Profile\")?;\n\n // 2. Check routing algorithm passed in the request\n if let Some(routing_algorithm) = request_straight_through {\n let (mut connectors, check_eligibility) =\n routing::perform_straight_through_routing(&routing_algorithm, None)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed execution of straight through routing\")?;\n\n if check_eligibility {\n connectors = routing::perform_eligibility_analysis_with_fallback(\n state,\n key_store,\n connectors,\n &TransactionData::Payout(payout_data),\n eligible_connectors,\n &business_profile,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed eligibility analysis and fallback\")?;\n }\n\n let first_connector_choice = connectors\n .first()\n .ok_or(errors::ApiErrorResponse::IncorrectPaymentMethodConfiguration)\n .attach_printable(\"Empty connector list returned\")?\n .clone();\n\n let connector_data = connectors\n .into_iter()\n .map(|conn| {\n api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n &conn.connector.to_string(),\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n })\n .collect::, _>>()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector name received\")?;\n\n routing_data.routed_through = Some(first_connector_choice.connector.to_string());\n routing_data.merchant_connector_id = first_connector_choice.merchant_connector_id;\n\n routing_data.routing_info.algorithm = Some(routing_algorithm);\n return Ok(api::ConnectorCallType::Retryable(connector_data));\n }\n\n // 3. Check algorithm passed in routing data\n if let Some(ref routing_algorithm) = routing_data.algorithm {\n let (mut connectors, check_eligibility) =\n routing::perform_straight_through_routing(routing_algorithm, None)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed execution of straight through routing\")?;\n\n if check_eligibility {\n connectors = routing::perform_eligibility_analysis_with_fallback(\n state,\n key_store,\n connectors,\n &TransactionData::Payout(payout_data),\n eligible_connectors,\n &business_profile,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed eligibility analysis and fallback\")?;\n }\n\n let first_connector_choice = connectors\n .first()\n .ok_or(errors::ApiErrorResponse::IncorrectPaymentMethodConfiguration)\n .attach_printable(\"Empty connector list returned\")?\n .clone();\n\n connectors.remove(0);\n\n let connector_data = connectors\n .into_iter()\n .map(|conn| {\n api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n &conn.connector.to_string(),\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n })\n .collect::, _>>()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector name received\")?;\n\n routing_data.routed_through = Some(first_connector_choice.connector.to_string());\n routing_data.merchant_connector_id = first_connector_choice.merchant_connector_id;\n\n return Ok(api::ConnectorCallType::Retryable(connector_data));\n }\n\n // 4. Route connector\n route_connector_v1_for_payouts(\n state,\n merchant_account,\n &payout_data.business_profile,\n key_store,\n payout_data,\n routing_data,\n eligible_connectors,\n )\n .await\n}", + "after_code": "pub async fn decide_payout_connector(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n request_straight_through: Option,\n routing_data: &mut storage::RoutingData,\n payout_data: &mut PayoutData,\n eligible_connectors: Option>,\n) -> RouterResult {\n // 1. For existing attempts, use stored connector\n let payout_attempt = &payout_data.payout_attempt;\n if let Some(connector_name) = payout_attempt.connector.clone() {\n // Connector was already decided previously, use the same connector\n let connector_data = api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n &connector_name,\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector name received in 'routed_through'\")?;\n\n routing_data.routed_through = Some(connector_name.clone());\n return Ok(api::ConnectorCallType::PreDetermined(connector_data));\n }\n\n // Validate and get the business_profile from payout_attempt\n let business_profile = core_utils::validate_and_get_business_profile(\n state.store.as_ref(),\n &(state).into(),\n key_store,\n Some(&payout_attempt.profile_id),\n merchant_account.get_id(),\n )\n .await?\n .get_required_value(\"Profile\")?;\n\n // 2. Check routing algorithm passed in the request\n if let Some(routing_algorithm) = request_straight_through {\n let (mut connectors, check_eligibility) =\n routing::perform_straight_through_routing(&routing_algorithm, None)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed execution of straight through routing\")?;\n\n if check_eligibility {\n connectors = routing::perform_eligibility_analysis_with_fallback(\n state,\n key_store,\n connectors,\n &TransactionData::Payout(payout_data),\n eligible_connectors,\n &business_profile,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed eligibility analysis and fallback\")?;\n }\n\n let first_connector_choice = connectors\n .first()\n .ok_or(errors::ApiErrorResponse::IncorrectPaymentMethodConfiguration)\n .attach_printable(\"Empty connector list returned\")?\n .clone();\n\n let connector_data = connectors\n .into_iter()\n .map(|conn| {\n api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n &conn.connector.to_string(),\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n })\n .collect::, _>>()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector name received\")?;\n\n routing_data.routed_through = Some(first_connector_choice.connector.to_string());\n routing_data.merchant_connector_id = first_connector_choice.merchant_connector_id;\n\n routing_data.routing_info.algorithm = Some(routing_algorithm);\n return Ok(api::ConnectorCallType::Retryable(connector_data));\n }\n\n // 3. Check algorithm passed in routing data\n if let Some(ref routing_algorithm) = routing_data.algorithm {\n let (mut connectors, check_eligibility) =\n routing::perform_straight_through_routing(routing_algorithm, None)\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed execution of straight through routing\")?;\n\n if check_eligibility {\n connectors = routing::perform_eligibility_analysis_with_fallback(\n state,\n key_store,\n connectors,\n &TransactionData::Payout(payout_data),\n eligible_connectors,\n &business_profile,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"failed eligibility analysis and fallback\")?;\n }\n\n let first_connector_choice = connectors\n .first()\n .ok_or(errors::ApiErrorResponse::IncorrectPaymentMethodConfiguration)\n .attach_printable(\"Empty connector list returned\")?\n .clone();\n\n connectors.remove(0);\n\n let connector_data = connectors\n .into_iter()\n .map(|conn| {\n api::ConnectorData::get_payout_connector_by_name(\n &state.conf.connectors,\n &conn.connector.to_string(),\n api::GetToken::Connector,\n payout_attempt.merchant_connector_id.clone(),\n )\n })\n .collect::, _>>()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Invalid connector name received\")?;\n\n routing_data.routed_through = Some(first_connector_choice.connector.to_string());\n routing_data.merchant_connector_id = first_connector_choice.merchant_connector_id;\n\n return Ok(api::ConnectorCallType::Retryable(connector_data));\n }\n\n // 4. Route connector\n route_connector_v1_for_payouts(\n state,\n merchant_account,\n &payout_data.business_profile,\n key_store,\n payout_data,\n routing_data,\n eligible_connectors,\n )\n .await\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use super::PayoutData;", + "use crate::core::payments::route_connector_v1_for_payouts;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use super::PayoutData;", + "use crate::core::payments::route_connector_v1_for_payouts;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::mod::transformers", + "file": "crates/router/src/core/payouts.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod transformers;", + "after_code": "pub mod transformers;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::mod::helpers", + "file": "crates/router/src/core/payouts.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod helpers;", + "after_code": "pub mod helpers;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::CommonMandateReference::function::from", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self{\n payments: Some(payment_reference),\n payouts: None,\n }\n }", + "after_code": "fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self {\n payments: Some(payment_reference),\n payouts: None,\n }\n }", + "diff_span": { + "before": "fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self{\n payments: Some(payment_reference),\n payouts: None,", + "after": "fn from(payment_reference: PaymentsMandateReference) -> Self {\n Self {\n payments: Some(payment_reference),\n payouts: None," + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts.rs::mod::validator", + "file": "crates/router/src/core/payouts.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub mod validator;", + "after_code": "pub mod validator;", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::validate_payout_status_against_not_allowed_statuses", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub(crate) fn validate_payout_status_against_not_allowed_statuses(\n payout_status: api_enums::PayoutStatus,\n not_allowed_statuses: &[api_enums::PayoutStatus],\n action: &'static str,\n) -> Result<(), errors::ApiErrorResponse> {\n fp_utils::when(not_allowed_statuses.contains(&payout_status), || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: format!(\n \"You cannot {action} this payout because it has status {payout_status}\",\n ),\n })\n })\n}", + "after_code": "pub(crate) fn validate_payout_status_against_not_allowed_statuses(\n payout_status: api_enums::PayoutStatus,\n not_allowed_statuses: &[api_enums::PayoutStatus],\n action: &'static str,\n) -> Result<(), errors::ApiErrorResponse> {\n fp_utils::when(not_allowed_statuses.contains(&payout_status), || {\n Err(errors::ApiErrorResponse::PreconditionFailed {\n message: format!(\n \"You cannot {action} this payout because it has status {payout_status}\",\n ),\n })\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::PaymentMethodUpdateInternal", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl From for PaymentMethodUpdateInternal {\n fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }\n}", + "after_code": "impl From for PaymentMethodUpdateInternal {\n fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethodNew", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct PaymentMethodNew {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}", + "after_code": "pub struct PaymentMethodNew {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use time::PrimitiveDateTime;", + "use serde::{de, Deserialize, Deserializer, Serialize};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use time::PrimitiveDateTime;", + "use masking::{ExposeInterface, Secret};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::struct::PaymentsMandateReferenceRecord", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_subtype: Option,\n pub original_payment_authorized_amount: Option,\n pub original_payment_authorized_currency: Option,\n pub mandate_metadata: Option,\n pub connector_mandate_status: Option,\n pub connector_mandate_request_reference_id: Option,\n}", + "after_code": "pub struct PaymentsMandateReferenceRecord {\n pub connector_mandate_id: String,\n pub payment_method_subtype: Option,\n pub original_payment_authorized_amount: Option,\n pub original_payment_authorized_currency: Option,\n pub mandate_metadata: Option,\n pub connector_mandate_status: Option,\n pub connector_mandate_request_reference_id: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};", + "use masking::{ExposeInterface, Secret};" + ], + "after_imports": [ + "use masking::{ExposeInterface, Secret};" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::should_call_payout_connector_create_customer", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn should_call_payout_connector_create_customer<'a>(\n state: &'a SessionState,\n connector: &'a api::ConnectorData,\n customer: &'a Option,\n connector_label: &'a str,\n) -> (bool, Option<&'a str>) {\n // Check if create customer is required for the connector\n match enums::PayoutConnectors::try_from(connector.connector_name) {\n Ok(connector) => {\n let connector_needs_customer = state\n .conf\n .connector_customer\n .payout_connector_list\n .contains(&connector);\n\n if connector_needs_customer {\n let connector_customer_details = customer.as_ref().and_then(|customer| {\n get_connector_customer_details_if_present(customer, connector_label)\n });\n let should_call_connector = connector_customer_details.is_none();\n (should_call_connector, connector_customer_details)\n } else {\n (false, None)\n }\n }\n _ => (false, None),\n }\n}", + "after_code": "pub fn should_call_payout_connector_create_customer<'a>(\n state: &'a SessionState,\n connector: &'a api::ConnectorData,\n customer: &'a Option,\n connector_label: &'a str,\n) -> (bool, Option<&'a str>) {\n // Check if create customer is required for the connector\n match enums::PayoutConnectors::try_from(connector.connector_name) {\n Ok(connector) => {\n let connector_needs_customer = state\n .conf\n .connector_customer\n .payout_connector_list\n .contains(&connector);\n\n if connector_needs_customer {\n let connector_customer_details = customer.as_ref().and_then(|customer| {\n get_connector_customer_details_if_present(customer, connector_label)\n });\n let should_call_connector = connector_customer_details.is_none();\n (should_call_connector, connector_customer_details)\n } else {\n (false, None)\n }\n }\n _ => (false, None),\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethodUpdateInternal", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub struct PaymentMethodUpdateInternal {\n metadata: Option,\n payment_method_data: Option,\n last_used_at: Option,\n network_transaction_id: Option,\n status: Option,\n locker_id: Option,\n network_token_requestor_reference_id: Option,\n payment_method: Option,\n connector_mandate_details: Option,\n updated_by: Option,\n payment_method_type: Option,\n payment_method_issuer: Option,\n last_modified: PrimitiveDateTime,\n network_token_locker_id: Option,\n network_token_payment_method_data: Option,\n transaction_flow: Option,\n scheme: Option,\n}", + "after_code": "pub struct PaymentMethodUpdateInternal {\n metadata: Option,\n payment_method_data: Option,\n last_used_at: Option,\n network_transaction_id: Option,\n status: Option,\n locker_id: Option,\n network_token_requestor_reference_id: Option,\n payment_method: Option,\n connector_mandate_details: Option,\n updated_by: Option,\n payment_method_type: Option,\n payment_method_issuer: Option,\n last_modified: PrimitiveDateTime,\n network_token_locker_id: Option,\n network_token_payment_method_data: Option,\n transaction_flow: Option,\n scheme: Option,\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use time::PrimitiveDateTime;", + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [ + "use time::PrimitiveDateTime;" + ] + }, + { + "id": "crates/router/src/core/payments/helpers.rs::function::validate_merchant_connector_ids_in_connector_mandate_details", + "file": "crates/router/src/core/payments/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn validate_merchant_connector_ids_in_connector_mandate_details(\n state: &SessionState,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: &api_models::payment_methods::PaymentsMandateReference,\n merchant_id: &id_type::MerchantId,\n card_network: Option,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let db = &*state.store;\n let merchant_connector_account_list = db\n .find_merchant_connector_account_by_merchant_id_and_disabled_list(\n &state.into(),\n merchant_id,\n true,\n key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let merchant_connector_account_details_hash_map: std::collections::HashMap<\n id_type::MerchantConnectorAccountId,\n domain::MerchantConnectorAccount,\n > = merchant_connector_account_list\n .iter()\n .map(|merchant_connector_account| {\n (\n merchant_connector_account.get_id(),\n merchant_connector_account.clone(),\n )\n })\n .collect();\n\n for (migrating_merchant_connector_id, migrating_connector_mandate_details) in\n connector_mandate_details.0.clone()\n {\n match (\n card_network.clone(),\n merchant_connector_account_details_hash_map.get(&migrating_merchant_connector_id),\n ) {\n (Some(enums::CardNetwork::Discover), Some(merchant_connector_account_details)) => {\n if let (\"cybersource\", None) = (\n merchant_connector_account_details.connector_name.as_str(),\n migrating_connector_mandate_details\n .original_payment_authorized_amount\n .zip(\n migrating_connector_mandate_details\n .original_payment_authorized_currency,\n ),\n ) {\n Err(errors::ApiErrorResponse::MissingRequiredFields {\n field_names: vec![\n \"original_payment_authorized_currency\",\n \"original_payment_authorized_amount\",\n ],\n })\n .attach_printable(format!(\n \"Invalid connector_mandate_details provided for connector {:?}\",\n migrating_merchant_connector_id\n ))?\n }\n }\n (_, Some(_)) => (),\n (_, None) => Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"merchant_connector_id\",\n })\n .attach_printable_lazy(|| {\n format!(\n \"{:?} invalid merchant connector id in connector_mandate_details\",\n migrating_merchant_connector_id\n )\n })?,\n }\n }\n Ok(())\n}", + "after_code": "pub async fn validate_merchant_connector_ids_in_connector_mandate_details(\n state: &SessionState,\n key_store: &domain::MerchantKeyStore,\n // connector_mandate_details: &api_models::payment_methods::PaymentsMandateReference,\n connector_mandate_details: &api_models::payment_methods::CommonMandateReference,\n merchant_id: &id_type::MerchantId,\n card_network: Option,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let db = &*state.store;\n let merchant_connector_account_list = db\n .find_merchant_connector_account_by_merchant_id_and_disabled_list(\n &state.into(),\n merchant_id,\n true,\n key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let merchant_connector_account_details_hash_map: std::collections::HashMap<\n id_type::MerchantConnectorAccountId,\n domain::MerchantConnectorAccount,\n > = merchant_connector_account_list\n .iter()\n .map(|merchant_connector_account| {\n (\n merchant_connector_account.get_id(),\n merchant_connector_account.clone(),\n )\n })\n .collect();\n\n if let Some(payment_mandate_reference) = &connector_mandate_details.payments {\n let payments_map = payment_mandate_reference.0.clone();\n for (migrating_merchant_connector_id, migrating_connector_mandate_details) in payments_map {\n match (\n card_network.clone(),\n merchant_connector_account_details_hash_map.get(&migrating_merchant_connector_id),\n ) {\n (Some(enums::CardNetwork::Discover), Some(merchant_connector_account_details)) => {\n if let (\"cybersource\", None) = (\n merchant_connector_account_details.connector_name.as_str(),\n migrating_connector_mandate_details\n .original_payment_authorized_amount\n .zip(\n migrating_connector_mandate_details\n .original_payment_authorized_currency,\n ),\n ) {\n return Err(errors::ApiErrorResponse::MissingRequiredFields {\n field_names: vec![\n \"original_payment_authorized_currency\",\n \"original_payment_authorized_amount\",\n ],\n })\n .attach_printable(format!(\n \"Invalid connector_mandate_details provided for connector {:?}\",\n migrating_merchant_connector_id\n ))?;\n }\n }\n (_, Some(_)) => (),\n (_, None) => {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"merchant_connector_id\",\n })\n .attach_printable_lazy(|| {\n format!(\n \"{:?} invalid merchant connector id in connector_mandate_details\",\n migrating_merchant_connector_id\n )\n })?\n }\n }\n }\n }\n Ok(())\n}", + "diff_span": { + "before": " state: &SessionState,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: &api_models::payment_methods::PaymentsMandateReference,\n merchant_id: &id_type::MerchantId,\n card_network: Option,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let db = &*state.store;\n let merchant_connector_account_list = db\n .find_merchant_connector_account_by_merchant_id_and_disabled_list(\n &state.into(),\n merchant_id,\n true,\n key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let merchant_connector_account_details_hash_map: std::collections::HashMap<\n id_type::MerchantConnectorAccountId,\n domain::MerchantConnectorAccount,\n > = merchant_connector_account_list\n .iter()\n .map(|merchant_connector_account| {\n (\n merchant_connector_account.get_id(),\n merchant_connector_account.clone(),\n )\n })\n .collect();\n\n for (migrating_merchant_connector_id, migrating_connector_mandate_details) in\n connector_mandate_details.0.clone()\n {\n match (\n card_network.clone(),\n merchant_connector_account_details_hash_map.get(&migrating_merchant_connector_id),\n ) {\n (Some(enums::CardNetwork::Discover), Some(merchant_connector_account_details)) => {\n if let (\"cybersource\", None) = (\n merchant_connector_account_details.connector_name.as_str(),\n migrating_connector_mandate_details\n .original_payment_authorized_amount\n .zip(\n migrating_connector_mandate_details\n .original_payment_authorized_currency,\n ),\n ) {\n Err(errors::ApiErrorResponse::MissingRequiredFields {\n field_names: vec![\n \"original_payment_authorized_currency\",\n \"original_payment_authorized_amount\",\n ],\n })\n .attach_printable(format!(\n \"Invalid connector_mandate_details provided for connector {:?}\",\n migrating_merchant_connector_id\n ))?\n }\n }\n (_, Some(_)) => (),\n (_, None) => Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"merchant_connector_id\",\n })\n .attach_printable_lazy(|| {\n format!(\n \"{:?} invalid merchant connector id in connector_mandate_details\",\n migrating_merchant_connector_id\n )\n })?,\n }\n }", + "after": " state: &SessionState,\n key_store: &domain::MerchantKeyStore,\n // connector_mandate_details: &api_models::payment_methods::PaymentsMandateReference,\n connector_mandate_details: &api_models::payment_methods::CommonMandateReference,\n merchant_id: &id_type::MerchantId,\n card_network: Option,\n) -> CustomResult<(), errors::ApiErrorResponse> {\n let db = &*state.store;\n let merchant_connector_account_list = db\n .find_merchant_connector_account_by_merchant_id_and_disabled_list(\n &state.into(),\n merchant_id,\n true,\n key_store,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::InternalServerError)?;\n\n let merchant_connector_account_details_hash_map: std::collections::HashMap<\n id_type::MerchantConnectorAccountId,\n domain::MerchantConnectorAccount,\n > = merchant_connector_account_list\n .iter()\n .map(|merchant_connector_account| {\n (\n merchant_connector_account.get_id(),\n merchant_connector_account.clone(),\n )\n })\n .collect();\n\n if let Some(payment_mandate_reference) = &connector_mandate_details.payments {\n let payments_map = payment_mandate_reference.0.clone();\n for (migrating_merchant_connector_id, migrating_connector_mandate_details) in payments_map {\n match (\n card_network.clone(),\n merchant_connector_account_details_hash_map.get(&migrating_merchant_connector_id),\n ) {\n (Some(enums::CardNetwork::Discover), Some(merchant_connector_account_details)) => {\n if let (\"cybersource\", None) = (\n merchant_connector_account_details.connector_name.as_str(),\n migrating_connector_mandate_details\n .original_payment_authorized_amount\n .zip(\n migrating_connector_mandate_details\n .original_payment_authorized_currency,\n ),\n ) {\n return Err(errors::ApiErrorResponse::MissingRequiredFields {\n field_names: vec![\n \"original_payment_authorized_currency\",\n \"original_payment_authorized_amount\",\n ],\n })\n .attach_printable(format!(\n \"Invalid connector_mandate_details provided for connector {:?}\",\n migrating_merchant_connector_id\n ))?;\n }\n }\n (_, Some(_)) => (),\n (_, None) => {\n return Err(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"merchant_connector_id\",\n })\n .attach_printable_lazy(|| {\n format!(\n \"{:?} invalid merchant connector id in connector_mandate_details\",\n migrating_merchant_connector_id\n )\n })?\n }\n }" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_list_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn payouts_list_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id_list: Option>,\n key_store: domain::MerchantKeyStore,\n constraints: payouts::PayoutListConstraints,\n) -> RouterResponse {\n validator::validate_payout_list_request(&constraints)?;\n let merchant_id = merchant_account.get_id();\n let db = state.store.as_ref();\n let payouts = helpers::filter_by_constraints(\n db,\n &constraints,\n merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n let payouts = core_utils::filter_objects_based_on_profile_id_list(profile_id_list, payouts);\n\n let mut pi_pa_tuple_vec = PayoutActionData::new();\n\n for payout in payouts {\n match db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_id,\n &utils::get_payout_attempt_id(payout.payout_id.clone(), payout.attempt_count),\n storage_enums::MerchantStorageScheme::PostgresOnly,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n {\n Ok(payout_attempt) => {\n let domain_customer = match payout.customer_id.clone() {\n #[cfg(all(any(feature = \"v1\", feature = \"v2\"), not(feature = \"customer_v2\")))]\n Some(customer_id) => db\n .find_customer_by_customer_id_merchant_id(\n &(&state).into(),\n &customer_id,\n merchant_id,\n &key_store,\n merchant_account.storage_scheme,\n )\n .await\n .map_err(|err| {\n let err_msg = format!(\n \"failed while fetching customer for customer_id - {:?}\",\n customer_id\n );\n logger::warn!(?err, err_msg);\n })\n .ok(),\n _ => None,\n };\n\n let payout_id_as_payment_id_type =\n common_utils::id_type::PaymentId::wrap(payout.payout_id.clone())\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n let payment_addr = payment_helpers::create_or_find_address_for_payment_by_request(\n &state,\n None,\n payout.address_id.as_deref(),\n merchant_id,\n payout.customer_id.as_ref(),\n &key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await\n .transpose()\n .and_then(|addr| {\n addr.map_err(|err| {\n let err_msg = format!(\n \"billing_address missing for address_id : {:?}\",\n payout.address_id\n );\n logger::warn!(?err, err_msg);\n })\n .ok()\n .as_ref()\n .map(hyperswitch_domain_models::address::Address::from)\n .map(payment_enums::Address::from)\n });\n\n pi_pa_tuple_vec.push((\n payout.to_owned(),\n payout_attempt.to_owned(),\n domain_customer,\n payment_addr,\n ));\n }\n Err(err) => {\n let err_msg = format!(\n \"failed while fetching payout_attempt for payout_id - {:?}\",\n payout.payout_id\n );\n logger::warn!(?err, err_msg);\n }\n }\n }\n\n let data: Vec = pi_pa_tuple_vec\n .into_iter()\n .map(ForeignFrom::foreign_from)\n .collect();\n\n Ok(services::ApplicationResponse::Json(\n api::PayoutListResponse {\n size: data.len(),\n data,\n total_count: None,\n },\n ))\n}", + "after_code": "pub async fn payouts_list_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n profile_id_list: Option>,\n key_store: domain::MerchantKeyStore,\n constraints: payouts::PayoutListConstraints,\n) -> RouterResponse {\n validator::validate_payout_list_request(&constraints)?;\n let merchant_id = merchant_account.get_id();\n let db = state.store.as_ref();\n let payouts = helpers::filter_by_constraints(\n db,\n &constraints,\n merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::PayoutNotFound)?;\n let payouts = core_utils::filter_objects_based_on_profile_id_list(profile_id_list, payouts);\n\n let mut pi_pa_tuple_vec = PayoutActionData::new();\n\n for payout in payouts {\n match db\n .find_payout_attempt_by_merchant_id_payout_attempt_id(\n merchant_id,\n &utils::get_payout_attempt_id(payout.payout_id.clone(), payout.attempt_count),\n storage_enums::MerchantStorageScheme::PostgresOnly,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n {\n Ok(payout_attempt) => {\n let domain_customer = match payout.customer_id.clone() {\n #[cfg(all(any(feature = \"v1\", feature = \"v2\"), not(feature = \"customer_v2\")))]\n Some(customer_id) => db\n .find_customer_by_customer_id_merchant_id(\n &(&state).into(),\n &customer_id,\n merchant_id,\n &key_store,\n merchant_account.storage_scheme,\n )\n .await\n .map_err(|err| {\n let err_msg = format!(\n \"failed while fetching customer for customer_id - {:?}\",\n customer_id\n );\n logger::warn!(?err, err_msg);\n })\n .ok(),\n _ => None,\n };\n\n let payout_id_as_payment_id_type =\n common_utils::id_type::PaymentId::wrap(payout.payout_id.clone())\n .change_context(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payout_id contains invalid data\".to_string(),\n })\n .attach_printable(\"Error converting payout_id to PaymentId type\")?;\n\n let payment_addr = payment_helpers::create_or_find_address_for_payment_by_request(\n &state,\n None,\n payout.address_id.as_deref(),\n merchant_id,\n payout.customer_id.as_ref(),\n &key_store,\n &payout_id_as_payment_id_type,\n merchant_account.storage_scheme,\n )\n .await\n .transpose()\n .and_then(|addr| {\n addr.map_err(|err| {\n let err_msg = format!(\n \"billing_address missing for address_id : {:?}\",\n payout.address_id\n );\n logger::warn!(?err, err_msg);\n })\n .ok()\n .as_ref()\n .map(hyperswitch_domain_models::address::Address::from)\n .map(payment_enums::Address::from)\n });\n\n pi_pa_tuple_vec.push((\n payout.to_owned(),\n payout_attempt.to_owned(),\n domain_customer,\n payment_addr,\n ));\n }\n Err(err) => {\n let err_msg = format!(\n \"failed while fetching payout_attempt for payout_id - {:?}\",\n payout.payout_id\n );\n logger::warn!(?err, err_msg);\n }\n }\n }\n\n let data: Vec = pi_pa_tuple_vec\n .into_iter()\n .map(ForeignFrom::foreign_from)\n .collect();\n\n Ok(services::ApplicationResponse::Json(\n api::PayoutListResponse {\n size: data.len(),\n data,\n total_count: None,\n },\n ))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::types::PayoutActionData;", + "use router_env::{instrument, logger, tracing, Env};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::types::PayoutActionData;", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_payout_link_db_entry", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn create_payout_link_db_entry(\n state: &SessionState,\n merchant_id: &common_utils::id_type::MerchantId,\n payout_link_data: &PayoutLinkData,\n return_url: Option,\n) -> RouterResult {\n let db: &dyn StorageInterface = &*state.store;\n\n let link_data = serde_json::to_value(payout_link_data)\n .map_err(|_| report!(errors::ApiErrorResponse::InternalServerError))\n .attach_printable(\"Failed to convert PayoutLinkData to Value\")?;\n\n let payout_link = GenericLinkNew {\n link_id: payout_link_data.payout_link_id.to_string(),\n primary_reference: payout_link_data.payout_id.to_string(),\n merchant_id: merchant_id.to_owned(),\n link_type: common_enums::GenericLinkType::PayoutLink,\n link_status: GenericLinkStatus::PayoutLink(PayoutLinkStatus::Initiated),\n link_data,\n url: payout_link_data.link.to_string().into(),\n return_url,\n expiry: common_utils::date_time::now()\n + Duration::seconds(payout_link_data.session_expiry.into()),\n ..Default::default()\n };\n\n db.insert_payout_link(payout_link)\n .await\n .to_duplicate_response(errors::ApiErrorResponse::GenericDuplicateError {\n message: \"payout link already exists\".to_string(),\n })\n}", + "after_code": "pub async fn create_payout_link_db_entry(\n state: &SessionState,\n merchant_id: &common_utils::id_type::MerchantId,\n payout_link_data: &PayoutLinkData,\n return_url: Option,\n) -> RouterResult {\n let db: &dyn StorageInterface = &*state.store;\n\n let link_data = serde_json::to_value(payout_link_data)\n .map_err(|_| report!(errors::ApiErrorResponse::InternalServerError))\n .attach_printable(\"Failed to convert PayoutLinkData to Value\")?;\n\n let payout_link = GenericLinkNew {\n link_id: payout_link_data.payout_link_id.to_string(),\n primary_reference: payout_link_data.payout_id.to_string(),\n merchant_id: merchant_id.to_owned(),\n link_type: common_enums::GenericLinkType::PayoutLink,\n link_status: GenericLinkStatus::PayoutLink(PayoutLinkStatus::Initiated),\n link_data,\n url: payout_link_data.link.to_string().into(),\n return_url,\n expiry: common_utils::date_time::now()\n + Duration::seconds(payout_link_data.session_expiry.into()),\n ..Default::default()\n };\n\n db.insert_payout_link(payout_link)\n .await\n .to_duplicate_response(errors::ApiErrorResponse::GenericDuplicateError {\n message: \"payout link already exists\".to_string(),\n })\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use error_stack::{report, ResultExt};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use time::Duration;" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use error_stack::{report, ResultExt};", + "use time::Duration;" + ] + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::save_payout_data_to_locker", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn save_payout_data_to_locker(\n _state: &SessionState,\n _payout_data: &mut PayoutData,\n _customer_id: &id_type::CustomerId,\n _payout_method_data: &api::PayoutMethodData,\n _connector_mandate_details: Option,\n _merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n todo!()\n}", + "after_code": "pub async fn save_payout_data_to_locker(\n _state: &SessionState,\n _payout_data: &mut PayoutData,\n _customer_id: &id_type::CustomerId,\n _payout_method_data: &api::PayoutMethodData,\n _connector_mandate_details: Option,\n _merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n todo!()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use super::PayoutData;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt, ValueExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ], + "after_imports": [ + "use super::PayoutData;", + "use common_utils::{\n crypto::Encryptable,\n encryption::Encryption,\n errors::CustomResult,\n ext_traits::{AsyncExt, StringExt},\n fp_utils, id_type, payout_method_utils as payout_additional, pii, type_name,\n types::{\n keymanager::{Identifier, KeyManagerState},\n MinorUnit, UnifiedCode, UnifiedMessage,\n },\n};", + "use crate::{\n consts,\n core::{\n errors::{self, RouterResult, StorageErrorExt},\n payment_methods::{\n cards,\n transformers::{DataDuplicationCheck, StoreCardReq, StoreGenericReq, StoreLockerReq},\n vault,\n },\n payments::{\n customers::get_connector_customer_details_if_present, helpers as payment_helpers,\n routing, CustomerDetails,\n },\n routing::TransactionData,\n utils as core_utils,\n },\n db::{storage::enums as storage_enums, StorageInterface},\n routes::{metrics, SessionState},\n services,\n types::{\n api::{self, enums as api_enums},\n domain::{self, types::AsyncLift},\n storage,\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};" + ] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::PayoutsMandateReference", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl std::ops::DerefMut for PayoutsMandateReference {\n fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }\n}", + "after_code": "impl std::ops::DerefMut for PayoutsMandateReference {\n fn deref_mut(&mut self) -> &mut Self::Target {\n &mut self.0\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethodUpdateInternal::function::apply_changeset", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn apply_changeset(self, source: PaymentMethod) -> PaymentMethod {\n let Self {\n metadata,\n payment_method_data,\n last_used_at,\n network_transaction_id,\n status,\n locker_id,\n network_token_requestor_reference_id,\n payment_method,\n connector_mandate_details,\n updated_by,\n payment_method_type,\n payment_method_issuer,\n last_modified,\n network_token_locker_id,\n network_token_payment_method_data,\n transaction_flow,\n scheme,\n } = self;\n\n PaymentMethod {\n customer_id: source.customer_id,\n merchant_id: source.merchant_id,\n payment_method_id: source.payment_method_id,\n accepted_currency: source.accepted_currency,\n scheme: scheme.or(source.scheme),\n token: source.token,\n cardholder_name: source.cardholder_name,\n issuer_name: source.issuer_name,\n issuer_country: source.issuer_country,\n payer_country: source.payer_country,\n is_stored: source.is_stored,\n swift_code: source.swift_code,\n direct_debit_token: source.direct_debit_token,\n created_at: source.created_at,\n last_modified,\n payment_method: payment_method.or(source.payment_method),\n payment_method_type: payment_method_type.or(source.payment_method_type),\n payment_method_issuer: payment_method_issuer.or(source.payment_method_issuer),\n payment_method_issuer_code: source.payment_method_issuer_code,\n metadata: metadata.map_or(source.metadata, |v| Some(v.into())),\n payment_method_data: payment_method_data.or(source.payment_method_data),\n locker_id: locker_id.or(source.locker_id),\n last_used_at: last_used_at.unwrap_or(source.last_used_at),\n connector_mandate_details: connector_mandate_details\n .or(source.connector_mandate_details),\n customer_acceptance: source.customer_acceptance,\n status: status.unwrap_or(source.status),\n network_transaction_id: network_transaction_id.or(source.network_transaction_id),\n client_secret: source.client_secret,\n payment_method_billing_address: source.payment_method_billing_address,\n updated_by: updated_by.or(source.updated_by),\n version: source.version,\n network_token_requestor_reference_id: network_token_requestor_reference_id\n .or(source.network_token_requestor_reference_id),\n network_token_locker_id: network_token_locker_id.or(source.network_token_locker_id),\n network_token_payment_method_data: network_token_payment_method_data\n .or(source.network_token_payment_method_data),\n transaction_flow: transaction_flow.or(source.transaction_flow),\n }\n }", + "after_code": "pub fn apply_changeset(self, source: PaymentMethod) -> PaymentMethod {\n let Self {\n metadata,\n payment_method_data,\n last_used_at,\n network_transaction_id,\n status,\n locker_id,\n network_token_requestor_reference_id,\n payment_method,\n connector_mandate_details,\n updated_by,\n payment_method_type,\n payment_method_issuer,\n last_modified,\n network_token_locker_id,\n network_token_payment_method_data,\n transaction_flow,\n scheme,\n } = self;\n\n PaymentMethod {\n customer_id: source.customer_id,\n merchant_id: source.merchant_id,\n payment_method_id: source.payment_method_id,\n accepted_currency: source.accepted_currency,\n scheme: scheme.or(source.scheme),\n token: source.token,\n cardholder_name: source.cardholder_name,\n issuer_name: source.issuer_name,\n issuer_country: source.issuer_country,\n payer_country: source.payer_country,\n is_stored: source.is_stored,\n swift_code: source.swift_code,\n direct_debit_token: source.direct_debit_token,\n created_at: source.created_at,\n last_modified,\n payment_method: payment_method.or(source.payment_method),\n payment_method_type: payment_method_type.or(source.payment_method_type),\n payment_method_issuer: payment_method_issuer.or(source.payment_method_issuer),\n payment_method_issuer_code: source.payment_method_issuer_code,\n metadata: metadata.map_or(source.metadata, |v| Some(v.into())),\n payment_method_data: payment_method_data.or(source.payment_method_data),\n locker_id: locker_id.or(source.locker_id),\n last_used_at: last_used_at.unwrap_or(source.last_used_at),\n connector_mandate_details: connector_mandate_details\n .or(source.connector_mandate_details),\n customer_acceptance: source.customer_acceptance,\n status: status.unwrap_or(source.status),\n network_transaction_id: network_transaction_id.or(source.network_transaction_id),\n client_secret: source.client_secret,\n payment_method_billing_address: source.payment_method_billing_address,\n updated_by: updated_by.or(source.updated_by),\n version: source.version,\n network_token_requestor_reference_id: network_token_requestor_reference_id\n .or(source.network_token_requestor_reference_id),\n network_token_locker_id: network_token_locker_id.or(source.network_token_locker_id),\n network_token_payment_method_data: network_token_payment_method_data\n .or(source.network_token_payment_method_data),\n transaction_flow: transaction_flow.or(source.transaction_flow),\n }\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use serde::{de, Deserialize, Deserializer, Serialize};" + ], + "after_imports": [] + }, + { + "id": "crates/router/src/core/payouts.rs::function::get_next_connector", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub fn get_next_connector(\n connectors: &mut IntoIter,\n) -> RouterResult {\n connectors\n .next()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector not found in connectors iterator\")\n}", + "after_code": "pub fn get_next_connector(\n connectors: &mut IntoIter,\n) -> RouterResult {\n connectors\n .next()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Connector not found in connectors iterator\")\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::complete_payout_quote_steps_if_required", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "async fn complete_payout_quote_steps_if_required(\n state: &SessionState,\n connector_data: &api::ConnectorData,\n router_data: &mut types::RouterData,\n) -> RouterResult<()> {\n if connector_data\n .connector_name\n .is_payout_quote_call_required()\n {\n let quote_router_data =\n types::PayoutsRouterData::foreign_from((router_data, router_data.request.clone()));\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoQuote,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n "e_router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n match router_data_resp.response.to_owned() {\n Ok(resp) => {\n router_data.quote_id = resp.connector_payout_id;\n }\n Err(_err) => {\n router_data.response = router_data_resp.response;\n }\n };\n }\n Ok(())\n}", + "after_code": "async fn complete_payout_quote_steps_if_required(\n state: &SessionState,\n connector_data: &api::ConnectorData,\n router_data: &mut types::RouterData,\n) -> RouterResult<()> {\n if connector_data\n .connector_name\n .is_payout_quote_call_required()\n {\n let quote_router_data =\n types::PayoutsRouterData::foreign_from((router_data, router_data.request.clone()));\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoQuote,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n "e_router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n match router_data_resp.response.to_owned() {\n Ok(resp) => {\n router_data.quote_id = resp.connector_payout_id;\n }\n Err(_err) => {\n router_data.response = router_data_resp.response;\n }\n };\n }\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_recipient", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn create_recipient(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n let customer_details = payout_data.customer_details.to_owned();\n let connector_name = connector_data.connector_name.to_string();\n\n // Create the connector label using {profile_id}_{connector_name}\n let connector_label = format!(\n \"{}_{}\",\n payout_data.profile_id.get_string_repr(),\n connector_name\n );\n let (should_call_connector, _connector_customer_id) =\n helpers::should_call_payout_connector_create_customer(\n state,\n connector_data,\n &customer_details,\n &connector_label,\n );\n if should_call_connector {\n // 1. Form router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoRecipient,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n match router_resp.response {\n Ok(recipient_create_data) => {\n let db = &*state.store;\n if let Some(customer) = customer_details {\n if let Some(updated_customer) =\n customers::update_connector_customer_in_customers(\n &connector_label,\n Some(&customer),\n &recipient_create_data.connector_payout_id.clone(),\n )\n .await\n {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"customer_v2\")\n ))]\n {\n let customer_id = customer.customer_id.to_owned();\n payout_data.customer_details = Some(\n db.update_customer_by_customer_id_merchant_id(\n &state.into(),\n customer_id,\n merchant_account.get_id().to_owned(),\n customer,\n updated_customer,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating customers in db\")?,\n );\n }\n\n #[cfg(all(feature = \"v2\", feature = \"customer_v2\"))]\n {\n let customer_id = customer.get_id().clone();\n payout_data.customer_details = Some(\n db.update_customer_by_global_id(\n &state.into(),\n &customer_id,\n customer,\n merchant_account.get_id(),\n updated_customer,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating customers in db\")?,\n );\n }\n }\n }\n\n // Add next step to ProcessTracker\n if recipient_create_data.should_add_next_step_to_process_tracker {\n add_external_account_addition_task(\n &*state.store,\n payout_data,\n common_utils::date_time::now().saturating_add(Duration::seconds(consts::STRIPE_ACCOUNT_ONBOARDING_DELAY_IN_SECONDS)),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while adding attach_payout_account_workflow workflow to process tracker\")?;\n\n // Update payout status in DB\n let status = recipient_create_data\n .status\n .unwrap_or(api_enums::PayoutStatus::RequiresVendorAccountCreation);\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data\n .payout_attempt\n .connector_payout_id\n .to_owned(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: recipient_create_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n\n // Helps callee functions skip the execution\n payout_data.should_terminate = true;\n } else if let Some(status) = recipient_create_data.status {\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data\n .payout_attempt\n .connector_payout_id\n .to_owned(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: recipient_create_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n }\n Err(err) => Err(errors::ApiErrorResponse::PayoutFailed {\n data: serde_json::to_value(err).ok(),\n })?,\n }\n }\n Ok(())\n}", + "after_code": "pub async fn create_recipient(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n key_store: &domain::MerchantKeyStore,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n let customer_details = payout_data.customer_details.to_owned();\n let connector_name = connector_data.connector_name.to_string();\n\n // Create the connector label using {profile_id}_{connector_name}\n let connector_label = format!(\n \"{}_{}\",\n payout_data.profile_id.get_string_repr(),\n connector_name\n );\n let (should_call_connector, _connector_customer_id) =\n helpers::should_call_payout_connector_create_customer(\n state,\n connector_data,\n &customer_details,\n &connector_label,\n );\n if should_call_connector {\n // 1. Form router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoRecipient,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n match router_resp.response {\n Ok(recipient_create_data) => {\n let db = &*state.store;\n if let Some(customer) = customer_details {\n if let Some(updated_customer) =\n customers::update_connector_customer_in_customers(\n &connector_label,\n Some(&customer),\n &recipient_create_data.connector_payout_id.clone(),\n )\n .await\n {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"customer_v2\")\n ))]\n {\n let customer_id = customer.customer_id.to_owned();\n payout_data.customer_details = Some(\n db.update_customer_by_customer_id_merchant_id(\n &state.into(),\n customer_id,\n merchant_account.get_id().to_owned(),\n customer,\n updated_customer,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating customers in db\")?,\n );\n }\n\n #[cfg(all(feature = \"v2\", feature = \"customer_v2\"))]\n {\n let customer_id = customer.get_id().clone();\n payout_data.customer_details = Some(\n db.update_customer_by_global_id(\n &state.into(),\n &customer_id,\n customer,\n merchant_account.get_id(),\n updated_customer,\n key_store,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating customers in db\")?,\n );\n }\n }\n }\n\n // Add next step to ProcessTracker\n if recipient_create_data.should_add_next_step_to_process_tracker {\n add_external_account_addition_task(\n &*state.store,\n payout_data,\n common_utils::date_time::now().saturating_add(Duration::seconds(consts::STRIPE_ACCOUNT_ONBOARDING_DELAY_IN_SECONDS)),\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while adding attach_payout_account_workflow workflow to process tracker\")?;\n\n // Update payout status in DB\n let status = recipient_create_data\n .status\n .unwrap_or(api_enums::PayoutStatus::RequiresVendorAccountCreation);\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data\n .payout_attempt\n .connector_payout_id\n .to_owned(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: recipient_create_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n\n // Helps callee functions skip the execution\n payout_data.should_terminate = true;\n } else if let Some(status) = recipient_create_data.status {\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data\n .payout_attempt\n .connector_payout_id\n .to_owned(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: recipient_create_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n }\n Err(err) => Err(errors::ApiErrorResponse::PayoutFailed {\n data: serde_json::to_value(err).ok(),\n })?,\n }\n }\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use time::Duration;" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use time::Duration;" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::complete_payout_retrieve", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn complete_payout_retrieve(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_call_type: api::ConnectorCallType,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n todo!()\n}", + "after_code": "pub async fn complete_payout_retrieve(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_call_type: api::ConnectorCallType,\n payout_data: &mut PayoutData,\n) -> RouterResult<()> {\n todo!()\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/router/src/core/payouts.rs::function::update_retrieve_payout_tracker", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn update_retrieve_payout_tracker(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n payout_data: &mut PayoutData,\n payout_router_data: &types::RouterData,\n) -> RouterResult<()> {\n let db = &*state.store;\n match payout_router_data.response.as_ref() {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n\n let updated_payout_attempt = if helpers::is_payout_err_state(status) {\n let (error_code, error_message) = (\n payout_response_data.error_code.clone(),\n payout_response_data.error_message.clone(),\n );\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code,\n error_message,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n }\n } else {\n storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n }\n };\n\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n Err(err) => {\n // log in case of error in retrieval\n logger::error!(\"Error in payout retrieval\");\n // show error in the response of sync\n payout_data.payout_attempt.error_code = Some(err.code.to_owned());\n payout_data.payout_attempt.error_message = Some(err.message.to_owned());\n }\n };\n Ok(())\n}", + "after_code": "pub async fn update_retrieve_payout_tracker(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n payout_data: &mut PayoutData,\n payout_router_data: &types::RouterData,\n) -> RouterResult<()> {\n let db = &*state.store;\n match payout_router_data.response.as_ref() {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n\n let updated_payout_attempt = if helpers::is_payout_err_state(status) {\n let (error_code, error_message) = (\n payout_response_data.error_code.clone(),\n payout_response_data.error_message.clone(),\n );\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code,\n error_message,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n }\n } else {\n storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n }\n };\n\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n payout_data.payouts = db\n .update_payout(\n &payout_data.payouts,\n storage::PayoutsUpdate::StatusUpdate { status },\n &payout_data.payout_attempt,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payouts in db\")?;\n }\n Err(err) => {\n // log in case of error in retrieval\n logger::error!(\"Error in payout retrieval\");\n // show error in the response of sync\n payout_data.payout_attempt.error_code = Some(err.code.to_owned());\n payout_data.payout_attempt.error_message = Some(err.message.to_owned());\n }\n };\n Ok(())\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262", + "before_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PaymentsMandateReferenceRecord,\n PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};" + ], + "after_imports": [ + "use diesel_models::{\n PaymentsMandateReference, PaymentsMandateReferenceRecord as PaymentsMandateReferenceRecordV2,\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n CommonMandateReference, PayoutsMandateReference, PayoutsMandateReferenceRecord,\n};", + "use router_env::{instrument, logger, tracing, Env};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/api_models/src/payment_methods.rs::struct::PayoutsMandateReference", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct PayoutsMandateReference(\n pub HashMap,\n);", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/api_models/src/payment_methods.rs::PaymentMethodMigrate::function::deserialize", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn deserialize(deserializer: D) -> Result\n where\n D: serde::Deserializer<'de>,\n {\n #[derive(Debug, serde::Deserialize)]\n struct InnerPaymentMethodMigrate {\n pub merchant_id: id_type::MerchantId,\n pub payment_method: Option,\n pub payment_method_type: Option,\n pub payment_method_issuer: Option,\n pub payment_method_issuer_code: Option,\n pub card: Option,\n pub network_token: Option,\n pub metadata: Option,\n pub customer_id: Option,\n pub card_network: Option,\n pub bank_transfer: Option,\n pub wallet: Option,\n pub payment_method_data: Option,\n pub billing: Option,\n pub connector_mandate_details: Option,\n pub network_transaction_id: Option,\n }\n\n let inner = InnerPaymentMethodMigrate::deserialize(deserializer)?;\n\n let connector_mandate_details =\n if let Some(connector_mandate_value) = inner.connector_mandate_details {\n if let Ok(common_mandate) = serde_json::from_value::(\n connector_mandate_value.clone(),\n ) {\n Some(common_mandate)\n } else if let Ok(payment_mandate_record) =\n serde_json::from_value::(connector_mandate_value)\n {\n Some(CommonMandateReference {\n payments: Some(payment_mandate_record),\n payouts: None,\n })\n } else {\n return Err(de::Error::custom(\"Faild to deserialize PaymentMethod_V2\"));\n }\n } else {\n None\n };\n\n Ok(Self {\n merchant_id: inner.merchant_id,\n payment_method: inner.payment_method,\n payment_method_type: inner.payment_method_type,\n payment_method_issuer: inner.payment_method_issuer,\n payment_method_issuer_code: inner.payment_method_issuer_code,\n card: inner.card,\n network_token: inner.network_token,\n metadata: inner.metadata,\n customer_id: inner.customer_id,\n card_network: inner.card_network,\n bank_transfer: inner.bank_transfer,\n wallet: inner.wallet,\n payment_method_data: inner.payment_method_data,\n billing: inner.billing,\n connector_mandate_details,\n network_transaction_id: inner.network_transaction_id,\n })\n }", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/api_models/src/payment_methods.rs::function::convert_to_common_reference", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub fn convert_to_common_reference(\n payments_reference: Option,\n) -> Option {\n payments_reference.map(|payments| CommonMandateReference {\n payments: Some(payments),\n payouts: None,\n })\n}", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/api_models/src/payment_methods.rs::struct::PayoutsMandateReferenceRecord", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct PayoutsMandateReferenceRecord {\n pub transfer_method_id: Option,\n}", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/api_models/src/payment_methods.rs::struct::CommonMandateReference", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct CommonMandateReference {\n pub payments: Option,\n pub payouts: Option,\n}", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/api_models/src/payment_methods.rs::function::convert_to_payments_reference", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub fn convert_to_payments_reference(\n common_mandate: Option,\n) -> Option {\n common_mandate.and_then(|cm| cm.payments)\n}", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/api_models/src/payment_methods.rs::PaymentMethodMigrate::struct::InnerPaymentMethodMigrate", + "file": "crates/api_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "struct InnerPaymentMethodMigrate {\n pub merchant_id: id_type::MerchantId,\n pub payment_method: Option,\n pub payment_method_type: Option,\n pub payment_method_issuer: Option,\n pub payment_method_issuer_code: Option,\n pub card: Option,\n pub network_token: Option,\n pub metadata: Option,\n pub customer_id: Option,\n pub card_network: Option,\n pub bank_transfer: Option,\n pub wallet: Option,\n pub payment_method_data: Option,\n pub billing: Option,\n pub connector_mandate_details: Option,\n pub network_transaction_id: Option,\n }", + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethod::struct::__InnerPaymentMethodData", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "removed", + "before_code": "pub struct __InnerPaymentMethodData {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethod::function::deserialize", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "removed", + "before_code": "pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error>\n where\n D: Deserializer<'de>,\n {\n #[derive(serde::Deserialize, Debug)]\n pub struct __InnerPaymentMethodData {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n }\n\n let mut deserialize_to_inner = __InnerPaymentMethodData::deserialize(deserializer)?;\n\n if let Some(connector_mandate_details) = deserialize_to_inner.connector_mandate_details {\n match serde_json::from_value::(\n connector_mandate_details.clone(),\n ) {\n Ok(common_mandate_reference) => {\n // let common_mandate_reference_value = serde_json::to_value(\n // common_mandate_reference,\n // )\n // .map_err(|serde_json_error| de::Error::custom(serde_json_error.to_string()))?;\n\n // deserialize_to_inner.connector_mandate_details =\n // Some(common_mandate_reference);\n\n Ok(Some(Self {\n customer_id: deserialize_to_inner.customer_id,\n merchant_id: deserialize_to_inner.merchant_id,\n created_at: deserialize_to_inner.created_at,\n last_modified: deserialize_to_inner.last_modified,\n payment_method_data: deserialize_to_inner.payment_method_data,\n locker_id: deserialize_to_inner.locker_id,\n last_used_at: deserialize_to_inner.last_used_at,\n connector_mandate_details: Some(common_mandate_reference),\n customer_acceptance: deserialize_to_inner.customer_acceptance,\n status: deserialize_to_inner.status,\n network_transaction_id: deserialize_to_inner.network_transaction_id,\n client_secret: deserialize_to_inner.client_secret,\n payment_method_billing_address: deserialize_to_inner.payment_method_billing_address,\n updated_by: deserialize_to_inner.updated_by,\n locker_fingerprint_id: deserialize_to_inner.locker_fingerprint_id,\n payment_method_type_v2: deserialize_to_inner.payment_method_type_v2,\n payment_method_subtype: deserialize_to_inner.payment_method_subtype,\n id: deserialize_to_inner.id,\n version: deserialize_to_inner.version,\n network_token_requestor_reference_id: deserialize_to_inner.network_token_requestor_reference_id,\n network_token_locker_id: deserialize_to_inner.network_token_locker_id,\n network_token_payment_method_data: deserialize_to_inner.network_token_payment_method_data,\n transaction_flow: deserialize_to_inner.transaction_flow,\n }))\n }\n Err(_) => {\n match serde_json::from_value::(\n connector_mandate_details,\n ) {\n Ok(payment_mandate_reference) => {\n let common_mandate_reference = CommonMandateReference {\n payments: Some(payment_mandate_reference),\n payouts: None,\n };\n \n // deserialize_to_inner.connector_mandate_details =\n // Some(common_mandate_reference);\n\n Ok(Some(Self {\n customer_id: deserialize_to_inner.customer_id,\n merchant_id: deserialize_to_inner.merchant_id,\n created_at: deserialize_to_inner.created_at,\n last_modified: deserialize_to_inner.last_modified,\n payment_method_data: deserialize_to_inner.payment_method_data,\n locker_id: deserialize_to_inner.locker_id,\n last_used_at: deserialize_to_inner.last_used_at,\n connector_mandate_details: Some(common_mandate_reference),\n customer_acceptance: deserialize_to_inner.customer_acceptance,\n status: deserialize_to_inner.status,\n network_transaction_id: deserialize_to_inner.network_transaction_id,\n client_secret: deserialize_to_inner.client_secret,\n payment_method_billing_address: deserialize_to_inner.payment_method_billing_address,\n updated_by: deserialize_to_inner.updated_by,\n locker_fingerprint_id: deserialize_to_inner.locker_fingerprint_id,\n payment_method_type_v2: deserialize_to_inner.payment_method_type_v2,\n payment_method_subtype: deserialize_to_inner.payment_method_subtype,\n id: deserialize_to_inner.id,\n version: deserialize_to_inner.version,\n network_token_requestor_reference_id: deserialize_to_inner.network_token_requestor_reference_id,\n network_token_locker_id: deserialize_to_inner.network_token_locker_id,\n network_token_payment_method_data: deserialize_to_inner.network_token_payment_method_data,\n transaction_flow: deserialize_to_inner.transaction_flow,\n }))\n }\n Err(_) => Err(de::Error::custom(\"Faild to deserialize PaymentMethod_V2\"))?,\n }\n }\n }\n } else {\n Err(de::Error::custom(\"Faild to deserialize PaymentMethod_V2\"))?\n }\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "3f008e7045bec0654fed8d784d3bea5131413262" + } + ] +} \ No newline at end of file