diff --git "a/diffs/pr_6708/e1af16e/diff.json" "b/diffs/pr_6708/e1af16e/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6708/e1af16e/diff.json" @@ -0,0 +1,518 @@ +{ + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920", + "pr_number": 6708, + "rust_files": [ + "crates/api_models/src/events/user.rs", + "crates/api_models/src/user.rs", + "crates/diesel_models/src/query/merchant_account.rs", + "crates/router/src/consts/user.rs", + "crates/router/src/core/user.rs", + "crates/router/src/db/kafka_store.rs", + "crates/router/src/db/merchant_account.rs", + "crates/router/src/routes/lock_utils.rs", + "crates/router/src/routes/user.rs", + "crates/router/src/types/domain/user.rs", + "crates/router/src/types/domain/user/decision_manager.rs", + "crates/router/src/types/transformers.rs", + "crates/router/src/utils/user.rs", + "crates/router/src/utils/user_role.rs", + "crates/router_env/src/logger/types.rs" + ], + "diffs": [ + { + "id": "crates/router/src/routes/lock_utils.rs::impl::ApiIdentifier", + "file": "crates/router/src/routes/lock_utils.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl From for ApiIdentifier {\n fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }\n}", + "after_code": "impl From for ApiIdentifier {\n fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgMerchantCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }\n}", + "diff_span": { + "before": " | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData", + "after": " | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgMerchantCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_merchant_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_single_merchant_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult {\n let org_id = get_single_org_id(state, user_role).await?;\n match user_role.entity_type {\n Some(EntityType::Tenant) | Some(EntityType::Organization) => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(&state.into(), &org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"Invalid Org Id\".to_string(),\n ))?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org_id\")?\n .get_id()\n .clone()),\n Some(EntityType::Merchant) | Some(EntityType::Profile) | None => user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"merchant_id not found\"),\n }\n}", + "after_code": "pub async fn get_single_merchant_id(\n state: &SessionState,\n user_role: &UserRole,\n org_id: &id_type::OrganizationId,\n) -> UserResult {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n match entity_type {\n EntityType::Tenant | EntityType::Organization => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(&state.into(), org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"Invalid Org Id\".to_string(),\n ))?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org_id\")?\n .get_id()\n .clone()),\n EntityType::Merchant | EntityType::Profile => user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"merchant_id not found\"),\n }\n}", + "diff_span": { + "before": " user_role: &UserRole,\n) -> UserResult {\n let org_id = get_single_org_id(state, user_role).await?;\n match user_role.entity_type {\n Some(EntityType::Tenant) | Some(EntityType::Organization) => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(&state.into(), &org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"Invalid Org Id\".to_string(),\n ))?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org_id\")?\n .get_id()\n .clone()),\n Some(EntityType::Merchant) | Some(EntityType::Profile) | None => user_role\n .merchant_id\n .clone()", + "after": " state: &SessionState,\n user_role: &UserRole,\n org_id: &id_type::OrganizationId,\n) -> UserResult {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n match entity_type {\n EntityType::Tenant | EntityType::Organization => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(&state.into(), org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"Invalid Org Id\".to_string(),\n ))?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org_id\")?\n .get_id()\n .clone()),\n EntityType::Merchant | EntityType::Profile => user_role\n .merchant_id\n .clone()" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/api_models/src/events/user.rs::VerifyTokenResponse::function::get_api_event_type", + "file": "crates/api_models/src/events/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }", + "after_code": "fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920", + "before_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, CreateTenantRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, UserOrgCreateRequest, VerifyEmailRequest,\n VerifyRecoveryCodeRequest, VerifyTotpRequest,\n};" + ], + "after_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, CreateTenantRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, UserOrgMerchantCreateRequest, VerifyEmailRequest,\n VerifyRecoveryCodeRequest, VerifyTotpRequest,\n};" + ] + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_org_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_single_org_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult {\n match user_role.entity_type {\n Some(EntityType::Tenant) => Ok(state\n .store\n .list_all_merchant_accounts(&state.into(), Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants to get the org id\")?\n .get_org_id()\n .clone()),\n Some(EntityType::Organization)\n | Some(EntityType::Merchant)\n | Some(EntityType::Profile)\n | None => user_role\n .org_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Org_id not found\"),\n }\n}", + "after_code": "pub async fn get_single_org_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult {\n match user_role.entity_type {\n Some(EntityType::Tenant) => Ok(state\n .store\n .list_merchant_and_org_ids(&state.into(), 1, 0)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants to get merchant or org id\")?\n .1),\n Some(EntityType::Organization)\n | Some(EntityType::Merchant)\n | Some(EntityType::Profile)\n | None => user_role\n .org_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Org_id not found\"),\n }\n}", + "diff_span": { + "before": " Some(EntityType::Tenant) => Ok(state\n .store\n .list_all_merchant_accounts(&state.into(), Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants to get the org id\")?\n .get_org_id()\n .clone()),\n Some(EntityType::Organization)\n | Some(EntityType::Merchant)", + "after": " Some(EntityType::Tenant) => Ok(state\n .store\n .list_merchant_and_org_ids(&state.into(), 1, 0)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants to get merchant or org id\")?\n .1),\n Some(EntityType::Organization)\n | Some(EntityType::Merchant)" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/routes/lock_utils.rs::ApiIdentifier::function::from", + "file": "crates/router/src/routes/lock_utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }", + "after_code": "fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgMerchantCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }", + "diff_span": { + "before": " | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData", + "after": " | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgMerchantCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::trait::MerchantAccountInterface", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "trait_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub trait MerchantAccountInterface\nwhere\n domain::MerchantAccount:\n Conversion,\n{\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult;\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError>;\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult;\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError>;\n}", + "after_code": "pub trait MerchantAccountInterface\nwhere\n domain::MerchantAccount:\n Conversion,\n{\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult;\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError>;\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult;\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_and_org_ids(\n &self,\n state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n >;\n}", + "diff_span": { + "before": "\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError>;\n}", + "after": "\n #[cfg(feature = \"olap\")]\n async fn list_merchant_and_org_ids(\n &self,\n state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n >;\n}" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router_env/src/logger/types.rs::enum::Flow", + "file": "crates/router_env/src/logger/types.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub enum Flow {\n /// Health check\n HealthCheck,\n /// Deep health Check\n DeepHealthCheck,\n /// Organization create flow\n OrganizationCreate,\n /// Organization retrieve flow\n OrganizationRetrieve,\n /// Organization update flow\n OrganizationUpdate,\n /// Merchants account create flow.\n MerchantsAccountCreate,\n /// Merchants account retrieve flow.\n MerchantsAccountRetrieve,\n /// Merchants account update flow.\n MerchantsAccountUpdate,\n /// Merchants account delete flow.\n MerchantsAccountDelete,\n /// Merchant Connectors create flow.\n MerchantConnectorsCreate,\n /// Merchant Connectors retrieve flow.\n MerchantConnectorsRetrieve,\n /// Merchant account list\n MerchantAccountList,\n /// Merchant Connectors update flow.\n MerchantConnectorsUpdate,\n /// Merchant Connectors delete flow.\n MerchantConnectorsDelete,\n /// Merchant Connectors list flow.\n MerchantConnectorsList,\n /// Merchant Transfer Keys\n MerchantTransferKey,\n /// ConfigKey create flow.\n ConfigKeyCreate,\n /// ConfigKey fetch flow.\n ConfigKeyFetch,\n /// ConfigKey Update flow.\n ConfigKeyUpdate,\n /// ConfigKey Delete flow.\n ConfigKeyDelete,\n /// Customers create flow.\n CustomersCreate,\n /// Customers retrieve flow.\n CustomersRetrieve,\n /// Customers update flow.\n CustomersUpdate,\n /// Customers delete flow.\n CustomersDelete,\n /// Customers get mandates flow.\n CustomersGetMandates,\n /// Create an Ephemeral Key.\n EphemeralKeyCreate,\n /// Delete an Ephemeral Key.\n EphemeralKeyDelete,\n /// Mandates retrieve flow.\n MandatesRetrieve,\n /// Mandates revoke flow.\n MandatesRevoke,\n /// Mandates list flow.\n MandatesList,\n /// Payment methods create flow.\n PaymentMethodsCreate,\n /// Payment methods migrate flow.\n PaymentMethodsMigrate,\n /// Payment methods list flow.\n PaymentMethodsList,\n /// Payment method save flow\n PaymentMethodSave,\n /// Customer payment methods list flow.\n CustomerPaymentMethodsList,\n /// List Customers for a merchant\n CustomersList,\n /// Retrieve countries and currencies for connector and payment method\n ListCountriesCurrencies,\n /// Payment method create collect link flow.\n PaymentMethodCollectLink,\n /// Payment methods retrieve flow.\n PaymentMethodsRetrieve,\n /// Payment methods update flow.\n PaymentMethodsUpdate,\n /// Payment methods delete flow.\n PaymentMethodsDelete,\n /// Default Payment method flow.\n DefaultPaymentMethodsSet,\n /// Payments create flow.\n PaymentsCreate,\n /// Payments Retrieve flow.\n PaymentsRetrieve,\n /// Payments Retrieve force sync flow.\n PaymentsRetrieveForceSync,\n /// Payments update flow.\n PaymentsUpdate,\n /// Payments confirm flow.\n PaymentsConfirm,\n /// Payments capture flow.\n PaymentsCapture,\n /// Payments cancel flow.\n PaymentsCancel,\n /// Payments approve flow.\n PaymentsApprove,\n /// Payments reject flow.\n PaymentsReject,\n /// Payments Session Token flow\n PaymentsSessionToken,\n /// Payments start flow.\n PaymentsStart,\n /// Payments list flow.\n PaymentsList,\n /// Payments filters flow\n PaymentsFilters,\n /// Payments aggregates flow\n PaymentsAggregate,\n /// Payments Create Intent flow\n PaymentsCreateIntent,\n /// Payments Get Intent flow\n PaymentsGetIntent,\n #[cfg(feature = \"payouts\")]\n /// Payouts create flow\n PayoutsCreate,\n #[cfg(feature = \"payouts\")]\n /// Payouts retrieve flow.\n PayoutsRetrieve,\n #[cfg(feature = \"payouts\")]\n /// Payouts update flow.\n PayoutsUpdate,\n /// Payouts confirm flow.\n PayoutsConfirm,\n #[cfg(feature = \"payouts\")]\n /// Payouts cancel flow.\n PayoutsCancel,\n #[cfg(feature = \"payouts\")]\n /// Payouts fulfill flow.\n PayoutsFulfill,\n #[cfg(feature = \"payouts\")]\n /// Payouts list flow.\n PayoutsList,\n #[cfg(feature = \"payouts\")]\n /// Payouts filter flow.\n PayoutsFilter,\n /// Payouts accounts flow.\n PayoutsAccounts,\n /// Payout link initiate flow\n PayoutLinkInitiate,\n /// Payments Redirect flow\n PaymentsRedirect,\n /// Payemnts Complete Authorize Flow\n PaymentsCompleteAuthorize,\n /// Refunds create flow.\n RefundsCreate,\n /// Refunds retrieve flow.\n RefundsRetrieve,\n /// Refunds retrieve force sync flow.\n RefundsRetrieveForceSync,\n /// Refunds update flow.\n RefundsUpdate,\n /// Refunds list flow.\n RefundsList,\n /// Refunds filters flow\n RefundsFilters,\n /// Refunds aggregates flow\n RefundsAggregate,\n // Retrieve forex flow.\n RetrieveForexFlow,\n /// Toggles recon service for a merchant.\n ReconMerchantUpdate,\n /// Recon token request flow.\n ReconTokenRequest,\n /// Initial request for recon service.\n ReconServiceRequest,\n /// Recon token verification flow\n ReconVerifyToken,\n /// Routing create flow,\n RoutingCreateConfig,\n /// Routing link config\n RoutingLinkConfig,\n /// Routing link config\n RoutingUnlinkConfig,\n /// Routing retrieve config\n RoutingRetrieveConfig,\n /// Routing retrieve active config\n RoutingRetrieveActiveConfig,\n /// Routing retrieve default config\n RoutingRetrieveDefaultConfig,\n /// Routing retrieve dictionary\n RoutingRetrieveDictionary,\n /// Routing update config\n RoutingUpdateConfig,\n /// Routing update default config\n RoutingUpdateDefaultConfig,\n /// Routing delete config\n RoutingDeleteConfig,\n /// Toggle dynamic routing\n ToggleDynamicRouting,\n /// Update dynamic routing config\n UpdateDynamicRoutingConfigs,\n /// Add record to blocklist\n AddToBlocklist,\n /// Delete record from blocklist\n DeleteFromBlocklist,\n /// List entries from blocklist\n ListBlocklist,\n /// Toggle blocklist for merchant\n ToggleBlocklistGuard,\n /// Incoming Webhook Receive\n IncomingWebhookReceive,\n /// Validate payment method flow\n ValidatePaymentMethod,\n /// API Key create flow\n ApiKeyCreate,\n /// API Key retrieve flow\n ApiKeyRetrieve,\n /// API Key update flow\n ApiKeyUpdate,\n /// API Key revoke flow\n ApiKeyRevoke,\n /// API Key list flow\n ApiKeyList,\n /// Dispute Retrieve flow\n DisputesRetrieve,\n /// Dispute List flow\n DisputesList,\n /// Dispute Filters flow\n DisputesFilters,\n /// Cards Info flow\n CardsInfo,\n /// Create File flow\n CreateFile,\n /// Delete File flow\n DeleteFile,\n /// Retrieve File flow\n RetrieveFile,\n /// Dispute Evidence submission flow\n DisputesEvidenceSubmit,\n /// Create Config Key flow\n CreateConfigKey,\n /// Attach Dispute Evidence flow\n AttachDisputeEvidence,\n /// Delete Dispute Evidence flow\n DeleteDisputeEvidence,\n /// Disputes aggregate flow\n DisputesAggregate,\n /// Retrieve Dispute Evidence flow\n RetrieveDisputeEvidence,\n /// Invalidate cache flow\n CacheInvalidate,\n /// Payment Link Retrieve flow\n PaymentLinkRetrieve,\n /// payment Link Initiate flow\n PaymentLinkInitiate,\n /// payment Link Initiate flow\n PaymentSecureLinkInitiate,\n /// Payment Link List flow\n PaymentLinkList,\n /// Payment Link Status\n PaymentLinkStatus,\n /// Create a profile\n ProfileCreate,\n /// Update a profile\n ProfileUpdate,\n /// Retrieve a profile\n ProfileRetrieve,\n /// Delete a profile\n ProfileDelete,\n /// List all the profiles for a merchant\n ProfileList,\n /// Different verification flows\n Verification,\n /// Rust locker migration\n RustLockerMigration,\n /// Gsm Rule Creation flow\n GsmRuleCreate,\n /// Gsm Rule Retrieve flow\n GsmRuleRetrieve,\n /// Gsm Rule Update flow\n GsmRuleUpdate,\n /// Apple pay certificates migration\n ApplePayCertificatesMigration,\n /// Gsm Rule Delete flow\n GsmRuleDelete,\n /// User Sign Up\n UserSignUp,\n /// User Sign Up\n UserSignUpWithMerchantId,\n /// User Sign In\n UserSignIn,\n /// User transfer key\n UserTransferKey,\n /// User connect account\n UserConnectAccount,\n /// Upsert Decision Manager Config\n DecisionManagerUpsertConfig,\n /// Delete Decision Manager Config\n DecisionManagerDeleteConfig,\n /// Retrieve Decision Manager Config\n DecisionManagerRetrieveConfig,\n /// Manual payment fulfillment acknowledgement\n FrmFulfillment,\n /// Change password flow\n ChangePassword,\n /// Signout flow\n Signout,\n /// Set Dashboard Metadata flow\n SetDashboardMetadata,\n /// Get Multiple Dashboard Metadata flow\n GetMultipleDashboardMetadata,\n /// Payment Connector Verify\n VerifyPaymentConnector,\n /// Internal user signup\n InternalUserSignup,\n /// Create tenant level user\n TenantUserCreate,\n /// Switch org\n SwitchOrg,\n /// Switch merchant v2\n SwitchMerchantV2,\n /// Switch profile\n SwitchProfile,\n /// Get permission info\n GetAuthorizationInfo,\n /// Get Roles info\n GetRolesInfo,\n /// Get Parent Group Info\n GetParentGroupInfo,\n /// List roles v2\n ListRolesV2,\n /// List invitable roles at entity level\n ListInvitableRolesAtEntityLevel,\n /// List updatable roles at entity level\n ListUpdatableRolesAtEntityLevel,\n /// Get role\n GetRole,\n /// Get parent info for role\n GetRoleV2,\n /// Get role from token\n GetRoleFromToken,\n /// Get resources and groups for role from token\n GetRoleFromTokenV2,\n /// Update user role\n UpdateUserRole,\n /// Create merchant account for user in a org\n UserMerchantAccountCreate,\n /// Create Org in a given tenancy\n UserOrgCreate,\n /// Generate Sample Data\n GenerateSampleData,\n /// Delete Sample Data\n DeleteSampleData,\n /// Get details of a user\n GetUserDetails,\n /// Get details of a user role in a merchant account\n GetUserRoleDetails,\n /// PaymentMethodAuth Link token create\n PmAuthLinkTokenCreate,\n /// PaymentMethodAuth Exchange token create\n PmAuthExchangeToken,\n /// Get reset password link\n ForgotPassword,\n /// Reset password using link\n ResetPassword,\n /// Force set or force change password\n RotatePassword,\n /// Invite multiple users\n InviteMultipleUser,\n /// Reinvite user\n ReInviteUser,\n /// Accept invite from email\n AcceptInviteFromEmail,\n /// Delete user role\n DeleteUserRole,\n /// Incremental Authorization flow\n PaymentsIncrementalAuthorization,\n /// Get action URL for connector onboarding\n GetActionUrl,\n /// Sync connector onboarding status\n SyncOnboardingStatus,\n /// Reset tracking id\n ResetTrackingId,\n /// Verify email Token\n VerifyEmail,\n /// Send verify email\n VerifyEmailRequest,\n /// Update user account details\n UpdateUserAccountDetails,\n /// Accept user invitation using entities\n AcceptInvitationsV2,\n /// Accept user invitation using entities before user login\n AcceptInvitationsPreAuth,\n /// Initiate external authentication for a payment\n PaymentsExternalAuthentication,\n /// Authorize the payment after external 3ds authentication\n PaymentsAuthorize,\n /// Create Role\n CreateRole,\n /// Update Role\n UpdateRole,\n /// User email flow start\n UserFromEmail,\n /// Begin TOTP\n TotpBegin,\n /// Reset TOTP\n TotpReset,\n /// Verify TOTP\n TotpVerify,\n /// Update TOTP secret\n TotpUpdate,\n /// Verify Access Code\n RecoveryCodeVerify,\n /// Generate or Regenerate recovery codes\n RecoveryCodesGenerate,\n /// Terminate two factor authentication\n TerminateTwoFactorAuth,\n /// Check 2FA status\n TwoFactorAuthStatus,\n /// Create user authentication method\n CreateUserAuthenticationMethod,\n /// Update user authentication method\n UpdateUserAuthenticationMethod,\n /// List user authentication methods\n ListUserAuthenticationMethods,\n /// Get sso auth url\n GetSsoAuthUrl,\n /// Signin with SSO\n SignInWithSso,\n /// Auth Select\n AuthSelect,\n /// List Orgs for user\n ListOrgForUser,\n /// List Merchants for user in org\n ListMerchantsForUserInOrg,\n /// List Profile for user in org and merchant\n ListProfileForUserInOrgAndMerchant,\n /// List Users in Org\n ListUsersInLineage,\n /// List invitations for user\n ListInvitationsForUser,\n /// List initial webhook delivery attempts\n WebhookEventInitialDeliveryAttemptList,\n /// List delivery attempts for a webhook event\n WebhookEventDeliveryAttemptList,\n /// Manually retry the delivery for a webhook event\n WebhookEventDeliveryRetry,\n /// Retrieve status of the Poll\n RetrievePollStatus,\n /// Toggles the extended card info feature in profile level\n ToggleExtendedCardInfo,\n /// Toggles the extended card info feature in profile level\n ToggleConnectorAgnosticMit,\n /// Get the extended card info associated to a payment_id\n GetExtendedCardInfo,\n /// Manually update the refund details like status, error code, error message etc.\n RefundsManualUpdate,\n /// Manually update the payment details like status, error code, error message etc.\n PaymentsManualUpdate,\n /// Dynamic Tax Calcultion\n SessionUpdateTaxCalculation,\n /// Payments confirm intent\n PaymentsConfirmIntent,\n /// Payments post session tokens flow\n PaymentsPostSessionTokens,\n /// Payments start redirection flow\n PaymentStartRedirection,\n}", + "after_code": "pub enum Flow {\n /// Health check\n HealthCheck,\n /// Deep health Check\n DeepHealthCheck,\n /// Organization create flow\n OrganizationCreate,\n /// Organization retrieve flow\n OrganizationRetrieve,\n /// Organization update flow\n OrganizationUpdate,\n /// Merchants account create flow.\n MerchantsAccountCreate,\n /// Merchants account retrieve flow.\n MerchantsAccountRetrieve,\n /// Merchants account update flow.\n MerchantsAccountUpdate,\n /// Merchants account delete flow.\n MerchantsAccountDelete,\n /// Merchant Connectors create flow.\n MerchantConnectorsCreate,\n /// Merchant Connectors retrieve flow.\n MerchantConnectorsRetrieve,\n /// Merchant account list\n MerchantAccountList,\n /// Merchant Connectors update flow.\n MerchantConnectorsUpdate,\n /// Merchant Connectors delete flow.\n MerchantConnectorsDelete,\n /// Merchant Connectors list flow.\n MerchantConnectorsList,\n /// Merchant Transfer Keys\n MerchantTransferKey,\n /// ConfigKey create flow.\n ConfigKeyCreate,\n /// ConfigKey fetch flow.\n ConfigKeyFetch,\n /// ConfigKey Update flow.\n ConfigKeyUpdate,\n /// ConfigKey Delete flow.\n ConfigKeyDelete,\n /// Customers create flow.\n CustomersCreate,\n /// Customers retrieve flow.\n CustomersRetrieve,\n /// Customers update flow.\n CustomersUpdate,\n /// Customers delete flow.\n CustomersDelete,\n /// Customers get mandates flow.\n CustomersGetMandates,\n /// Create an Ephemeral Key.\n EphemeralKeyCreate,\n /// Delete an Ephemeral Key.\n EphemeralKeyDelete,\n /// Mandates retrieve flow.\n MandatesRetrieve,\n /// Mandates revoke flow.\n MandatesRevoke,\n /// Mandates list flow.\n MandatesList,\n /// Payment methods create flow.\n PaymentMethodsCreate,\n /// Payment methods migrate flow.\n PaymentMethodsMigrate,\n /// Payment methods list flow.\n PaymentMethodsList,\n /// Payment method save flow\n PaymentMethodSave,\n /// Customer payment methods list flow.\n CustomerPaymentMethodsList,\n /// List Customers for a merchant\n CustomersList,\n /// Retrieve countries and currencies for connector and payment method\n ListCountriesCurrencies,\n /// Payment method create collect link flow.\n PaymentMethodCollectLink,\n /// Payment methods retrieve flow.\n PaymentMethodsRetrieve,\n /// Payment methods update flow.\n PaymentMethodsUpdate,\n /// Payment methods delete flow.\n PaymentMethodsDelete,\n /// Default Payment method flow.\n DefaultPaymentMethodsSet,\n /// Payments create flow.\n PaymentsCreate,\n /// Payments Retrieve flow.\n PaymentsRetrieve,\n /// Payments Retrieve force sync flow.\n PaymentsRetrieveForceSync,\n /// Payments update flow.\n PaymentsUpdate,\n /// Payments confirm flow.\n PaymentsConfirm,\n /// Payments capture flow.\n PaymentsCapture,\n /// Payments cancel flow.\n PaymentsCancel,\n /// Payments approve flow.\n PaymentsApprove,\n /// Payments reject flow.\n PaymentsReject,\n /// Payments Session Token flow\n PaymentsSessionToken,\n /// Payments start flow.\n PaymentsStart,\n /// Payments list flow.\n PaymentsList,\n /// Payments filters flow\n PaymentsFilters,\n /// Payments aggregates flow\n PaymentsAggregate,\n /// Payments Create Intent flow\n PaymentsCreateIntent,\n /// Payments Get Intent flow\n PaymentsGetIntent,\n #[cfg(feature = \"payouts\")]\n /// Payouts create flow\n PayoutsCreate,\n #[cfg(feature = \"payouts\")]\n /// Payouts retrieve flow.\n PayoutsRetrieve,\n #[cfg(feature = \"payouts\")]\n /// Payouts update flow.\n PayoutsUpdate,\n /// Payouts confirm flow.\n PayoutsConfirm,\n #[cfg(feature = \"payouts\")]\n /// Payouts cancel flow.\n PayoutsCancel,\n #[cfg(feature = \"payouts\")]\n /// Payouts fulfill flow.\n PayoutsFulfill,\n #[cfg(feature = \"payouts\")]\n /// Payouts list flow.\n PayoutsList,\n #[cfg(feature = \"payouts\")]\n /// Payouts filter flow.\n PayoutsFilter,\n /// Payouts accounts flow.\n PayoutsAccounts,\n /// Payout link initiate flow\n PayoutLinkInitiate,\n /// Payments Redirect flow\n PaymentsRedirect,\n /// Payemnts Complete Authorize Flow\n PaymentsCompleteAuthorize,\n /// Refunds create flow.\n RefundsCreate,\n /// Refunds retrieve flow.\n RefundsRetrieve,\n /// Refunds retrieve force sync flow.\n RefundsRetrieveForceSync,\n /// Refunds update flow.\n RefundsUpdate,\n /// Refunds list flow.\n RefundsList,\n /// Refunds filters flow\n RefundsFilters,\n /// Refunds aggregates flow\n RefundsAggregate,\n // Retrieve forex flow.\n RetrieveForexFlow,\n /// Toggles recon service for a merchant.\n ReconMerchantUpdate,\n /// Recon token request flow.\n ReconTokenRequest,\n /// Initial request for recon service.\n ReconServiceRequest,\n /// Recon token verification flow\n ReconVerifyToken,\n /// Routing create flow,\n RoutingCreateConfig,\n /// Routing link config\n RoutingLinkConfig,\n /// Routing link config\n RoutingUnlinkConfig,\n /// Routing retrieve config\n RoutingRetrieveConfig,\n /// Routing retrieve active config\n RoutingRetrieveActiveConfig,\n /// Routing retrieve default config\n RoutingRetrieveDefaultConfig,\n /// Routing retrieve dictionary\n RoutingRetrieveDictionary,\n /// Routing update config\n RoutingUpdateConfig,\n /// Routing update default config\n RoutingUpdateDefaultConfig,\n /// Routing delete config\n RoutingDeleteConfig,\n /// Toggle dynamic routing\n ToggleDynamicRouting,\n /// Update dynamic routing config\n UpdateDynamicRoutingConfigs,\n /// Add record to blocklist\n AddToBlocklist,\n /// Delete record from blocklist\n DeleteFromBlocklist,\n /// List entries from blocklist\n ListBlocklist,\n /// Toggle blocklist for merchant\n ToggleBlocklistGuard,\n /// Incoming Webhook Receive\n IncomingWebhookReceive,\n /// Validate payment method flow\n ValidatePaymentMethod,\n /// API Key create flow\n ApiKeyCreate,\n /// API Key retrieve flow\n ApiKeyRetrieve,\n /// API Key update flow\n ApiKeyUpdate,\n /// API Key revoke flow\n ApiKeyRevoke,\n /// API Key list flow\n ApiKeyList,\n /// Dispute Retrieve flow\n DisputesRetrieve,\n /// Dispute List flow\n DisputesList,\n /// Dispute Filters flow\n DisputesFilters,\n /// Cards Info flow\n CardsInfo,\n /// Create File flow\n CreateFile,\n /// Delete File flow\n DeleteFile,\n /// Retrieve File flow\n RetrieveFile,\n /// Dispute Evidence submission flow\n DisputesEvidenceSubmit,\n /// Create Config Key flow\n CreateConfigKey,\n /// Attach Dispute Evidence flow\n AttachDisputeEvidence,\n /// Delete Dispute Evidence flow\n DeleteDisputeEvidence,\n /// Disputes aggregate flow\n DisputesAggregate,\n /// Retrieve Dispute Evidence flow\n RetrieveDisputeEvidence,\n /// Invalidate cache flow\n CacheInvalidate,\n /// Payment Link Retrieve flow\n PaymentLinkRetrieve,\n /// payment Link Initiate flow\n PaymentLinkInitiate,\n /// payment Link Initiate flow\n PaymentSecureLinkInitiate,\n /// Payment Link List flow\n PaymentLinkList,\n /// Payment Link Status\n PaymentLinkStatus,\n /// Create a profile\n ProfileCreate,\n /// Update a profile\n ProfileUpdate,\n /// Retrieve a profile\n ProfileRetrieve,\n /// Delete a profile\n ProfileDelete,\n /// List all the profiles for a merchant\n ProfileList,\n /// Different verification flows\n Verification,\n /// Rust locker migration\n RustLockerMigration,\n /// Gsm Rule Creation flow\n GsmRuleCreate,\n /// Gsm Rule Retrieve flow\n GsmRuleRetrieve,\n /// Gsm Rule Update flow\n GsmRuleUpdate,\n /// Apple pay certificates migration\n ApplePayCertificatesMigration,\n /// Gsm Rule Delete flow\n GsmRuleDelete,\n /// User Sign Up\n UserSignUp,\n /// User Sign Up\n UserSignUpWithMerchantId,\n /// User Sign In\n UserSignIn,\n /// User transfer key\n UserTransferKey,\n /// User connect account\n UserConnectAccount,\n /// Upsert Decision Manager Config\n DecisionManagerUpsertConfig,\n /// Delete Decision Manager Config\n DecisionManagerDeleteConfig,\n /// Retrieve Decision Manager Config\n DecisionManagerRetrieveConfig,\n /// Manual payment fulfillment acknowledgement\n FrmFulfillment,\n /// Change password flow\n ChangePassword,\n /// Signout flow\n Signout,\n /// Set Dashboard Metadata flow\n SetDashboardMetadata,\n /// Get Multiple Dashboard Metadata flow\n GetMultipleDashboardMetadata,\n /// Payment Connector Verify\n VerifyPaymentConnector,\n /// Internal user signup\n InternalUserSignup,\n /// Create tenant level user\n TenantUserCreate,\n /// Switch org\n SwitchOrg,\n /// Switch merchant v2\n SwitchMerchantV2,\n /// Switch profile\n SwitchProfile,\n /// Get permission info\n GetAuthorizationInfo,\n /// Get Roles info\n GetRolesInfo,\n /// Get Parent Group Info\n GetParentGroupInfo,\n /// List roles v2\n ListRolesV2,\n /// List invitable roles at entity level\n ListInvitableRolesAtEntityLevel,\n /// List updatable roles at entity level\n ListUpdatableRolesAtEntityLevel,\n /// Get role\n GetRole,\n /// Get parent info for role\n GetRoleV2,\n /// Get role from token\n GetRoleFromToken,\n /// Get resources and groups for role from token\n GetRoleFromTokenV2,\n /// Update user role\n UpdateUserRole,\n /// Create merchant account for user in a org\n UserMerchantAccountCreate,\n /// Create Org in a given tenancy\n UserOrgMerchantCreate,\n /// Generate Sample Data\n GenerateSampleData,\n /// Delete Sample Data\n DeleteSampleData,\n /// Get details of a user\n GetUserDetails,\n /// Get details of a user role in a merchant account\n GetUserRoleDetails,\n /// PaymentMethodAuth Link token create\n PmAuthLinkTokenCreate,\n /// PaymentMethodAuth Exchange token create\n PmAuthExchangeToken,\n /// Get reset password link\n ForgotPassword,\n /// Reset password using link\n ResetPassword,\n /// Force set or force change password\n RotatePassword,\n /// Invite multiple users\n InviteMultipleUser,\n /// Reinvite user\n ReInviteUser,\n /// Accept invite from email\n AcceptInviteFromEmail,\n /// Delete user role\n DeleteUserRole,\n /// Incremental Authorization flow\n PaymentsIncrementalAuthorization,\n /// Get action URL for connector onboarding\n GetActionUrl,\n /// Sync connector onboarding status\n SyncOnboardingStatus,\n /// Reset tracking id\n ResetTrackingId,\n /// Verify email Token\n VerifyEmail,\n /// Send verify email\n VerifyEmailRequest,\n /// Update user account details\n UpdateUserAccountDetails,\n /// Accept user invitation using entities\n AcceptInvitationsV2,\n /// Accept user invitation using entities before user login\n AcceptInvitationsPreAuth,\n /// Initiate external authentication for a payment\n PaymentsExternalAuthentication,\n /// Authorize the payment after external 3ds authentication\n PaymentsAuthorize,\n /// Create Role\n CreateRole,\n /// Update Role\n UpdateRole,\n /// User email flow start\n UserFromEmail,\n /// Begin TOTP\n TotpBegin,\n /// Reset TOTP\n TotpReset,\n /// Verify TOTP\n TotpVerify,\n /// Update TOTP secret\n TotpUpdate,\n /// Verify Access Code\n RecoveryCodeVerify,\n /// Generate or Regenerate recovery codes\n RecoveryCodesGenerate,\n /// Terminate two factor authentication\n TerminateTwoFactorAuth,\n /// Check 2FA status\n TwoFactorAuthStatus,\n /// Create user authentication method\n CreateUserAuthenticationMethod,\n /// Update user authentication method\n UpdateUserAuthenticationMethod,\n /// List user authentication methods\n ListUserAuthenticationMethods,\n /// Get sso auth url\n GetSsoAuthUrl,\n /// Signin with SSO\n SignInWithSso,\n /// Auth Select\n AuthSelect,\n /// List Orgs for user\n ListOrgForUser,\n /// List Merchants for user in org\n ListMerchantsForUserInOrg,\n /// List Profile for user in org and merchant\n ListProfileForUserInOrgAndMerchant,\n /// List Users in Org\n ListUsersInLineage,\n /// List invitations for user\n ListInvitationsForUser,\n /// List initial webhook delivery attempts\n WebhookEventInitialDeliveryAttemptList,\n /// List delivery attempts for a webhook event\n WebhookEventDeliveryAttemptList,\n /// Manually retry the delivery for a webhook event\n WebhookEventDeliveryRetry,\n /// Retrieve status of the Poll\n RetrievePollStatus,\n /// Toggles the extended card info feature in profile level\n ToggleExtendedCardInfo,\n /// Toggles the extended card info feature in profile level\n ToggleConnectorAgnosticMit,\n /// Get the extended card info associated to a payment_id\n GetExtendedCardInfo,\n /// Manually update the refund details like status, error code, error message etc.\n RefundsManualUpdate,\n /// Manually update the payment details like status, error code, error message etc.\n PaymentsManualUpdate,\n /// Dynamic Tax Calcultion\n SessionUpdateTaxCalculation,\n /// Payments confirm intent\n PaymentsConfirmIntent,\n /// Payments post session tokens flow\n PaymentsPostSessionTokens,\n /// Payments start redirection flow\n PaymentStartRedirection,\n}", + "diff_span": { + "before": " UserMerchantAccountCreate,\n /// Create Org in a given tenancy\n UserOrgCreate,\n /// Generate Sample Data\n GenerateSampleData,", + "after": " UserMerchantAccountCreate,\n /// Create Org in a given tenancy\n UserOrgMerchantCreate,\n /// Generate Sample Data\n GenerateSampleData," + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/types/transformers.rs::impl::diesel_models::organization::OrganizationNew", + "file": "crates/router/src/types/transformers.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }\n}", + "after_code": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details,\n metadata,\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }\n}", + "diff_span": { + "before": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));", + "after": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details," + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::impl::MockDb", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl MerchantAccountInterface for MockDb {\n #[allow(clippy::panic)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n let account = Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?;\n accounts.push(account.clone());\n\n account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[allow(clippy::panic)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let accounts = self.merchant_accounts.lock().await;\n accounts\n .iter()\n .find(|account| account.get_id() == merchant_id)\n .cloned()\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n )))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let merchant_id = merchant_account.get_id().to_owned();\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_account.get_id())\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(\n Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?,\n );\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_id)\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(account.clone());\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let accounts = self.merchant_accounts.lock().await;\n let account = accounts\n .iter()\n .find(|account| {\n account\n .publishable_key\n .as_ref()\n .is_some_and(|key| key == publishable_key)\n })\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Publishable Key: {} not found\",\n publishable_key\n )))?;\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let merchant_account = account\n .clone()\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((merchant_account, key_store))\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account_update: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n Ok(accounts.iter_mut().fold(0, |acc, account| {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update.clone())\n .apply_changeset(account.clone());\n *account = update;\n acc + 1\n }))\n }\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts.retain(|x| x.get_id() != merchant_id);\n Ok(true)\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| account.organization_id == *organization_id)\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| merchant_ids.contains(account.get_id()))\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.unwrap_or(0).try_into().unwrap_or(0);\n let limit = limit.map_or(accounts.len(), |l| l.try_into().unwrap_or(accounts.len()));\n\n let filtered_accounts = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .cloned()\n .collect::>();\n\n let futures = filtered_accounts.into_iter().map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n\n futures::future::try_join_all(futures).await\n }\n}", + "after_code": "impl MerchantAccountInterface for MockDb {\n #[allow(clippy::panic)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n let account = Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?;\n accounts.push(account.clone());\n\n account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[allow(clippy::panic)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let accounts = self.merchant_accounts.lock().await;\n accounts\n .iter()\n .find(|account| account.get_id() == merchant_id)\n .cloned()\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n )))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let merchant_id = merchant_account.get_id().to_owned();\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_account.get_id())\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(\n Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?,\n );\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_id)\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(account.clone());\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let accounts = self.merchant_accounts.lock().await;\n let account = accounts\n .iter()\n .find(|account| {\n account\n .publishable_key\n .as_ref()\n .is_some_and(|key| key == publishable_key)\n })\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Publishable Key: {} not found\",\n publishable_key\n )))?;\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let merchant_account = account\n .clone()\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((merchant_account, key_store))\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account_update: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n Ok(accounts.iter_mut().fold(0, |acc, account| {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update.clone())\n .apply_changeset(account.clone());\n *account = update;\n acc + 1\n }))\n }\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts.retain(|x| x.get_id() != merchant_id);\n Ok(true)\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| account.organization_id == *organization_id)\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| merchant_ids.contains(account.get_id()))\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_and_org_ids(\n &self,\n _state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n > {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.try_into().unwrap_or(0);\n let limit = limit.try_into().unwrap_or(accounts.len());\n\n let merchant_and_org_ids = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .map(|account| (account.get_id().clone(), account.organization_id.clone()))\n .collect::>();\n\n Ok(merchant_and_org_ids)\n }\n}", + "diff_span": { + "before": "\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.unwrap_or(0).try_into().unwrap_or(0);\n let limit = limit.map_or(accounts.len(), |l| l.try_into().unwrap_or(accounts.len()));\n\n let filtered_accounts = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .cloned()\n .collect::>();\n\n let futures = filtered_accounts.into_iter().map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n\n futures::future::try_join_all(futures).await\n }\n}", + "after": "\n #[cfg(feature = \"olap\")]\n async fn list_merchant_and_org_ids(\n &self,\n _state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n > {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.try_into().unwrap_or(0);\n let limit = limit.try_into().unwrap_or(accounts.len());\n\n let merchant_and_org_ids = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .map(|account| (account.get_id().clone(), account.organization_id.clone()))\n .collect::>();\n\n Ok(merchant_and_org_ids)\n }\n}" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920", + "before_imports": [ + "use crate::{\n connection,\n core::errors::{self, CustomResult},\n db::merchant_key_store::MerchantKeyStoreInterface,\n types::{\n domain::{\n self,\n behaviour::{Conversion, ReverseConversion},\n },\n storage,\n },\n};", + "use diesel_models::MerchantAccountUpdateInternal;", + "use super::{MasterKeyInterface, MockDb, Store};", + "use futures::future::try_join_all;", + "use storage_impl::redis::cache::{self, CacheKind, ACCOUNTS_CACHE};" + ], + "after_imports": [ + "use storage_impl::redis::cache::{self, CacheKind, ACCOUNTS_CACHE};", + "use diesel_models::MerchantAccountUpdateInternal;", + "use super::{MasterKeyInterface, MockDb, Store};", + "use crate::{\n connection,\n core::errors::{self, CustomResult},\n db::merchant_key_store::MerchantKeyStoreInterface,\n types::{\n domain::{\n self,\n behaviour::{Conversion, ReverseConversion},\n },\n storage,\n },\n};" + ] + }, + { + "id": "crates/diesel_models/src/query/merchant_account.rs::MerchantAccount::function::list_all_merchant_accounts", + "file": "crates/diesel_models/src/query/merchant_account.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )\n .await\n }", + "after_code": "pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: u32,\n offset: u32,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n Some(i64::from(limit)),\n Some(i64::from(offset)),\n None,\n )\n .await\n }", + "diff_span": { + "before": "pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )", + "after": "pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: u32,\n offset: u32,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n Some(i64::from(limit)),\n Some(i64::from(offset)),\n None,\n )" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/diesel_models/src/query/merchant_account.rs::impl::MerchantAccount", + "file": "crates/diesel_models/src/query/merchant_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl MerchantAccount {\n pub async fn update(\n self,\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n match generics::generic_update_by_id::<::Table, _, _, _>(\n conn,\n self.get_id().to_owned(),\n merchant_account,\n )\n .await\n {\n Err(error) => match error.current_context() {\n errors::DatabaseError::NoFieldsToUpdate => Ok(self),\n _ => Err(error),\n },\n result => result,\n }\n }\n\n pub async fn update_with_specific_fields(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n generics::generic_update_with_unique_predicate_get_result::<\n ::Table,\n _,\n _,\n _,\n >(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n merchant_account,\n )\n .await\n }\n\n pub async fn delete_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_delete::<::Table, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_publishable_key(\n conn: &PgPooledConn,\n publishable_key: &str,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::publishable_key.eq(publishable_key.to_owned()),\n )\n .await\n }\n\n pub async fn list_by_organization_id(\n conn: &PgPooledConn,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl::organization_id.eq(organization_id.to_owned()),\n None,\n None,\n None,\n )\n .await\n }\n\n pub async fn list_multiple_merchant_accounts(\n conn: &PgPooledConn,\n merchant_ids: Vec,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(conn, dsl_identifier.eq_any(merchant_ids), None, None, None)\n .await\n }\n\n pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )\n .await\n }\n\n pub async fn update_all_merchant_accounts(\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult> {\n generics::generic_update_with_results::<::Table, _, _, _>(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n merchant_account,\n )\n .await\n }\n}", + "after_code": "impl MerchantAccount {\n pub async fn update(\n self,\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n match generics::generic_update_by_id::<::Table, _, _, _>(\n conn,\n self.get_id().to_owned(),\n merchant_account,\n )\n .await\n {\n Err(error) => match error.current_context() {\n errors::DatabaseError::NoFieldsToUpdate => Ok(self),\n _ => Err(error),\n },\n result => result,\n }\n }\n\n pub async fn update_with_specific_fields(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n generics::generic_update_with_unique_predicate_get_result::<\n ::Table,\n _,\n _,\n _,\n >(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n merchant_account,\n )\n .await\n }\n\n pub async fn delete_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_delete::<::Table, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_publishable_key(\n conn: &PgPooledConn,\n publishable_key: &str,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::publishable_key.eq(publishable_key.to_owned()),\n )\n .await\n }\n\n pub async fn list_by_organization_id(\n conn: &PgPooledConn,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl::organization_id.eq(organization_id.to_owned()),\n None,\n None,\n None,\n )\n .await\n }\n\n pub async fn list_multiple_merchant_accounts(\n conn: &PgPooledConn,\n merchant_ids: Vec,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(conn, dsl_identifier.eq_any(merchant_ids), None, None, None)\n .await\n }\n\n pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: u32,\n offset: u32,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n Some(i64::from(limit)),\n Some(i64::from(offset)),\n None,\n )\n .await\n }\n\n pub async fn update_all_merchant_accounts(\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult> {\n generics::generic_update_with_results::<::Table, _, _, _>(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n merchant_account,\n )\n .await\n }\n}", + "diff_span": { + "before": " pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )", + "after": " pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: u32,\n offset: u32,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n Some(i64::from(limit)),\n Some(i64::from(offset)),\n None,\n )" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/core/user.rs::function::list_orgs_for_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_orgs_for_user(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n let orgs = match role_info.get_entity_type() {\n EntityType::Tenant => {\n let key_manager_state = &(&state).into();\n state\n .store\n .list_all_merchant_accounts(key_manager_state, None, None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|merchant_account| merchant_account.get_org_id().to_owned())\n .collect::>()\n }\n EntityType::Organization | EntityType::Merchant | EntityType::Profile => state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.org_id)\n .collect::>(),\n };\n\n let resp = futures::future::try_join_all(\n orgs.iter()\n .map(|org_id| state.store.find_organization_by_org_id(org_id)),\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|org| user_api::ListOrgsForUserResponse {\n org_id: org.get_organization_id(),\n org_name: org.get_organization_name(),\n })\n .collect::>();\n\n if resp.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No orgs found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(resp))\n}", + "after_code": "pub async fn list_orgs_for_user(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n let orgs = match role_info.get_entity_type() {\n EntityType::Tenant => {\n let key_manager_state = &(&state).into();\n state\n .store\n .list_merchant_and_org_ids(key_manager_state, consts::user::ORG_LIST_LIMIT_FOR_TENANT, 0)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|(_, org_id)| org_id) // Extract the org_id from the tuple\n .collect::>()\n }\n EntityType::Organization | EntityType::Merchant | EntityType::Profile => state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.org_id)\n .collect::>(),\n };\n\n let resp = futures::future::try_join_all(\n orgs.iter()\n .map(|org_id| state.store.find_organization_by_org_id(org_id)),\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|org| user_api::ListOrgsForUserResponse {\n org_id: org.get_organization_id(),\n org_name: org.get_organization_name(),\n })\n .collect::>();\n\n if resp.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No orgs found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(resp))\n}", + "diff_span": { + "before": " state\n .store\n .list_all_merchant_accounts(key_manager_state, None, None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|merchant_account| merchant_account.get_org_id().to_owned())\n .collect::>()\n }", + "after": " state\n .store\n .list_merchant_and_org_ids(key_manager_state, consts::user::ORG_LIST_LIMIT_FOR_TENANT, 0)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|(_, org_id)| org_id) // Extract the org_id from the tuple\n .collect::>()\n }" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::impl::Store", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl MerchantAccountInterface for Store {\n #[instrument(skip_all)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n merchant_account\n .construct_new()\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let fetch_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n fetch_func()\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_id.to_owned().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n cache::get_or_populate_in_memory(\n self,\n merchant_id.get_string_repr(),\n fetch_func,\n &ACCOUNTS_CACHE,\n )\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n }\n\n #[instrument(skip_all)]\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let updated_merchant_account = Conversion::convert(this)\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .update(&conn, merchant_account.into())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n let updated_merchant_account = storage::MerchantAccount::update_with_specific_fields(\n &conn,\n merchant_id,\n merchant_account.into(),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let fetch_by_pub_key_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n\n storage::MerchantAccount::find_by_publishable_key(&conn, publishable_key)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let merchant_account;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n merchant_account = fetch_by_pub_key_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n merchant_account = cache::get_or_populate_in_memory(\n self,\n publishable_key,\n fetch_by_pub_key_func,\n &ACCOUNTS_CACHE,\n )\n .await?;\n }\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let domain_merchant_account = merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((domain_merchant_account, key_store))\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n use futures::future::try_join_all;\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_by_organization_id(&conn, organization_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores =\n try_join_all(encrypted_merchant_accounts.iter().map(|merchant_account| {\n self.get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &db_master_key,\n )\n }))\n .await?;\n\n let merchant_accounts = try_join_all(\n encrypted_merchant_accounts\n .into_iter()\n .zip(merchant_key_stores.iter())\n .map(|(merchant_account, key_store)| async {\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }),\n )\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[instrument(skip_all)]\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let is_deleted_func = || async {\n storage::MerchantAccount::delete_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let is_deleted;\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n is_deleted = is_deleted_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let merchant_account =\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n is_deleted = is_deleted_func().await?;\n\n publish_and_redact_merchant_account_cache(self, &merchant_account).await?;\n }\n\n Ok(is_deleted)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_multiple_merchant_accounts(&conn, merchant_ids)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n let db_master_key = self.get_master_key().to_vec().into();\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n Ok(merchant_accounts)\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n\n let db_func = || async {\n storage::MerchantAccount::update_all_merchant_accounts(\n &conn,\n MerchantAccountUpdateInternal::from(merchant_account),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let total;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n let ma = db_func().await?;\n total = ma.len();\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let ma = db_func().await?;\n publish_and_redact_all_merchant_account_cache(self, &ma).await?;\n total = ma.len();\n }\n\n Ok(total)\n }\n}", + "after_code": "impl MerchantAccountInterface for Store {\n #[instrument(skip_all)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n merchant_account\n .construct_new()\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let fetch_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n fetch_func()\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_id.to_owned().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n cache::get_or_populate_in_memory(\n self,\n merchant_id.get_string_repr(),\n fetch_func,\n &ACCOUNTS_CACHE,\n )\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n }\n\n #[instrument(skip_all)]\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let updated_merchant_account = Conversion::convert(this)\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .update(&conn, merchant_account.into())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n let updated_merchant_account = storage::MerchantAccount::update_with_specific_fields(\n &conn,\n merchant_id,\n merchant_account.into(),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let fetch_by_pub_key_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n\n storage::MerchantAccount::find_by_publishable_key(&conn, publishable_key)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let merchant_account;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n merchant_account = fetch_by_pub_key_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n merchant_account = cache::get_or_populate_in_memory(\n self,\n publishable_key,\n fetch_by_pub_key_func,\n &ACCOUNTS_CACHE,\n )\n .await?;\n }\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let domain_merchant_account = merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((domain_merchant_account, key_store))\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n use futures::future::try_join_all;\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_by_organization_id(&conn, organization_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores =\n try_join_all(encrypted_merchant_accounts.iter().map(|merchant_account| {\n self.get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &db_master_key,\n )\n }))\n .await?;\n\n let merchant_accounts = try_join_all(\n encrypted_merchant_accounts\n .into_iter()\n .zip(merchant_key_stores.iter())\n .map(|(merchant_account, key_store)| async {\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }),\n )\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[instrument(skip_all)]\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let is_deleted_func = || async {\n storage::MerchantAccount::delete_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let is_deleted;\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n is_deleted = is_deleted_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let merchant_account =\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n is_deleted = is_deleted_func().await?;\n\n publish_and_redact_merchant_account_cache(self, &merchant_account).await?;\n }\n\n Ok(is_deleted)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_multiple_merchant_accounts(&conn, merchant_ids)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_merchant_and_org_ids(\n &self,\n _state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n > {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let merchant_and_org_ids = encrypted_merchant_accounts\n .into_iter()\n .map(|merchant_account| {\n let merchant_id = merchant_account.get_id().clone();\n let org_id = merchant_account.organization_id;\n (merchant_id, org_id)\n })\n .collect();\n Ok(merchant_and_org_ids)\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n\n let db_func = || async {\n storage::MerchantAccount::update_all_merchant_accounts(\n &conn,\n MerchantAccountUpdateInternal::from(merchant_account),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let total;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n let ma = db_func().await?;\n total = ma.len();\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let ma = db_func().await?;\n publish_and_redact_all_merchant_account_cache(self, &ma).await?;\n total = ma.len();\n }\n\n Ok(total)\n }\n}", + "diff_span": { + "before": " #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n let db_master_key = self.get_master_key().to_vec().into();\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n Ok(merchant_accounts)\n }\n", + "after": " #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_merchant_and_org_ids(\n &self,\n _state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n > {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let merchant_and_org_ids = encrypted_merchant_accounts\n .into_iter()\n .map(|merchant_account| {\n let merchant_id = merchant_account.get_id().clone();\n let org_id = merchant_account.organization_id;\n (merchant_id, org_id)\n })\n .collect();\n Ok(merchant_and_org_ids)\n }\n" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/types/transformers.rs::diesel_models::organization::OrganizationNew::function::foreign_from", + "file": "crates/router/src/types/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }", + "after_code": "fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details,\n metadata,\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }", + "diff_span": { + "before": "fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));", + "after": "fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details," + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_merchant_id_and_profile_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub async fn get_single_merchant_id_and_profile_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult<(id_type::MerchantId, id_type::ProfileId)> {\n let merchant_id = get_single_merchant_id(state, user_role).await?;\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n let profile_id = match entity_type {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned()\n }\n EntityType::Profile => user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n };\n\n Ok((merchant_id, profile_id))\n}", + "after_code": "pub async fn get_single_merchant_id_and_profile_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult<(id_type::MerchantId, id_type::ProfileId)> {\n let org_id = get_single_org_id(state, user_role).await?;\n let merchant_id = get_single_merchant_id(state, user_role, &org_id).await?;\n let profile_id = get_single_profile_id(state, user_role, &merchant_id).await?;\n\n Ok((merchant_id, profile_id))\n}", + "diff_span": { + "before": " user_role: &UserRole,\n) -> UserResult<(id_type::MerchantId, id_type::ProfileId)> {\n let merchant_id = get_single_merchant_id(state, user_role).await?;\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n let profile_id = match entity_type {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned()\n }\n EntityType::Profile => user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n };\n\n Ok((merchant_id, profile_id))", + "after": " user_role: &UserRole,\n) -> UserResult<(id_type::MerchantId, id_type::ProfileId)> {\n let org_id = get_single_org_id(state, user_role).await?;\n let merchant_id = get_single_merchant_id(state, user_role, &org_id).await?;\n let profile_id = get_single_profile_id(state, user_role, &merchant_id).await?;\n\n Ok((merchant_id, profile_id))" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920", + "before_imports": [ + "use diesel_models::{\n enums::{UserRoleVersion, UserStatus},\n user_role::{UserRole, UserRoleUpdate},\n};", + "use common_utils::id_type;", + "use common_enums::{EntityType, PermissionGroup};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{UserRoleVersion, UserStatus},\n user_role::{UserRole, UserRoleUpdate},\n};", + "use common_utils::id_type;" + ] + }, + { + "id": "crates/router/src/utils/user.rs::function::create_merchant_account_request_for_org", + "file": "crates/router/src/utils/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn create_merchant_account_request_for_org(\n req: user_api::UserOrgCreateRequest,\n org: organization::Organization,\n) -> UserResult {\n let merchant_id = if matches!(env::which(), env::Env::Production) {\n id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone())?)?\n } else {\n id_type::MerchantId::new_from_unix_timestamp()\n };\n\n let company_name = domain::UserCompanyName::new(req.merchant_name.clone())?;\n Ok(api_models::admin::MerchantAccountCreate {\n merchant_id,\n metadata: None,\n locker_id: None,\n return_url: None,\n merchant_name: Some(Secret::new(company_name.get_secret())),\n webhook_details: None,\n publishable_key: None,\n organization_id: Some(org.get_organization_id()),\n merchant_details: None,\n routing_algorithm: None,\n parent_merchant_id: None,\n sub_merchants_enabled: None,\n frm_routing_algorithm: None,\n #[cfg(feature = \"payouts\")]\n payout_routing_algorithm: None,\n primary_business_details: None,\n payment_response_hash_key: None,\n enable_payment_response_hash: None,\n redirect_to_merchant_with_http_post: None,\n pm_collect_link_config: None,\n })\n}", + "after_code": "pub fn create_merchant_account_request_for_org(\n req: user_api::UserOrgMerchantCreateRequest,\n org: organization::Organization,\n) -> UserResult {\n let merchant_id = if matches!(env::which(), env::Env::Production) {\n id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone())?)?\n } else {\n id_type::MerchantId::new_from_unix_timestamp()\n };\n\n let company_name = domain::UserCompanyName::new(req.merchant_name.clone())?;\n Ok(api_models::admin::MerchantAccountCreate {\n merchant_id,\n metadata: None,\n locker_id: None,\n return_url: None,\n merchant_name: Some(Secret::new(company_name.get_secret())),\n webhook_details: None,\n publishable_key: None,\n organization_id: Some(org.get_organization_id()),\n merchant_details: None,\n routing_algorithm: None,\n parent_merchant_id: None,\n sub_merchants_enabled: None,\n frm_routing_algorithm: None,\n #[cfg(feature = \"payouts\")]\n payout_routing_algorithm: None,\n primary_business_details: None,\n payment_response_hash_key: None,\n enable_payment_response_hash: None,\n redirect_to_merchant_with_http_post: None,\n pm_collect_link_config: None,\n })\n}", + "diff_span": { + "before": "pub fn create_merchant_account_request_for_org(\n req: user_api::UserOrgCreateRequest,\n org: organization::Organization,\n) -> UserResult {", + "after": "pub fn create_merchant_account_request_for_org(\n req: user_api::UserOrgMerchantCreateRequest,\n org: organization::Organization,\n) -> UserResult {" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/core/user.rs::function::create_tenant_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn create_tenant_user(\n state: SessionState,\n request: user_api::CreateTenantRequest,\n) -> UserResponse<()> {\n let key_manager_state = &(&state).into();\n\n let existing_merchant = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found in the tenancy\")?;\n\n let new_user = domain::NewUser::try_from((request, existing_merchant))?;\n let mut store_user: storage_user::UserNew = new_user.clone().try_into()?;\n store_user.set_is_verified(true);\n\n state\n .global_store\n .insert_user(store_user)\n .await\n .map_err(|e| {\n if e.current_context().is_db_unique_violation() {\n e.change_context(UserErrors::UserExists)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })\n .map(domain::user::UserFromStorage::from)?;\n\n new_user\n .get_no_level_user_role(\n common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n UserStatus::Active,\n )\n .add_entity(domain::TenantLevel {\n tenant_id: state.tenant.tenant_id.clone(),\n })\n .insert_in_v2(&state)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn create_tenant_user(\n state: SessionState,\n request: user_api::CreateTenantRequest,\n) -> UserResponse<()> {\n let key_manager_state = &(&state).into();\n\n let (merchant_id, _) = state\n .store\n .list_merchant_and_org_ids(key_manager_state, 1, 0)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found in the tenancy\")?;\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while fetching the key store by merchant_id\")?;\n\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(key_manager_state, &merchant_id, &key_store)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while fetching the merchant_account by merchant_id\")?;\n\n let new_user = domain::NewUser::try_from((request, merchant_account))?;\n let mut store_user: storage_user::UserNew = new_user.clone().try_into()?;\n store_user.set_is_verified(true);\n\n state\n .global_store\n .insert_user(store_user)\n .await\n .map_err(|e| {\n if e.current_context().is_db_unique_violation() {\n e.change_context(UserErrors::UserExists)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })\n .map(domain::user::UserFromStorage::from)?;\n\n new_user\n .get_no_level_user_role(\n common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n UserStatus::Active,\n )\n .add_entity(domain::TenantLevel {\n tenant_id: state.tenant.tenant_id.clone(),\n })\n .insert_in_v2(&state)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " let key_manager_state = &(&state).into();\n\n let existing_merchant = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found in the tenancy\")?;\n\n let new_user = domain::NewUser::try_from((request, existing_merchant))?;\n let mut store_user: storage_user::UserNew = new_user.clone().try_into()?;\n store_user.set_is_verified(true);", + "after": " let key_manager_state = &(&state).into();\n\n let (merchant_id, _) = state\n .store\n .list_merchant_and_org_ids(key_manager_state, 1, 0)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found in the tenancy\")?;\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while fetching the key store by merchant_id\")?;\n\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(key_manager_state, &merchant_id, &key_store)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while fetching the merchant_account by merchant_id\")?;\n\n let new_user = domain::NewUser::try_from((request, merchant_account))?;\n let mut store_user: storage_user::UserNew = new_user.clone().try_into()?;\n store_user.set_is_verified(true);" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/types/domain/user/decision_manager.rs::JWTFlow::function::generate_jwt", + "file": "crates/router/src/types/domain/user/decision_manager.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn generate_jwt(\n self,\n state: &SessionState,\n next_flow: &NextFlow,\n user_role: &UserRole,\n ) -> UserResult> {\n let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let key_manager_state = &state.into();\n\n let merchant_account = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?;\n\n let merchant_id = merchant_account.get_id().to_owned();\n let org_id = merchant_account.get_org_id().to_owned();\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned();\n (org_id, merchant_id, profile_id)\n }\n _ => {\n let org_id = user_role\n .org_id\n .clone()\n .ok_or(report!(UserErrors::InternalServerError))\n .attach_printable(\"org_id not found\")?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(state, user_role)\n .await?;\n (org_id, merchant_id, profile_id)\n }\n };\n auth::AuthToken::new_token(\n next_flow.user.get_user_id().to_string(),\n merchant_id,\n user_role.role_id.clone(),\n &state.conf,\n org_id,\n profile_id,\n Some(user_role.tenant_id.clone()),\n )\n .await\n .map(|token| token.into())\n }", + "after_code": "pub async fn generate_jwt(\n self,\n state: &SessionState,\n next_flow: &NextFlow,\n user_role: &UserRole,\n ) -> UserResult> {\n let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let org_id = utils::user_role::get_single_org_id(state, user_role).await?;\n let merchant_id =\n utils::user_role::get_single_merchant_id(state, user_role, &org_id).await?;\n let profile_id =\n utils::user_role::get_single_profile_id(state, user_role, &merchant_id).await?;\n (org_id, merchant_id, profile_id)\n }\n _ => {\n let org_id = user_role\n .org_id\n .clone()\n .ok_or(report!(UserErrors::InternalServerError))\n .attach_printable(\"org_id not found\")?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(state, user_role)\n .await?;\n (org_id, merchant_id, profile_id)\n }\n };\n auth::AuthToken::new_token(\n next_flow.user.get_user_id().to_string(),\n merchant_id,\n user_role.role_id.clone(),\n &state.conf,\n org_id,\n profile_id,\n Some(user_role.tenant_id.clone()),\n )\n .await\n .map(|token| token.into())\n }", + "diff_span": { + "before": " let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let key_manager_state = &state.into();\n\n let merchant_account = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?;\n\n let merchant_id = merchant_account.get_id().to_owned();\n let org_id = merchant_account.get_org_id().to_owned();\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned();\n (org_id, merchant_id, profile_id)\n }", + "after": " let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let org_id = utils::user_role::get_single_org_id(state, user_role).await?;\n let merchant_id =\n utils::user_role::get_single_merchant_id(state, user_role, &org_id).await?;\n let profile_id =\n utils::user_role::get_single_profile_id(state, user_role, &merchant_id).await?;\n (org_id, merchant_id, profile_id)\n }" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/api_models/src/events/user.rs::impl::VerifyTokenResponse", + "file": "crates/api_models/src/events/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl ApiEventMetric for VerifyTokenResponse {\n fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }\n}", + "after_code": "impl ApiEventMetric for VerifyTokenResponse {\n fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920", + "before_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::VerifyTokenResponse;", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, CreateTenantRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, UserOrgCreateRequest, VerifyEmailRequest,\n VerifyRecoveryCodeRequest, VerifyTotpRequest,\n};" + ], + "after_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::VerifyTokenResponse;", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, CreateTenantRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, UserOrgMerchantCreateRequest, VerifyEmailRequest,\n VerifyRecoveryCodeRequest, VerifyTotpRequest,\n};" + ] + }, + { + "id": "crates/router/src/types/domain/user/decision_manager.rs::impl::JWTFlow", + "file": "crates/router/src/types/domain/user/decision_manager.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl JWTFlow {\n async fn is_required(\n &self,\n _user: &UserFromStorage,\n _state: &SessionState,\n ) -> UserResult {\n Ok(true)\n }\n\n pub async fn generate_jwt(\n self,\n state: &SessionState,\n next_flow: &NextFlow,\n user_role: &UserRole,\n ) -> UserResult> {\n let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let key_manager_state = &state.into();\n\n let merchant_account = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?;\n\n let merchant_id = merchant_account.get_id().to_owned();\n let org_id = merchant_account.get_org_id().to_owned();\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned();\n (org_id, merchant_id, profile_id)\n }\n _ => {\n let org_id = user_role\n .org_id\n .clone()\n .ok_or(report!(UserErrors::InternalServerError))\n .attach_printable(\"org_id not found\")?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(state, user_role)\n .await?;\n (org_id, merchant_id, profile_id)\n }\n };\n auth::AuthToken::new_token(\n next_flow.user.get_user_id().to_string(),\n merchant_id,\n user_role.role_id.clone(),\n &state.conf,\n org_id,\n profile_id,\n Some(user_role.tenant_id.clone()),\n )\n .await\n .map(|token| token.into())\n }\n}", + "after_code": "impl JWTFlow {\n async fn is_required(\n &self,\n _user: &UserFromStorage,\n _state: &SessionState,\n ) -> UserResult {\n Ok(true)\n }\n\n pub async fn generate_jwt(\n self,\n state: &SessionState,\n next_flow: &NextFlow,\n user_role: &UserRole,\n ) -> UserResult> {\n let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let org_id = utils::user_role::get_single_org_id(state, user_role).await?;\n let merchant_id =\n utils::user_role::get_single_merchant_id(state, user_role, &org_id).await?;\n let profile_id =\n utils::user_role::get_single_profile_id(state, user_role, &merchant_id).await?;\n (org_id, merchant_id, profile_id)\n }\n _ => {\n let org_id = user_role\n .org_id\n .clone()\n .ok_or(report!(UserErrors::InternalServerError))\n .attach_printable(\"org_id not found\")?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(state, user_role)\n .await?;\n (org_id, merchant_id, profile_id)\n }\n };\n auth::AuthToken::new_token(\n next_flow.user.get_user_id().to_string(),\n merchant_id,\n user_role.role_id.clone(),\n &state.conf,\n org_id,\n profile_id,\n Some(user_role.tenant_id.clone()),\n )\n .await\n .map(|token| token.into())\n }\n}", + "diff_span": { + "before": " let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let key_manager_state = &state.into();\n\n let merchant_account = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?;\n\n let merchant_id = merchant_account.get_id().to_owned();\n let org_id = merchant_account.get_org_id().to_owned();\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned();\n (org_id, merchant_id, profile_id)\n }", + "after": " let (org_id, merchant_id, profile_id) = match user_role.entity_type {\n Some(common_enums::EntityType::Tenant) => {\n let org_id = utils::user_role::get_single_org_id(state, user_role).await?;\n let merchant_id =\n utils::user_role::get_single_merchant_id(state, user_role, &org_id).await?;\n let profile_id =\n utils::user_role::get_single_profile_id(state, user_role, &merchant_id).await?;\n (org_id, merchant_id, profile_id)\n }" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/routes/user.rs::function::user_org_create", + "file": "crates/router/src/routes/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn user_org_create(\n state: web::Data,\n req: HttpRequest,\n json_payload: web::Json,\n) -> HttpResponse {\n let flow = Flow::UserOrgCreate;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, _auth: auth::UserFromToken, json_payload, _| {\n user_core::create_org_for_user(state, json_payload)\n },\n &auth::JWTAuth {\n permission: Permission::TenantAccountWrite,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}", + "after_code": "pub async fn user_org_create(\n state: web::Data,\n req: HttpRequest,\n json_payload: web::Json,\n) -> HttpResponse {\n let flow = Flow::UserOrgMerchantCreate;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, _auth: auth::UserFromToken, json_payload, _| {\n user_core::create_org_merchant_for_user(state, json_payload)\n },\n &auth::JWTAuth {\n permission: Permission::TenantAccountWrite,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}", + "diff_span": { + "before": " state: web::Data,\n req: HttpRequest,\n json_payload: web::Json,\n) -> HttpResponse {\n let flow = Flow::UserOrgCreate;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, _auth: auth::UserFromToken, json_payload, _| {\n user_core::create_org_for_user(state, json_payload)\n },\n &auth::JWTAuth {", + "after": " state: web::Data,\n req: HttpRequest,\n json_payload: web::Json,\n) -> HttpResponse {\n let flow = Flow::UserOrgMerchantCreate;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, _auth: auth::UserFromToken, json_payload, _| {\n user_core::create_org_merchant_for_user(state, json_payload)\n },\n &auth::JWTAuth {" + }, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/core/user.rs::function::create_org_merchant_for_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn create_org_merchant_for_user(\n state: SessionState,\n req: user_api::UserOrgMerchantCreateRequest,\n) -> UserResponse<()> {\n let db_organization = ForeignFrom::foreign_from(req.clone());\n let org: diesel_models::organization::Organization = state\n .store\n .insert_organization(db_organization)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let merchant_account_create_request =\n utils::user::create_merchant_account_request_for_org(req, org)?;\n\n super::admin::create_merchant_account(state.clone(), merchant_account_create_request)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while creating a merchant\")?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::list_merchant_and_org_ids", + "file": "crates/router/src/db/kafka_store.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn list_merchant_and_org_ids(\n &self,\n state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult, errors::StorageError>\n {\n self.diesel_store\n .list_merchant_and_org_ids(state, limit, offset)\n .await\n }", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/types/domain/user.rs::impl::diesel_models::organization::OrganizationNew", + "file": "crates/router/src/types/domain/user.rs", + "kind": "impl_item", + "status": "added", + "before_code": null, + "after_code": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::user::UserOrgMerchantCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgMerchantCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }\n}", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/consts/user.rs::const::ORG_LIST_LIMIT_FOR_TENANT", + "file": "crates/router/src/consts/user.rs", + "kind": "const_item", + "status": "added", + "before_code": null, + "after_code": "pub const ORG_LIST_LIMIT_FOR_TENANT: u32 = 20;", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/types/domain/user.rs::diesel_models::organization::OrganizationNew::function::foreign_from", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn foreign_from(item: api_models::user::UserOrgMerchantCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgMerchantCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/api_models/src/user.rs::struct::UserOrgMerchantCreateRequest", + "file": "crates/api_models/src/user.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct UserOrgMerchantCreateRequest {\n pub organization_name: String,\n pub organization_details: Option,\n pub metadata: Option,\n pub merchant_name: String,\n}", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::MockDb::function::list_merchant_and_org_ids", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn list_merchant_and_org_ids(\n &self,\n _state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n > {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.try_into().unwrap_or(0);\n let limit = limit.try_into().unwrap_or(accounts.len());\n\n let merchant_and_org_ids = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .map(|account| (account.get_id().clone(), account.organization_id.clone()))\n .collect::>();\n\n Ok(merchant_and_org_ids)\n }", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::Store::function::list_merchant_and_org_ids", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn list_merchant_and_org_ids(\n &self,\n _state: &KeyManagerState,\n limit: u32,\n offset: u32,\n ) -> CustomResult<\n Vec<(\n common_utils::id_type::MerchantId,\n common_utils::id_type::OrganizationId,\n )>,\n errors::StorageError,\n > {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let merchant_and_org_ids = encrypted_merchant_accounts\n .into_iter()\n .map(|merchant_account| {\n let merchant_id = merchant_account.get_id().clone();\n let org_id = merchant_account.organization_id;\n (merchant_id, org_id)\n })\n .collect();\n Ok(merchant_and_org_ids)\n }", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_profile_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn get_single_profile_id(\n state: &SessionState,\n user_role: &UserRole,\n merchant_id: &id_type::MerchantId,\n) -> UserResult {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n match entity_type {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned())\n }\n EntityType::Profile => user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"profile_id not found\"),\n }\n}", + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::Store::function::list_all_merchant_accounts", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "function_item", + "status": "removed", + "before_code": "async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n let db_master_key = self.get_master_key().to_vec().into();\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n Ok(merchant_accounts)\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/core/user.rs::function::create_org_for_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "removed", + "before_code": "pub async fn create_org_for_user(\n state: SessionState,\n req: user_api::UserOrgCreateRequest,\n) -> UserResponse<()> {\n let db_organization = ForeignFrom::foreign_from(req.clone());\n let org: diesel_models::organization::Organization = state\n .store\n .insert_organization(db_organization)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let merchant_account_create_request =\n utils::user::create_merchant_account_request_for_org(req, org)?;\n\n super::admin::create_merchant_account(state.clone(), merchant_account_create_request)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while creating a merchant\")?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": null, + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/api_models/src/user.rs::struct::UserOrgCreateRequest", + "file": "crates/api_models/src/user.rs", + "kind": "struct_item", + "status": "removed", + "before_code": "pub struct UserOrgCreateRequest {\n pub organization_name: String,\n pub organization_details: Option,\n pub metadata: Option,\n pub merchant_name: String,\n}", + "after_code": null, + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::list_all_merchant_accounts", + "file": "crates/router/src/db/kafka_store.rs", + "kind": "function_item", + "status": "removed", + "before_code": "async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n self.diesel_store\n .list_all_merchant_accounts(state, limit, offset)\n .await\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + }, + { + "id": "crates/router/src/db/merchant_account.rs::MockDb::function::list_all_merchant_accounts", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "function_item", + "status": "removed", + "before_code": "async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.unwrap_or(0).try_into().unwrap_or(0);\n let limit = limit.map_or(accounts.len(), |l| l.try_into().unwrap_or(accounts.len()));\n\n let filtered_accounts = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .cloned()\n .collect::>();\n\n let futures = filtered_accounts.into_iter().map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n\n futures::future::try_join_all(futures).await\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "e1af16e985c992c9b40355933f6383f6c65e1920" + } + ] +} \ No newline at end of file