rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-31 10:06:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(merchant_account_v2): recreate id and remove deprecated fields from merchant account (#5493)

Browse Source 
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
This commit is contained in:
Narayan Bhat
2024-08-06 15:05:40 +05:30
committed by GitHub
parent 61a0cb3e1e
commit 49892b261e
26 changed files with 988 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
crates/router/src/utils.rs
View File

@ -51,7 +51,7 @@ use crate::{
core::{
authentication::types::ExternalThreeDSConnectorMetadata,
errors::{self, CustomResult, RouterResult, StorageErrorExt},
utils, webhooks as webhooks_core,
webhooks as webhooks_core,
},
logger,
routes::{metrics, SessionState},
@ -441,20 +441,14 @@ pub async fn get_mca_from_payment_intent(
}
}
None => {
let profile_id = match payment_intent.profile_id {
Some(profile_id) => profile_id,
None => utils::get_profile_id_from_business_details(
payment_intent.business_country,
payment_intent.business_label.as_ref(),
merchant_account,
payment_intent.profile_id.as_ref(),
db,
false,
)
.await
let profile_id = payment_intent
.profile_id
.as_ref()
.get_required_value("profile_id")
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("profile_id is not set in payment_intent")?,
};
.attach_printable("profile_id is not set in payment_intent")?
.clone();
#[cfg(all(
any(feature = "v1", feature = "v2"),
not(feature = "merchant_connector_account_v2")
@ -579,7 +573,17 @@ pub async fn get_mca_from_object_reference_id(
key_store: &domain::MerchantKeyStore,
) -> CustomResult<domain::MerchantConnectorAccount, errors::ApiErrorResponse> {
let db = &*state.store;
match merchant_account.default_profile.as_ref() {
#[cfg(all(
any(feature = "v1", feature = "v2"),
not(feature = "merchant_account_v2")
))]
let default_profile_id = merchant_account.default_profile.as_ref();
#[cfg(all(feature = "v2", feature = "merchant_account_v2"))]
let default_profile_id = Option::<&String>::None;
match default_profile_id {
Some(profile_id) => {
#[cfg(all(
any(feature = "v1", feature = "v2"),
@ -601,8 +605,8 @@ pub async fn get_mca_from_object_reference_id(
}
#[cfg(all(feature = "v2", feature = "merchant_connector_account_v2"))]
{
let _ = db;
let _ = profile_id;
let _db = db;
let _profile_id = profile_id;
todo!()
}
}