Add files using upload-large-folder tool

diffs/pr_10022/1ed3c7c/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "1ed3c7cd2cc15cf8aff05d8f5405791ed5712ff5",
+  "pr_number": 10022,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10022/3c8aa82/diff.json

@@ -0,0 +1,40 @@
+{
+  "commit_sha": "3c8aa82b325254e49bf34a8b072ac2424ff8c096",
+  "pr_number": 10022,
+  "rust_files": [
+    "crates/openapi/src/openapi.rs",
+    "crates/openapi/src/routes/routing.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/openapi/src/routes/routing.rs::function::create_success_based_routing",
+      "file": "crates/openapi/src/routes/routing.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "pub async fn create_success_based_routing() {}",
+      "diff_span": null,
+      "commit_sha": "3c8aa82b325254e49bf34a8b072ac2424ff8c096"
+    },
+    {
+      "id": "crates/openapi/src/routes/routing.rs::function::create_contract_based_routing_setup_config",
+      "file": "crates/openapi/src/routes/routing.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "pub async fn create_contract_based_routing_setup_config() {}",
+      "diff_span": null,
+      "commit_sha": "3c8aa82b325254e49bf34a8b072ac2424ff8c096"
+    },
+    {
+      "id": "crates/openapi/src/routes/routing.rs::function::create_elimination_routing",
+      "file": "crates/openapi/src/routes/routing.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "pub async fn create_elimination_routing() {}",
+      "diff_span": null,
+      "commit_sha": "3c8aa82b325254e49bf34a8b072ac2424ff8c096"
+    }
+  ]
+}

diffs/pr_10022/4326d9f/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "4326d9f6aa1c847ce473b16e13b8f43c02fb3263",
+  "pr_number": 10022,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10022/75fa6b0/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "75fa6b097d03d50928ecff2072cf2bc8846f33da",
+  "pr_number": 10022,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10022/770eec2/diff.json

@@ -0,0 +1,20 @@
+{
+  "commit_sha": "770eec2a47d7904321e559837500b472302bf167",
+  "pr_number": 10022,
+  "rust_files": [
+    "crates/openapi/src/openapi.rs",
+    "crates/openapi/src/routes/routing.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/openapi/src/routes/routing.rs::function::create_contract_based_routing_setup_config",
+      "file": "crates/openapi/src/routes/routing.rs",
+      "kind": "function_item",
+      "status": "removed",
+      "before_code": "pub async fn create_contract_based_routing_setup_config() {}",
+      "after_code": null,
+      "diff_span": null,
+      "commit_sha": "770eec2a47d7904321e559837500b472302bf167"
+    }
+  ]
+}

diffs/pr_10022/7dcd64c/diff.json

@@ -0,0 +1,8 @@
+{
+  "commit_sha": "7dcd64c81c295d822a507ccf7a83c7515e64039d",
+  "pr_number": 10022,
+  "rust_files": [
+    "crates/openapi/src/routes/routing.rs"
+  ],
+  "diffs": []
+}

diffs/pr_10022/c03fd61/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "c03fd61b7254912997c8ba44f144f52fe64b90cb",
+  "pr_number": 10022,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10022/c7c1a92/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "c7c1a9233612a76f244a2bda4a8c2c06b3e5be58",
+  "pr_number": 10022,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10022/da6581b/diff.json

@@ -0,0 +1,8 @@
+{
+  "commit_sha": "da6581b27b21506c18fb771186c9a181d778f78f",
+  "pr_number": 10022,
+  "rust_files": [
+    "crates/openapi/src/routes/routing.rs"
+  ],
+  "diffs": []
+}

diffs/pr_10077/1e4c6b1/diff.json

@@ -0,0 +1,25 @@
+{
+  "commit_sha": "1e4c6b146ecfbe51074fc4eb393189bdb86a56b0",
+  "pr_number": 10077,
+  "rust_files": [
+    "crates/diesel_models/src/schema_v2.rs",
+    "crates/router/src/core/payments/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_authorize",
+      "file": "crates/router/src/core/payments/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn construct_payment_router_data_for_authorize<'a>(\n    state: &'a SessionState,\n    payment_data: hyperswitch_domain_models::payments::PaymentConfirmData<api::Authorize>,\n    connector_id: &str,\n    merchant_context: &domain::MerchantContext,\n    customer: &'a Option<domain::Customer>,\n    merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n    _merchant_recipient_data: Option<types::MerchantRecipientData>,\n    header_payload: Option<hyperswitch_domain_models::payments::HeaderPayload>,\n) -> RouterResult<types::PaymentsAuthorizeRouterData> {\n    use masking::ExposeOptionInterface;\n\n    fp_utils::when(merchant_connector_account.is_disabled(), || {\n        Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n    })?;\n\n    let auth_type = merchant_connector_account\n        .get_connector_account_details()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n    // TODO: Take Globalid and convert to connector reference id\n    let customer_id = customer\n        .to_owned()\n        .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n        .transpose()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\n            \"Invalid global customer generated, not able to convert to reference id\",\n        )?;\n\n    let connector_customer_id =\n        payment_data.get_connector_customer_id(customer.as_ref(), merchant_connector_account);\n\n    let payment_method = payment_data.payment_attempt.payment_method_type;\n\n    let router_base_url = &state.base_url;\n    let attempt = &payment_data.payment_attempt;\n\n    let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n        router_base_url,\n        attempt,\n        connector_id,\n        None,\n    ));\n\n    let webhook_url = match merchant_connector_account {\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n            merchant_connector_account,\n        ) => Some(helpers::create_webhook_url(\n            router_base_url,\n            &attempt.merchant_id,\n            merchant_connector_account.get_id().get_string_repr(),\n        )),\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n            payment_data.webhook_url\n        }\n    };\n\n    let router_return_url = payment_data\n        .payment_intent\n        .create_finish_redirection_url(\n            router_base_url,\n            merchant_context\n                .get_merchant_account()\n                .publishable_key\n                .as_ref(),\n        )\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Unable to construct finish redirection url\")?\n        .to_string();\n\n    let connector_request_reference_id = payment_data\n        .payment_attempt\n        .connector_request_reference_id\n        .clone()\n        .ok_or(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n    let email = customer\n        .as_ref()\n        .and_then(|customer| customer.email.clone())\n        .map(pii::Email::from);\n\n    let browser_info = payment_data\n        .payment_attempt\n        .browser_info\n        .clone()\n        .map(types::BrowserInformation::from);\n    let additional_payment_method_data: Option<api_models::payments::AdditionalPaymentData> =\n            payment_data.payment_attempt\n                .payment_method_data\n                .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n                .transpose()\n                .change_context(errors::ApiErrorResponse::InternalServerError)\n                .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n\n    let connector_metadata = payment_data.payment_intent.connector_metadata.clone();\n\n    let order_category = connector_metadata.as_ref().and_then(|cm| {\n        cm.noon\n            .as_ref()\n            .and_then(|noon| noon.order_category.clone())\n    });\n\n    // TODO: few fields are repeated in both routerdata and request\n    let request = types::PaymentsAuthorizeData {\n        payment_method_data: payment_data\n            .payment_method_data\n            .get_required_value(\"payment_method_data\")?,\n        setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n        mandate_id: payment_data.mandate_data.clone(),\n        off_session: None,\n        setup_mandate_details: None,\n        confirm: true,\n        statement_descriptor_suffix: None,\n        statement_descriptor: None,\n        capture_method: Some(payment_data.payment_intent.capture_method),\n        amount: payment_data\n            .payment_attempt\n            .amount_details\n            .get_net_amount()\n            .get_amount_as_i64(),\n        minor_amount: payment_data.payment_attempt.amount_details.get_net_amount(),\n        order_tax_amount: None,\n        currency: payment_data.payment_intent.amount_details.currency,\n        browser_info,\n        email,\n        customer_name: None,\n        payment_experience: None,\n        order_details: None,\n        order_category,\n        session_token: None,\n        enrolled_for_3ds: true,\n        related_transaction_id: None,\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        router_return_url: Some(router_return_url),\n        webhook_url,\n        complete_authorize_url,\n        customer_id: customer_id.clone(),\n        surcharge_details: None,\n        request_extended_authorization: None,\n        request_incremental_authorization: matches!(\n            payment_data\n                .payment_intent\n                .request_incremental_authorization,\n            RequestIncrementalAuthorization::True\n        ),\n        metadata: payment_data.payment_intent.metadata.expose_option(),\n        authentication_data: None,\n        customer_acceptance: None,\n        split_payments: None,\n        merchant_order_reference_id: payment_data\n            .payment_intent\n            .merchant_reference_id\n            .map(|reference_id| reference_id.get_string_repr().to_owned()),\n        integrity_object: None,\n        shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n        additional_payment_method_data,\n        merchant_account_id: None,\n        merchant_config_currency: None,\n        connector_testing_data: None,\n        order_id: None,\n        locale: None,\n        mit_category: None,\n        payment_channel: None,\n        enable_partial_authorization: payment_data.payment_intent.enable_partial_authorization,\n        enable_overcapture: None,\n        is_stored_credential: None,\n    };\n    let connector_mandate_request_reference_id = payment_data\n        .payment_attempt\n        .connector_token_details\n        .as_ref()\n        .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n    // TODO: evaluate the fields in router data, if they are required or not\n    let router_data = types::RouterData {\n        flow: PhantomData,\n        merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n        tenant_id: state.tenant.tenant_id.clone(),\n        // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n        customer_id,\n        connector: connector_id.to_owned(),\n        // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n        payment_id: payment_data\n            .payment_attempt\n            .payment_id\n            .get_string_repr()\n            .to_owned(),\n        // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n        attempt_id: payment_data\n            .payment_attempt\n            .get_id()\n            .get_string_repr()\n            .to_owned(),\n        status: payment_data.payment_attempt.status,\n        payment_method,\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        connector_auth_type: auth_type,\n        description: payment_data\n            .payment_intent\n            .description\n            .as_ref()\n            .map(|description| description.get_string_repr())\n            .map(ToOwned::to_owned),\n        // TODO: Create unified address\n        address: payment_data.payment_address.clone(),\n        auth_type: payment_data.payment_attempt.authentication_type,\n        connector_meta_data: merchant_connector_account.get_metadata(),\n        connector_wallets_details: None,\n        request,\n        response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n        amount_captured: payment_data\n            .payment_intent\n            .amount_captured\n            .map(|amt| amt.get_amount_as_i64()),\n        minor_amount_captured: payment_data.payment_intent.amount_captured,\n        access_token: None,\n        session_token: None,\n        reference_id: None,\n        payment_method_status: None,\n        payment_method_token: None,\n        connector_customer: connector_customer_id,\n        recurring_mandate_payment_data: None,\n        // TODO: This has to be generated as the reference id based on the connector configuration\n        // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n        connector_request_reference_id,\n        preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n        #[cfg(feature = \"payouts\")]\n        payout_method_data: None,\n        #[cfg(feature = \"payouts\")]\n        quote_id: None,\n        // TODO: take this based on the env\n        test_mode: Some(true),\n        payment_method_balance: None,\n        connector_api_version: None,\n        connector_http_status_code: None,\n        external_latency: None,\n        apple_pay_flow: None,\n        frm_metadata: None,\n        refund_id: None,\n        dispute_id: None,\n        connector_response: None,\n        integrity_check: Ok(()),\n        additional_merchant_data: None,\n        header_payload,\n        connector_mandate_request_reference_id,\n        authentication_id: None,\n        psd2_sca_exemption_type: None,\n        raw_connector_response: None,\n        is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n        l2_l3_data: None,\n        minor_amount_capturable: None,\n        authorized_amount: None,\n    };\n\n    Ok(router_data)\n}",
+      "after_code": "pub async fn construct_payment_router_data_for_authorize<'a>(\n    state: &'a SessionState,\n    payment_data: hyperswitch_domain_models::payments::PaymentConfirmData<api::Authorize>,\n    connector_id: &str,\n    merchant_context: &domain::MerchantContext,\n    customer: &'a Option<domain::Customer>,\n    merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n    _merchant_recipient_data: Option<types::MerchantRecipientData>,\n    header_payload: Option<hyperswitch_domain_models::payments::HeaderPayload>,\n) -> RouterResult<types::PaymentsAuthorizeRouterData> {\n    use masking::ExposeOptionInterface;\n\n    fp_utils::when(merchant_connector_account.is_disabled(), || {\n        Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n    })?;\n\n    let auth_type = merchant_connector_account\n        .get_connector_account_details()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n    // TODO: Take Globalid and convert to connector reference id\n    let customer_id = customer\n        .to_owned()\n        .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n        .transpose()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\n            \"Invalid global customer generated, not able to convert to reference id\",\n        )?;\n\n    let connector_customer_id =\n        payment_data.get_connector_customer_id(customer.as_ref(), merchant_connector_account);\n\n    let payment_method = payment_data.payment_attempt.payment_method_type;\n\n    let router_base_url = &state.base_url;\n    let attempt = &payment_data.payment_attempt;\n\n    let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n        router_base_url,\n        attempt,\n        connector_id,\n        None,\n    ));\n\n    let webhook_url = match merchant_connector_account {\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n            merchant_connector_account,\n        ) => Some(helpers::create_webhook_url(\n            router_base_url,\n            &attempt.merchant_id,\n            merchant_connector_account.get_id().get_string_repr(),\n        )),\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n            payment_data.webhook_url\n        }\n    };\n\n    let router_return_url = payment_data\n        .payment_intent\n        .create_finish_redirection_url(\n            router_base_url,\n            merchant_context\n                .get_merchant_account()\n                .publishable_key\n                .as_ref(),\n        )\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Unable to construct finish redirection url\")?\n        .to_string();\n\n    let connector_request_reference_id = payment_data\n        .payment_attempt\n        .connector_request_reference_id\n        .clone()\n        .ok_or(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n    let email = customer\n        .as_ref()\n        .and_then(|customer| customer.email.clone())\n        .map(pii::Email::from);\n\n    let browser_info = payment_data\n        .payment_attempt\n        .browser_info\n        .clone()\n        .map(types::BrowserInformation::from);\n    let additional_payment_method_data: Option<api_models::payments::AdditionalPaymentData> =\n            payment_data.payment_attempt\n                .payment_method_data\n                .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n                .transpose()\n                .change_context(errors::ApiErrorResponse::InternalServerError)\n                .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n\n    let connector_metadata = payment_data.payment_intent.connector_metadata.clone();\n\n    let order_category = connector_metadata.as_ref().and_then(|cm| {\n        cm.noon\n            .as_ref()\n            .and_then(|noon| noon.order_category.clone())\n    });\n\n    // TODO: few fields are repeated in both routerdata and request\n    let request = types::PaymentsAuthorizeData {\n        payment_method_data: payment_data\n            .payment_method_data\n            .get_required_value(\"payment_method_data\")?,\n        setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n        mandate_id: payment_data.mandate_data.clone(),\n        off_session: None,\n        setup_mandate_details: None,\n        confirm: true,\n        statement_descriptor_suffix: None,\n        statement_descriptor: None,\n        capture_method: Some(payment_data.payment_intent.capture_method),\n        amount: payment_data\n            .payment_attempt\n            .amount_details\n            .get_net_amount()\n            .get_amount_as_i64(),\n        minor_amount: payment_data.payment_attempt.amount_details.get_net_amount(),\n        order_tax_amount: None,\n        currency: payment_data.payment_intent.amount_details.currency,\n        browser_info,\n        email,\n        customer_name: None,\n        payment_experience: None,\n        order_details: None,\n        order_category,\n        session_token: None,\n        enrolled_for_3ds: true,\n        related_transaction_id: None,\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        router_return_url: Some(router_return_url),\n        webhook_url,\n        complete_authorize_url,\n        customer_id: customer_id.clone(),\n        surcharge_details: None,\n        request_extended_authorization: None,\n        request_incremental_authorization: matches!(\n            payment_data\n                .payment_intent\n                .request_incremental_authorization,\n            RequestIncrementalAuthorization::True\n        ),\n        metadata: payment_data.payment_intent.metadata.expose_option(),\n        authentication_data: None,\n        customer_acceptance: None,\n        split_payments: None,\n        merchant_order_reference_id: payment_data\n            .payment_intent\n            .merchant_reference_id\n            .map(|reference_id| reference_id.get_string_repr().to_owned()),\n        integrity_object: None,\n        shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n        additional_payment_method_data,\n        merchant_account_id: None,\n        merchant_config_currency: None,\n        connector_testing_data: None,\n        order_id: None,\n        locale: None,\n        mit_category: None,\n        payment_channel: None,\n        enable_partial_authorization: payment_data.payment_intent.enable_partial_authorization,\n        enable_overcapture: None,\n        is_stored_credential: None,\n        billing_descriptor: None,\n    };\n    let connector_mandate_request_reference_id = payment_data\n        .payment_attempt\n        .connector_token_details\n        .as_ref()\n        .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n    // TODO: evaluate the fields in router data, if they are required or not\n    let router_data = types::RouterData {\n        flow: PhantomData,\n        merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n        tenant_id: state.tenant.tenant_id.clone(),\n        // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n        customer_id,\n        connector: connector_id.to_owned(),\n        // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n        payment_id: payment_data\n            .payment_attempt\n            .payment_id\n            .get_string_repr()\n            .to_owned(),\n        // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n        attempt_id: payment_data\n            .payment_attempt\n            .get_id()\n            .get_string_repr()\n            .to_owned(),\n        status: payment_data.payment_attempt.status,\n        payment_method,\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        connector_auth_type: auth_type,\n        description: payment_data\n            .payment_intent\n            .description\n            .as_ref()\n            .map(|description| description.get_string_repr())\n            .map(ToOwned::to_owned),\n        // TODO: Create unified address\n        address: payment_data.payment_address.clone(),\n        auth_type: payment_data.payment_attempt.authentication_type,\n        connector_meta_data: merchant_connector_account.get_metadata(),\n        connector_wallets_details: None,\n        request,\n        response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n        amount_captured: payment_data\n            .payment_intent\n            .amount_captured\n            .map(|amt| amt.get_amount_as_i64()),\n        minor_amount_captured: payment_data.payment_intent.amount_captured,\n        access_token: None,\n        session_token: None,\n        reference_id: None,\n        payment_method_status: None,\n        payment_method_token: None,\n        connector_customer: connector_customer_id,\n        recurring_mandate_payment_data: None,\n        // TODO: This has to be generated as the reference id based on the connector configuration\n        // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n        connector_request_reference_id,\n        preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n        #[cfg(feature = \"payouts\")]\n        payout_method_data: None,\n        #[cfg(feature = \"payouts\")]\n        quote_id: None,\n        // TODO: take this based on the env\n        test_mode: Some(true),\n        payment_method_balance: None,\n        connector_api_version: None,\n        connector_http_status_code: None,\n        external_latency: None,\n        apple_pay_flow: None,\n        frm_metadata: None,\n        refund_id: None,\n        dispute_id: None,\n        connector_response: None,\n        integrity_check: Ok(()),\n        additional_merchant_data: None,\n        header_payload,\n        connector_mandate_request_reference_id,\n        authentication_id: None,\n        psd2_sca_exemption_type: None,\n        raw_connector_response: None,\n        is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n        l2_l3_data: None,\n        minor_amount_capturable: None,\n        authorized_amount: None,\n    };\n\n    Ok(router_data)\n}",
+      "diff_span": {
+        "before": "",
+        "after": "        enable_overcapture: None,\n        is_stored_credential: None,\n        billing_descriptor: None,\n    };\n    let connector_mandate_request_reference_id = payment_data"
+      },
+      "commit_sha": "1e4c6b146ecfbe51074fc4eb393189bdb86a56b0"
+    }
+  ]
+}

diffs/pr_10077/3913000/diff.json

@@ -0,0 +1,26 @@
+{
+  "commit_sha": "3913000670299af7f2031c10038f30959128f432",
+  "pr_number": 10077,
+  "rust_files": [
+    "crates/common_types/src/payments.rs",
+    "crates/diesel_models/src/payment_intent.rs",
+    "crates/hyperswitch_domain_models/src/payments/payment_intent.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/diesel_models/src/payment_intent.rs::PaymentIntentUpdateInternal::function::apply_changeset",
+      "file": "crates/diesel_models/src/payment_intent.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub fn apply_changeset(self, source: PaymentIntent) -> PaymentIntent {\n        let Self {\n            status,\n            prerouting_algorithm,\n            amount_captured,\n            modified_at: _, // This will be ignored from self\n            active_attempt_id,\n            amount,\n            currency,\n            shipping_cost,\n            tax_details,\n            skip_external_tax_calculation,\n            surcharge_applicable,\n            surcharge_amount,\n            tax_on_surcharge,\n            routing_algorithm_id,\n            capture_method,\n            authentication_type,\n            billing_address,\n            shipping_address,\n            customer_present,\n            description,\n            return_url,\n            setup_future_usage,\n            apply_mit_exemption,\n            statement_descriptor,\n            order_details,\n            allowed_payment_method_types,\n            metadata,\n            connector_metadata,\n            feature_metadata,\n            payment_link_config,\n            request_incremental_authorization,\n            session_expiry,\n            frm_metadata,\n            request_external_three_ds_authentication,\n            updated_by,\n            force_3ds_challenge,\n            is_iframe_redirection_enabled,\n            enable_partial_authorization,\n        } = self;\n\n        PaymentIntent {\n            status: status.unwrap_or(source.status),\n            prerouting_algorithm: prerouting_algorithm.or(source.prerouting_algorithm),\n            amount_captured: amount_captured.or(source.amount_captured),\n            modified_at: common_utils::date_time::now(),\n            active_attempt_id: match active_attempt_id {\n                Some(v_option) => v_option,\n                None => source.active_attempt_id,\n            },\n            amount: amount.unwrap_or(source.amount),\n            currency: currency.unwrap_or(source.currency),\n            shipping_cost: shipping_cost.or(source.shipping_cost),\n            tax_details: tax_details.or(source.tax_details),\n            skip_external_tax_calculation: skip_external_tax_calculation\n                .or(source.skip_external_tax_calculation),\n            surcharge_applicable: surcharge_applicable.or(source.surcharge_applicable),\n            surcharge_amount: surcharge_amount.or(source.surcharge_amount),\n            tax_on_surcharge: tax_on_surcharge.or(source.tax_on_surcharge),\n            routing_algorithm_id: routing_algorithm_id.or(source.routing_algorithm_id),\n            capture_method: capture_method.or(source.capture_method),\n            authentication_type: authentication_type.or(source.authentication_type),\n            billing_address: billing_address.or(source.billing_address),\n            shipping_address: shipping_address.or(source.shipping_address),\n            customer_present: customer_present.or(source.customer_present),\n            description: description.or(source.description),\n            return_url: return_url.or(source.return_url),\n            setup_future_usage: setup_future_usage.or(source.setup_future_usage),\n            apply_mit_exemption: apply_mit_exemption.or(source.apply_mit_exemption),\n            statement_descriptor: statement_descriptor.or(source.statement_descriptor),\n            order_details: order_details.or(source.order_details),\n            allowed_payment_method_types: allowed_payment_method_types\n                .or(source.allowed_payment_method_types),\n            metadata: metadata.or(source.metadata),\n            connector_metadata: connector_metadata.or(source.connector_metadata),\n            feature_metadata: feature_metadata.or(source.feature_metadata),\n            payment_link_config: payment_link_config.or(source.payment_link_config),\n            request_incremental_authorization: request_incremental_authorization\n                .or(source.request_incremental_authorization),\n            session_expiry: session_expiry.unwrap_or(source.session_expiry),\n            frm_metadata: frm_metadata.or(source.frm_metadata),\n            request_external_three_ds_authentication: request_external_three_ds_authentication\n                .or(source.request_external_three_ds_authentication),\n            updated_by,\n            force_3ds_challenge: force_3ds_challenge.or(source.force_3ds_challenge),\n            is_iframe_redirection_enabled: is_iframe_redirection_enabled\n                .or(source.is_iframe_redirection_enabled),\n            // Fields from source\n            merchant_id: source.merchant_id,\n            customer_id: source.customer_id,\n            created_at: source.created_at,\n            last_synced: source.last_synced,\n            attempt_count: source.attempt_count,\n            profile_id: source.profile_id,\n            payment_link_id: source.payment_link_id,\n            authorization_count: source.authorization_count,\n            customer_details: source.customer_details,\n            organization_id: source.organization_id,\n            request_extended_authorization: source.request_extended_authorization,\n            psd2_sca_exemption_type: source.psd2_sca_exemption_type,\n            split_payments: source.split_payments,\n            platform_merchant_id: source.platform_merchant_id,\n            force_3ds_challenge_trigger: source.force_3ds_challenge_trigger,\n            processor_merchant_id: source.processor_merchant_id,\n            created_by: source.created_by,\n            merchant_reference_id: source.merchant_reference_id,\n            frm_merchant_decision: source.frm_merchant_decision,\n            enable_payment_link: source.enable_payment_link,\n            id: source.id,\n            is_payment_id_from_merchant: source.is_payment_id_from_merchant,\n            payment_channel: source.payment_channel,\n            tax_status: source.tax_status,\n            discount_amount: source.discount_amount,\n            shipping_amount_tax: source.shipping_amount_tax,\n            duty_amount: source.duty_amount,\n            order_date: source.order_date,\n            enable_partial_authorization: source.enable_partial_authorization,\n            split_txns_enabled: source.split_txns_enabled,\n            enable_overcapture: None,\n            active_attempt_id_type: source.active_attempt_id_type,\n            active_attempts_group_id: source.active_attempts_group_id,\n            mit_category: None,\n        }\n    }",
+      "after_code": "pub fn apply_changeset(self, source: PaymentIntent) -> PaymentIntent {\n        let Self {\n            status,\n            prerouting_algorithm,\n            amount_captured,\n            modified_at: _, // This will be ignored from self\n            active_attempt_id,\n            amount,\n            currency,\n            shipping_cost,\n            tax_details,\n            skip_external_tax_calculation,\n            surcharge_applicable,\n            surcharge_amount,\n            tax_on_surcharge,\n            routing_algorithm_id,\n            capture_method,\n            authentication_type,\n            billing_address,\n            shipping_address,\n            customer_present,\n            description,\n            return_url,\n            setup_future_usage,\n            apply_mit_exemption,\n            statement_descriptor,\n            order_details,\n            allowed_payment_method_types,\n            metadata,\n            connector_metadata,\n            feature_metadata,\n            payment_link_config,\n            request_incremental_authorization,\n            session_expiry,\n            frm_metadata,\n            request_external_three_ds_authentication,\n            updated_by,\n            force_3ds_challenge,\n            is_iframe_redirection_enabled,\n            enable_partial_authorization,\n        } = self;\n\n        PaymentIntent {\n            status: status.unwrap_or(source.status),\n            prerouting_algorithm: prerouting_algorithm.or(source.prerouting_algorithm),\n            amount_captured: amount_captured.or(source.amount_captured),\n            modified_at: common_utils::date_time::now(),\n            active_attempt_id: match active_attempt_id {\n                Some(v_option) => v_option,\n                None => source.active_attempt_id,\n            },\n            amount: amount.unwrap_or(source.amount),\n            currency: currency.unwrap_or(source.currency),\n            shipping_cost: shipping_cost.or(source.shipping_cost),\n            tax_details: tax_details.or(source.tax_details),\n            skip_external_tax_calculation: skip_external_tax_calculation\n                .or(source.skip_external_tax_calculation),\n            surcharge_applicable: surcharge_applicable.or(source.surcharge_applicable),\n            surcharge_amount: surcharge_amount.or(source.surcharge_amount),\n            tax_on_surcharge: tax_on_surcharge.or(source.tax_on_surcharge),\n            routing_algorithm_id: routing_algorithm_id.or(source.routing_algorithm_id),\n            capture_method: capture_method.or(source.capture_method),\n            authentication_type: authentication_type.or(source.authentication_type),\n            billing_address: billing_address.or(source.billing_address),\n            shipping_address: shipping_address.or(source.shipping_address),\n            customer_present: customer_present.or(source.customer_present),\n            description: description.or(source.description),\n            return_url: return_url.or(source.return_url),\n            setup_future_usage: setup_future_usage.or(source.setup_future_usage),\n            apply_mit_exemption: apply_mit_exemption.or(source.apply_mit_exemption),\n            statement_descriptor: statement_descriptor.or(source.statement_descriptor),\n            order_details: order_details.or(source.order_details),\n            allowed_payment_method_types: allowed_payment_method_types\n                .or(source.allowed_payment_method_types),\n            metadata: metadata.or(source.metadata),\n            connector_metadata: connector_metadata.or(source.connector_metadata),\n            feature_metadata: feature_metadata.or(source.feature_metadata),\n            payment_link_config: payment_link_config.or(source.payment_link_config),\n            request_incremental_authorization: request_incremental_authorization\n                .or(source.request_incremental_authorization),\n            session_expiry: session_expiry.unwrap_or(source.session_expiry),\n            frm_metadata: frm_metadata.or(source.frm_metadata),\n            request_external_three_ds_authentication: request_external_three_ds_authentication\n                .or(source.request_external_three_ds_authentication),\n            updated_by,\n            force_3ds_challenge: force_3ds_challenge.or(source.force_3ds_challenge),\n            is_iframe_redirection_enabled: is_iframe_redirection_enabled\n                .or(source.is_iframe_redirection_enabled),\n            // Fields from source\n            merchant_id: source.merchant_id,\n            customer_id: source.customer_id,\n            created_at: source.created_at,\n            last_synced: source.last_synced,\n            attempt_count: source.attempt_count,\n            profile_id: source.profile_id,\n            payment_link_id: source.payment_link_id,\n            authorization_count: source.authorization_count,\n            customer_details: source.customer_details,\n            organization_id: source.organization_id,\n            request_extended_authorization: source.request_extended_authorization,\n            psd2_sca_exemption_type: source.psd2_sca_exemption_type,\n            split_payments: source.split_payments,\n            platform_merchant_id: source.platform_merchant_id,\n            force_3ds_challenge_trigger: source.force_3ds_challenge_trigger,\n            processor_merchant_id: source.processor_merchant_id,\n            created_by: source.created_by,\n            merchant_reference_id: source.merchant_reference_id,\n            frm_merchant_decision: source.frm_merchant_decision,\n            enable_payment_link: source.enable_payment_link,\n            id: source.id,\n            is_payment_id_from_merchant: source.is_payment_id_from_merchant,\n            payment_channel: source.payment_channel,\n            tax_status: source.tax_status,\n            discount_amount: source.discount_amount,\n            shipping_amount_tax: source.shipping_amount_tax,\n            duty_amount: source.duty_amount,\n            order_date: source.order_date,\n            enable_partial_authorization: source.enable_partial_authorization,\n            split_txns_enabled: source.split_txns_enabled,\n            enable_overcapture: None,\n            active_attempt_id_type: source.active_attempt_id_type,\n            active_attempts_group_id: source.active_attempts_group_id,\n            mit_category: None,\n            billing_descriptor: source.billing_descriptor,\n        }\n    }",
+      "diff_span": {
+        "before": "",
+        "after": "            active_attempts_group_id: source.active_attempts_group_id,\n            mit_category: None,\n            billing_descriptor: source.billing_descriptor,\n        }\n    }"
+      },
+      "commit_sha": "3913000670299af7f2031c10038f30959128f432"
+    }
+  ]
+}

diffs/pr_10077/4c0aac3/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "4c0aac31e6ee4bf369b0d137b6bcc0155c2e5332",
+  "pr_number": 10077,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10077/5db1efe/diff.json

@@ -0,0 +1,8 @@
+{
+  "commit_sha": "5db1efe1b10c7ad702e701af6401fba11895742f",
+  "pr_number": 10077,
+  "rust_files": [
+    "crates/common_types/src/payments.rs"
+  ],
+  "diffs": []
+}

diffs/pr_10077/ab17a63/diff.json

@@ -0,0 +1,73 @@
+{
+  "commit_sha": "ab17a63af6d08ecc0f286fbcf742bc49f57b2939",
+  "pr_number": 10077,
+  "rust_files": [
+    "crates/hyperswitch_connectors/src/utils.rs",
+    "crates/hyperswitch_domain_models/src/router_request_types.rs",
+    "crates/router/src/core/payments/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_setup_mandate",
+      "file": "crates/router/src/core/payments/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn construct_payment_router_data_for_setup_mandate<'a>(\n    state: &'a SessionState,\n    payment_data: hyperswitch_domain_models::payments::PaymentConfirmData<api::SetupMandate>,\n    connector_id: &str,\n    merchant_context: &domain::MerchantContext,\n    customer: &'a Option<domain::Customer>,\n    merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n    _merchant_recipient_data: Option<types::MerchantRecipientData>,\n    header_payload: Option<hyperswitch_domain_models::payments::HeaderPayload>,\n) -> RouterResult<types::SetupMandateRouterData> {\n    fp_utils::when(merchant_connector_account.is_disabled(), || {\n        Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n    })?;\n\n    let auth_type = merchant_connector_account\n        .get_connector_account_details()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n    // TODO: Take Globalid and convert to connector reference id\n    let customer_id = customer\n        .to_owned()\n        .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n        .transpose()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\n            \"Invalid global customer generated, not able to convert to reference id\",\n        )?;\n\n    let connector_customer_id = customer.as_ref().and_then(|customer| {\n        customer\n            .get_connector_customer_id(merchant_connector_account)\n            .map(String::from)\n    });\n\n    let payment_method = payment_data.payment_attempt.payment_method_type;\n\n    let router_base_url = &state.base_url;\n    let attempt = &payment_data.payment_attempt;\n\n    let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n        router_base_url,\n        attempt,\n        connector_id,\n        None,\n    ));\n\n    let webhook_url = match merchant_connector_account {\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n            merchant_connector_account,\n        ) => Some(helpers::create_webhook_url(\n            router_base_url,\n            &attempt.merchant_id,\n            merchant_connector_account.get_id().get_string_repr(),\n        )),\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n            payment_data.webhook_url\n        }\n    };\n\n    let router_return_url = payment_data\n        .payment_intent\n        .create_finish_redirection_url(\n            router_base_url,\n            merchant_context\n                .get_merchant_account()\n                .publishable_key\n                .as_ref(),\n        )\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Unable to construct finish redirection url\")?\n        .to_string();\n\n    let connector_request_reference_id = payment_data\n        .payment_attempt\n        .connector_request_reference_id\n        .clone()\n        .ok_or(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n    let email = customer\n        .as_ref()\n        .and_then(|customer| customer.email.clone())\n        .map(pii::Email::from);\n\n    let browser_info = payment_data\n        .payment_attempt\n        .browser_info\n        .clone()\n        .map(types::BrowserInformation::from);\n\n    // TODO: few fields are repeated in both routerdata and request\n    let request = types::SetupMandateRequestData {\n        currency: payment_data.payment_intent.amount_details.currency,\n        payment_method_data: payment_data\n            .payment_method_data\n            .get_required_value(\"payment_method_data\")?,\n        amount: Some(\n            payment_data\n                .payment_attempt\n                .amount_details\n                .get_net_amount()\n                .get_amount_as_i64(),\n        ),\n        confirm: true,\n        statement_descriptor_suffix: None,\n        customer_acceptance: None,\n        mandate_id: None,\n        setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n        off_session: None,\n        setup_mandate_details: None,\n        router_return_url: Some(router_return_url.clone()),\n        webhook_url,\n        browser_info,\n        email,\n        customer_name: None,\n        return_url: Some(router_return_url),\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        request_incremental_authorization: matches!(\n            payment_data\n                .payment_intent\n                .request_incremental_authorization,\n            RequestIncrementalAuthorization::True\n        ),\n        metadata: payment_data.payment_intent.metadata,\n        minor_amount: Some(payment_data.payment_attempt.amount_details.get_net_amount()),\n        shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n        capture_method: Some(payment_data.payment_intent.capture_method),\n        complete_authorize_url,\n        connector_testing_data: None,\n        customer_id: None,\n        enable_partial_authorization: None,\n        payment_channel: None,\n        enrolled_for_3ds: true,\n        related_transaction_id: None,\n        is_stored_credential: None,\n        billing_descriptor: None,\n    };\n    let connector_mandate_request_reference_id = payment_data\n        .payment_attempt\n        .connector_token_details\n        .as_ref()\n        .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n    // TODO: evaluate the fields in router data, if they are required or not\n    let router_data = types::RouterData {\n        flow: PhantomData,\n        merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n        tenant_id: state.tenant.tenant_id.clone(),\n        // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n        customer_id,\n        connector: connector_id.to_owned(),\n        // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n        payment_id: payment_data\n            .payment_attempt\n            .payment_id\n            .get_string_repr()\n            .to_owned(),\n        // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n        attempt_id: payment_data\n            .payment_attempt\n            .get_id()\n            .get_string_repr()\n            .to_owned(),\n        status: payment_data.payment_attempt.status,\n        payment_method,\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        connector_auth_type: auth_type,\n        description: payment_data\n            .payment_intent\n            .description\n            .as_ref()\n            .map(|description| description.get_string_repr())\n            .map(ToOwned::to_owned),\n        // TODO: Create unified address\n        address: payment_data.payment_address.clone(),\n        auth_type: payment_data.payment_attempt.authentication_type,\n        connector_meta_data: None,\n        connector_wallets_details: None,\n        request,\n        response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n        amount_captured: None,\n        minor_amount_captured: None,\n        access_token: None,\n        session_token: None,\n        reference_id: None,\n        payment_method_status: None,\n        payment_method_token: None,\n        connector_customer: connector_customer_id,\n        recurring_mandate_payment_data: None,\n        // TODO: This has to be generated as the reference id based on the connector configuration\n        // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n        connector_request_reference_id,\n        preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n        #[cfg(feature = \"payouts\")]\n        payout_method_data: None,\n        #[cfg(feature = \"payouts\")]\n        quote_id: None,\n        // TODO: take this based on the env\n        test_mode: Some(true),\n        payment_method_balance: None,\n        connector_api_version: None,\n        connector_http_status_code: None,\n        external_latency: None,\n        apple_pay_flow: None,\n        frm_metadata: None,\n        refund_id: None,\n        dispute_id: None,\n        connector_response: None,\n        integrity_check: Ok(()),\n        additional_merchant_data: None,\n        header_payload,\n        connector_mandate_request_reference_id,\n        authentication_id: None,\n        psd2_sca_exemption_type: None,\n        raw_connector_response: None,\n        is_payment_id_from_merchant: None,\n        l2_l3_data: None,\n        minor_amount_capturable: None,\n        authorized_amount: None,\n    };\n\n    Ok(router_data)\n}",
+      "after_code": "pub async fn construct_payment_router_data_for_setup_mandate<'a>(\n    state: &'a SessionState,\n    payment_data: hyperswitch_domain_models::payments::PaymentConfirmData<api::SetupMandate>,\n    connector_id: &str,\n    merchant_context: &domain::MerchantContext,\n    customer: &'a Option<domain::Customer>,\n    merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n    _merchant_recipient_data: Option<types::MerchantRecipientData>,\n    header_payload: Option<hyperswitch_domain_models::payments::HeaderPayload>,\n) -> RouterResult<types::SetupMandateRouterData> {\n    fp_utils::when(merchant_connector_account.is_disabled(), || {\n        Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n    })?;\n\n    let auth_type = merchant_connector_account\n        .get_connector_account_details()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n    // TODO: Take Globalid and convert to connector reference id\n    let customer_id = customer\n        .to_owned()\n        .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n        .transpose()\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\n            \"Invalid global customer generated, not able to convert to reference id\",\n        )?;\n\n    let connector_customer_id = customer.as_ref().and_then(|customer| {\n        customer\n            .get_connector_customer_id(merchant_connector_account)\n            .map(String::from)\n    });\n\n    let payment_method = payment_data.payment_attempt.payment_method_type;\n\n    let router_base_url = &state.base_url;\n    let attempt = &payment_data.payment_attempt;\n\n    let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n        router_base_url,\n        attempt,\n        connector_id,\n        None,\n    ));\n\n    let webhook_url = match merchant_connector_account {\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n            merchant_connector_account,\n        ) => Some(helpers::create_webhook_url(\n            router_base_url,\n            &attempt.merchant_id,\n            merchant_connector_account.get_id().get_string_repr(),\n        )),\n        domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n            payment_data.webhook_url\n        }\n    };\n\n    let router_return_url = payment_data\n        .payment_intent\n        .create_finish_redirection_url(\n            router_base_url,\n            merchant_context\n                .get_merchant_account()\n                .publishable_key\n                .as_ref(),\n        )\n        .change_context(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"Unable to construct finish redirection url\")?\n        .to_string();\n\n    let connector_request_reference_id = payment_data\n        .payment_attempt\n        .connector_request_reference_id\n        .clone()\n        .ok_or(errors::ApiErrorResponse::InternalServerError)\n        .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n    let email = customer\n        .as_ref()\n        .and_then(|customer| customer.email.clone())\n        .map(pii::Email::from);\n\n    let browser_info = payment_data\n        .payment_attempt\n        .browser_info\n        .clone()\n        .map(types::BrowserInformation::from);\n\n    // TODO: few fields are repeated in both routerdata and request\n    let request = types::SetupMandateRequestData {\n        currency: payment_data.payment_intent.amount_details.currency,\n        payment_method_data: payment_data\n            .payment_method_data\n            .get_required_value(\"payment_method_data\")?,\n        amount: Some(\n            payment_data\n                .payment_attempt\n                .amount_details\n                .get_net_amount()\n                .get_amount_as_i64(),\n        ),\n        confirm: true,\n        customer_acceptance: None,\n        mandate_id: None,\n        setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n        off_session: None,\n        setup_mandate_details: None,\n        router_return_url: Some(router_return_url.clone()),\n        webhook_url,\n        browser_info,\n        email,\n        customer_name: None,\n        return_url: Some(router_return_url),\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        request_incremental_authorization: matches!(\n            payment_data\n                .payment_intent\n                .request_incremental_authorization,\n            RequestIncrementalAuthorization::True\n        ),\n        metadata: payment_data.payment_intent.metadata,\n        minor_amount: Some(payment_data.payment_attempt.amount_details.get_net_amount()),\n        shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n        capture_method: Some(payment_data.payment_intent.capture_method),\n        complete_authorize_url,\n        connector_testing_data: None,\n        customer_id: None,\n        enable_partial_authorization: None,\n        payment_channel: None,\n        enrolled_for_3ds: true,\n        related_transaction_id: None,\n        is_stored_credential: None,\n        billing_descriptor: None,\n    };\n    let connector_mandate_request_reference_id = payment_data\n        .payment_attempt\n        .connector_token_details\n        .as_ref()\n        .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n    // TODO: evaluate the fields in router data, if they are required or not\n    let router_data = types::RouterData {\n        flow: PhantomData,\n        merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n        tenant_id: state.tenant.tenant_id.clone(),\n        // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n        customer_id,\n        connector: connector_id.to_owned(),\n        // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n        payment_id: payment_data\n            .payment_attempt\n            .payment_id\n            .get_string_repr()\n            .to_owned(),\n        // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n        attempt_id: payment_data\n            .payment_attempt\n            .get_id()\n            .get_string_repr()\n            .to_owned(),\n        status: payment_data.payment_attempt.status,\n        payment_method,\n        payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n        connector_auth_type: auth_type,\n        description: payment_data\n            .payment_intent\n            .description\n            .as_ref()\n            .map(|description| description.get_string_repr())\n            .map(ToOwned::to_owned),\n        // TODO: Create unified address\n        address: payment_data.payment_address.clone(),\n        auth_type: payment_data.payment_attempt.authentication_type,\n        connector_meta_data: None,\n        connector_wallets_details: None,\n        request,\n        response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n        amount_captured: None,\n        minor_amount_captured: None,\n        access_token: None,\n        session_token: None,\n        reference_id: None,\n        payment_method_status: None,\n        payment_method_token: None,\n        connector_customer: connector_customer_id,\n        recurring_mandate_payment_data: None,\n        // TODO: This has to be generated as the reference id based on the connector configuration\n        // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n        connector_request_reference_id,\n        preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n        #[cfg(feature = \"payouts\")]\n        payout_method_data: None,\n        #[cfg(feature = \"payouts\")]\n        quote_id: None,\n        // TODO: take this based on the env\n        test_mode: Some(true),\n        payment_method_balance: None,\n        connector_api_version: None,\n        connector_http_status_code: None,\n        external_latency: None,\n        apple_pay_flow: None,\n        frm_metadata: None,\n        refund_id: None,\n        dispute_id: None,\n        connector_response: None,\n        integrity_check: Ok(()),\n        additional_merchant_data: None,\n        header_payload,\n        connector_mandate_request_reference_id,\n        authentication_id: None,\n        psd2_sca_exemption_type: None,\n        raw_connector_response: None,\n        is_payment_id_from_merchant: None,\n        l2_l3_data: None,\n        minor_amount_capturable: None,\n        authorized_amount: None,\n    };\n\n    Ok(router_data)\n}",
+      "diff_span": {
+        "before": "        ),\n        confirm: true,\n        statement_descriptor_suffix: None,\n        customer_acceptance: None,\n        mandate_id: None,",
+        "after": ""
+      },
+      "commit_sha": "ab17a63af6d08ecc0f286fbcf742bc49f57b2939"
+    },
+    {
+      "id": "crates/hyperswitch_connectors/src/utils.rs::function::convert_setup_mandate_router_data_to_authorize_router_data",
+      "file": "crates/hyperswitch_connectors/src/utils.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "pub(crate) fn convert_setup_mandate_router_data_to_authorize_router_data(\n    data: &SetupMandateRouterData,\n) -> PaymentsAuthorizeData {\n    PaymentsAuthorizeData {\n        currency: data.request.currency,\n        payment_method_data: data.request.payment_method_data.clone(),\n        confirm: data.request.confirm,\n        mandate_id: data.request.mandate_id.clone(),\n        setup_future_usage: data.request.setup_future_usage,\n        off_session: data.request.off_session,\n        setup_mandate_details: data.request.setup_mandate_details.clone(),\n        router_return_url: data.request.router_return_url.clone(),\n        email: data.request.email.clone(),\n        customer_name: data.request.customer_name.clone(),\n        amount: 0,\n        order_tax_amount: Some(MinorUnit::zero()),\n        minor_amount: MinorUnit::new(0),\n        capture_method: data.request.capture_method,\n        webhook_url: None,\n        complete_authorize_url: None,\n        browser_info: data.request.browser_info.clone(),\n        order_details: None,\n        order_category: None,\n        session_token: None,\n        enrolled_for_3ds: true,\n        related_transaction_id: None,\n        payment_experience: None,\n        payment_method_type: None,\n        customer_id: None,\n        surcharge_details: None,\n        request_extended_authorization: None,\n        request_incremental_authorization: data.request.request_incremental_authorization,\n        metadata: None,\n        authentication_data: None,\n        customer_acceptance: data.request.customer_acceptance.clone(),\n        split_payments: None, // TODO: allow charges on mandates?\n        merchant_order_reference_id: None,\n        integrity_object: None,\n        additional_payment_method_data: None,\n        shipping_cost: data.request.shipping_cost,\n        merchant_account_id: None,\n        merchant_config_currency: None,\n        connector_testing_data: data.request.connector_testing_data.clone(),\n        order_id: None,\n        locale: None,\n        payment_channel: data.request.payment_channel.clone(),\n        enable_partial_authorization: data.request.enable_partial_authorization,\n        enable_overcapture: None,\n        is_stored_credential: data.request.is_stored_credential,\n        mit_category: None,\n        billing_descriptor: data\n            .request\n            .statement_descriptor_suffix\n            .as_ref()\n            .map(|suffix| BillingDescriptor {\n                name: None,\n                city: None,\n                phone: None,\n                statement_descriptor: None,\n                statement_descriptor_suffix: Some(suffix.clone()),\n            }),\n    }\n}",
+      "after_code": "pub(crate) fn convert_setup_mandate_router_data_to_authorize_router_data(\n    data: &SetupMandateRouterData,\n) -> PaymentsAuthorizeData {\n    PaymentsAuthorizeData {\n        currency: data.request.currency,\n        payment_method_data: data.request.payment_method_data.clone(),\n        confirm: data.request.confirm,\n        mandate_id: data.request.mandate_id.clone(),\n        setup_future_usage: data.request.setup_future_usage,\n        off_session: data.request.off_session,\n        setup_mandate_details: data.request.setup_mandate_details.clone(),\n        router_return_url: data.request.router_return_url.clone(),\n        email: data.request.email.clone(),\n        customer_name: data.request.customer_name.clone(),\n        amount: 0,\n        order_tax_amount: Some(MinorUnit::zero()),\n        minor_amount: MinorUnit::new(0),\n        capture_method: data.request.capture_method,\n        webhook_url: None,\n        complete_authorize_url: None,\n        browser_info: data.request.browser_info.clone(),\n        order_details: None,\n        order_category: None,\n        session_token: None,\n        enrolled_for_3ds: true,\n        related_transaction_id: None,\n        payment_experience: None,\n        payment_method_type: None,\n        customer_id: None,\n        surcharge_details: None,\n        request_extended_authorization: None,\n        request_incremental_authorization: data.request.request_incremental_authorization,\n        metadata: None,\n        authentication_data: None,\n        customer_acceptance: data.request.customer_acceptance.clone(),\n        split_payments: None, // TODO: allow charges on mandates?\n        merchant_order_reference_id: None,\n        integrity_object: None,\n        additional_payment_method_data: None,\n        shipping_cost: data.request.shipping_cost,\n        merchant_account_id: None,\n        merchant_config_currency: None,\n        connector_testing_data: data.request.connector_testing_data.clone(),\n        order_id: None,\n        locale: None,\n        payment_channel: data.request.payment_channel.clone(),\n        enable_partial_authorization: data.request.enable_partial_authorization,\n        enable_overcapture: None,\n        is_stored_credential: data.request.is_stored_credential,\n        mit_category: None,\n        billing_descriptor: data.request.billing_descriptor.clone(),\n    }\n}",
+      "diff_span": {
+        "before": "        is_stored_credential: data.request.is_stored_credential,\n        mit_category: None,\n        billing_descriptor: data\n            .request\n            .statement_descriptor_suffix\n            .as_ref()\n            .map(|suffix| BillingDescriptor {\n                name: None,\n                city: None,\n                phone: None,\n                statement_descriptor: None,\n                statement_descriptor_suffix: Some(suffix.clone()),\n            }),\n    }\n}",
+        "after": "        is_stored_credential: data.request.is_stored_credential,\n        mit_category: None,\n        billing_descriptor: data.request.billing_descriptor.clone(),\n    }\n}"
+      },
+      "commit_sha": "ab17a63af6d08ecc0f286fbcf742bc49f57b2939",
+      "before_imports": [
+        "use quick_xml::{\n    events::{BytesDecl, BytesText, Event},\n    Writer,\n};",
+        "use hyperswitch_domain_models::router_request_types::fraud_check::{\n    FraudCheckCheckoutData, FraudCheckRecordReturnData, FraudCheckSaleData,\n    FraudCheckTransactionData,\n};",
+        "use hyperswitch_domain_models::{\n    address::{Address, AddressDetails, PhoneDetails},\n    mandates,\n    network_tokenization::NetworkTokenNumber,\n    payment_method_data::{\n        self, Card, CardDetailsForNetworkTransactionId, GooglePayPaymentMethodInfo,\n        PaymentMethodData,\n    },\n    router_data::{\n        ErrorResponse, L2L3Data, PaymentMethodToken, RecurringMandatePaymentData,\n        RouterData as ConnectorRouterData,\n    },\n    router_request_types::{\n        AuthenticationData, AuthoriseIntegrityObject, BrowserInformation, CaptureIntegrityObject,\n        CompleteAuthorizeData, ConnectorCustomerData, ExternalVaultProxyPaymentsData,\n        MandateRevokeRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsPostSessionTokensData,\n        PaymentsPreProcessingData, PaymentsSyncData, RefundIntegrityObject, RefundsData,\n        ResponseId, SetupMandateRequestData, SyncIntegrityObject,\n    },\n    router_response_types::{CaptureSyncResponse, PaymentsResponseData},\n    types::{OrderDetailsWithAmount, SetupMandateRouterData},\n};",
+        "use common_enums::{\n    enums,\n    enums::{\n        AlbaniaStatesAbbreviation, AndorraStatesAbbreviation, AttemptStatus,\n        AustraliaStatesAbbreviation, AustriaStatesAbbreviation, BelarusStatesAbbreviation,\n        BelgiumStatesAbbreviation, BosniaAndHerzegovinaStatesAbbreviation,\n        BrazilStatesAbbreviation, BulgariaStatesAbbreviation, CanadaStatesAbbreviation,\n        CroatiaStatesAbbreviation, CzechRepublicStatesAbbreviation, DenmarkStatesAbbreviation,\n        FinlandStatesAbbreviation, FranceStatesAbbreviation, FutureUsage,\n        GermanyStatesAbbreviation, GreeceStatesAbbreviation, HungaryStatesAbbreviation,\n        IcelandStatesAbbreviation, IndiaStatesAbbreviation, IrelandStatesAbbreviation,\n        ItalyStatesAbbreviation, JapanStatesAbbreviation, LatviaStatesAbbreviation,\n        LiechtensteinStatesAbbreviation, LithuaniaStatesAbbreviation, LuxembourgStatesAbbreviation,\n        MaltaStatesAbbreviation, MoldovaStatesAbbreviation, MonacoStatesAbbreviation,\n        MontenegroStatesAbbreviation, NetherlandsStatesAbbreviation, NewZealandStatesAbbreviation,\n        NorthMacedoniaStatesAbbreviation, NorwayStatesAbbreviation, PhilippinesStatesAbbreviation,\n        PolandStatesAbbreviation, PortugalStatesAbbreviation, RomaniaStatesAbbreviation,\n        RussiaStatesAbbreviation, SanMarinoStatesAbbreviation, SerbiaStatesAbbreviation,\n        SingaporeStatesAbbreviation, SlovakiaStatesAbbreviation, SloveniaStatesAbbreviation,\n        SpainStatesAbbreviation, SwedenStatesAbbreviation, SwitzerlandStatesAbbreviation,\n        ThailandStatesAbbreviation, UkraineStatesAbbreviation, UnitedKingdomStatesAbbreviation,\n        UsStatesAbbreviation,\n    },\n};",
+        "use api_models::payments;",
+        "use common_utils::{\n    consts::BASE64_ENGINE,\n    errors::{CustomResult, ParsingError, ReportSwitchExt},\n    ext_traits::{OptionExt, StringExt, ValueExt},\n    id_type,\n    pii::{self, Email, IpAddress},\n    types::{AmountConvertor, MinorUnit},\n};",
+        "use common_types::payments::BillingDescriptor;"
+      ],
+      "after_imports": [
+        "use quick_xml::{\n    events::{BytesDecl, BytesText, Event},\n    Writer,\n};",
+        "use hyperswitch_domain_models::router_request_types::fraud_check::{\n    FraudCheckCheckoutData, FraudCheckRecordReturnData, FraudCheckSaleData,\n    FraudCheckTransactionData,\n};",
+        "use hyperswitch_domain_models::{\n    address::{Address, AddressDetails, PhoneDetails},\n    mandates,\n    network_tokenization::NetworkTokenNumber,\n    payment_method_data::{\n        self, Card, CardDetailsForNetworkTransactionId, GooglePayPaymentMethodInfo,\n        PaymentMethodData,\n    },\n    router_data::{\n        ErrorResponse, L2L3Data, PaymentMethodToken, RecurringMandatePaymentData,\n        RouterData as ConnectorRouterData,\n    },\n    router_request_types::{\n        AuthenticationData, AuthoriseIntegrityObject, BrowserInformation, CaptureIntegrityObject,\n        CompleteAuthorizeData, ConnectorCustomerData, ExternalVaultProxyPaymentsData,\n        MandateRevokeRequestData, PaymentMethodTokenizationData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsPostSessionTokensData,\n        PaymentsPreProcessingData, PaymentsSyncData, RefundIntegrityObject, RefundsData,\n        ResponseId, SetupMandateRequestData, SyncIntegrityObject,\n    },\n    router_response_types::{CaptureSyncResponse, PaymentsResponseData},\n    types::{OrderDetailsWithAmount, SetupMandateRouterData},\n};",
+        "use common_enums::{\n    enums,\n    enums::{\n        AlbaniaStatesAbbreviation, AndorraStatesAbbreviation, AttemptStatus,\n        AustraliaStatesAbbreviation, AustriaStatesAbbreviation, BelarusStatesAbbreviation,\n        BelgiumStatesAbbreviation, BosniaAndHerzegovinaStatesAbbreviation,\n        BrazilStatesAbbreviation, BulgariaStatesAbbreviation, CanadaStatesAbbreviation,\n        CroatiaStatesAbbreviation, CzechRepublicStatesAbbreviation, DenmarkStatesAbbreviation,\n        FinlandStatesAbbreviation, FranceStatesAbbreviation, FutureUsage,\n        GermanyStatesAbbreviation, GreeceStatesAbbreviation, HungaryStatesAbbreviation,\n        IcelandStatesAbbreviation, IndiaStatesAbbreviation, IrelandStatesAbbreviation,\n        ItalyStatesAbbreviation, JapanStatesAbbreviation, LatviaStatesAbbreviation,\n        LiechtensteinStatesAbbreviation, LithuaniaStatesAbbreviation, LuxembourgStatesAbbreviation,\n        MaltaStatesAbbreviation, MoldovaStatesAbbreviation, MonacoStatesAbbreviation,\n        MontenegroStatesAbbreviation, NetherlandsStatesAbbreviation, NewZealandStatesAbbreviation,\n        NorthMacedoniaStatesAbbreviation, NorwayStatesAbbreviation, PhilippinesStatesAbbreviation,\n        PolandStatesAbbreviation, PortugalStatesAbbreviation, RomaniaStatesAbbreviation,\n        RussiaStatesAbbreviation, SanMarinoStatesAbbreviation, SerbiaStatesAbbreviation,\n        SingaporeStatesAbbreviation, SlovakiaStatesAbbreviation, SloveniaStatesAbbreviation,\n        SpainStatesAbbreviation, SwedenStatesAbbreviation, SwitzerlandStatesAbbreviation,\n        ThailandStatesAbbreviation, UkraineStatesAbbreviation, UnitedKingdomStatesAbbreviation,\n        UsStatesAbbreviation,\n    },\n};",
+        "use api_models::payments;",
+        "use common_utils::{\n    consts::BASE64_ENGINE,\n    errors::{CustomResult, ParsingError, ReportSwitchExt},\n    ext_traits::{OptionExt, StringExt, ValueExt},\n    id_type,\n    pii::{self, Email, IpAddress},\n    types::{AmountConvertor, MinorUnit},\n};"
+      ]
+    },
+    {
+      "id": "crates/hyperswitch_domain_models/src/router_request_types.rs::struct::SetupMandateRequestData",
+      "file": "crates/hyperswitch_domain_models/src/router_request_types.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub struct SetupMandateRequestData {\n    pub currency: storage_enums::Currency,\n    pub payment_method_data: PaymentMethodData,\n    pub amount: Option<i64>,\n    pub confirm: bool,\n    pub statement_descriptor_suffix: Option<String>,\n    pub customer_acceptance: Option<common_payments_types::CustomerAcceptance>,\n    pub mandate_id: Option<api_models::payments::MandateIds>,\n    pub setup_future_usage: Option<storage_enums::FutureUsage>,\n    pub off_session: Option<bool>,\n    pub setup_mandate_details: Option<mandates::MandateData>,\n    pub router_return_url: Option<String>,\n    pub webhook_url: Option<String>,\n    pub browser_info: Option<BrowserInformation>,\n    pub email: Option<pii::Email>,\n    pub customer_name: Option<Secret<String>>,\n    pub return_url: Option<String>,\n    pub payment_method_type: Option<storage_enums::PaymentMethodType>,\n    pub request_incremental_authorization: bool,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub complete_authorize_url: Option<String>,\n    pub capture_method: Option<storage_enums::CaptureMethod>,\n    pub enrolled_for_3ds: bool,\n    pub related_transaction_id: Option<String>,\n\n    // MinorUnit for amount framework\n    pub minor_amount: Option<MinorUnit>,\n    pub shipping_cost: Option<MinorUnit>,\n    pub connector_testing_data: Option<pii::SecretSerdeValue>,\n    pub customer_id: Option<id_type::CustomerId>,\n    pub enable_partial_authorization:\n        Option<common_types::primitive_wrappers::EnablePartialAuthorizationBool>,\n    pub payment_channel: Option<storage_enums::PaymentChannel>,\n    pub is_stored_credential: Option<bool>,\n    pub billing_descriptor: Option<common_types::payments::BillingDescriptor>,\n}",
+      "after_code": "pub struct SetupMandateRequestData {\n    pub currency: storage_enums::Currency,\n    pub payment_method_data: PaymentMethodData,\n    pub amount: Option<i64>,\n    pub confirm: bool,\n    pub customer_acceptance: Option<common_payments_types::CustomerAcceptance>,\n    pub mandate_id: Option<api_models::payments::MandateIds>,\n    pub setup_future_usage: Option<storage_enums::FutureUsage>,\n    pub off_session: Option<bool>,\n    pub setup_mandate_details: Option<mandates::MandateData>,\n    pub router_return_url: Option<String>,\n    pub webhook_url: Option<String>,\n    pub browser_info: Option<BrowserInformation>,\n    pub email: Option<pii::Email>,\n    pub customer_name: Option<Secret<String>>,\n    pub return_url: Option<String>,\n    pub payment_method_type: Option<storage_enums::PaymentMethodType>,\n    pub request_incremental_authorization: bool,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub complete_authorize_url: Option<String>,\n    pub capture_method: Option<storage_enums::CaptureMethod>,\n    pub enrolled_for_3ds: bool,\n    pub related_transaction_id: Option<String>,\n\n    // MinorUnit for amount framework\n    pub minor_amount: Option<MinorUnit>,\n    pub shipping_cost: Option<MinorUnit>,\n    pub connector_testing_data: Option<pii::SecretSerdeValue>,\n    pub customer_id: Option<id_type::CustomerId>,\n    pub enable_partial_authorization:\n        Option<common_types::primitive_wrappers::EnablePartialAuthorizationBool>,\n    pub payment_channel: Option<storage_enums::PaymentChannel>,\n    pub is_stored_credential: Option<bool>,\n    pub billing_descriptor: Option<common_types::payments::BillingDescriptor>,\n}",
+      "diff_span": {
+        "before": "    pub amount: Option<i64>,\n    pub confirm: bool,\n    pub statement_descriptor_suffix: Option<String>,\n    pub customer_acceptance: Option<common_payments_types::CustomerAcceptance>,\n    pub mandate_id: Option<api_models::payments::MandateIds>,",
+        "after": ""
+      },
+      "commit_sha": "ab17a63af6d08ecc0f286fbcf742bc49f57b2939"
+    }
+  ]
+}

diffs/pr_10077/c9b9d52/diff.json

@@ -0,0 +1,64 @@
+{
+  "commit_sha": "c9b9d52dfaa497dac7e6aef8bedad7c7350a5cae",
+  "pr_number": 10077,
+  "rust_files": [
+    "crates/common_types/src/payments.rs",
+    "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs::struct::NuveiDynamicDescriptor",
+      "file": "crates/hyperswitch_connectors/src/connectors/nuvei/transformers.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "pub struct NuveiDynamicDescriptor {\n    pub merchant_name: Option<String>,\n    pub merchant_phone: Option<Secret<String>>,\n}",
+      "after_code": "pub struct NuveiDynamicDescriptor {\n    pub merchant_name: Option<String>,\n    pub merchant_phone: Option<String>,\n}",
+      "diff_span": {
+        "before": "pub struct NuveiDynamicDescriptor {\n    pub merchant_name: Option<String>,\n    pub merchant_phone: Option<Secret<String>>,\n}",
+        "after": "pub struct NuveiDynamicDescriptor {\n    pub merchant_name: Option<String>,\n    pub merchant_phone: Option<String>,\n}"
+      },
+      "commit_sha": "c9b9d52dfaa497dac7e6aef8bedad7c7350a5cae",
+      "before_imports": [
+        "use common_utils::{\n    crypto::{self, GenerateDigest},\n    date_time,\n    ext_traits::Encode,\n    fp_utils,\n    id_type::CustomerId,\n    pii::{self, Email, IpAddress},\n    request::Method,\n    types::{FloatMajorUnit, MinorUnit, StringMajorUnit, StringMajorUnitForConnector},\n};",
+        "use hyperswitch_interfaces::{\n    consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n    errors::{self},\n};",
+        "use crate::{\n    types::{\n        PaymentsPreprocessingResponseRouterData, RefundsResponseRouterData, ResponseRouterData,\n    },\n    utils::{\n        self, convert_amount, missing_field_err, AddressData, AddressDetailsData,\n        BrowserInformationData, CardData, ForeignTryFrom, PaymentsAuthorizeRequestData,\n        PaymentsCancelRequestData, PaymentsPreProcessingRequestData,\n        PaymentsSetupMandateRequestData, RouterData as _,\n    },\n};",
+        "use hyperswitch_domain_models::{\n    address::{Address, AddressDetails},\n    payment_method_data::{\n        self, ApplePayWalletData, BankRedirectData, CardDetailsForNetworkTransactionId,\n        GooglePayWalletData, PayLaterData, PaymentMethodData, WalletData,\n    },\n    router_data::{\n        AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n        ErrorResponse, L2L3Data, PaymentMethodToken, RouterData,\n    },\n    router_flow_types::{\n        refunds::{Execute, RSync},\n        Authorize, Capture, CompleteAuthorize, PSync, PostCaptureVoid, SetupMandate, Void,\n    },\n    router_request_types::{\n        authentication::MessageExtensionAttribute, AuthenticationData, BrowserInformation,\n        PaymentsAuthorizeData, PaymentsPreProcessingData, ResponseId, SetupMandateRequestData,\n    },\n    router_response_types::{\n        MandateReference, PaymentsResponseData, RedirectForm, RefundsResponseData,\n    },\n    types,\n};",
+        "use masking::{ExposeInterface, PeekInterface, Secret};",
+        "use common_types::{\n    payments::{\n        ApplePayPaymentData, ApplePayPredecryptData, GPayPredecryptData, GpayTokenizationData,\n    },\n    primitive_wrappers,\n};"
+      ],
+      "after_imports": [
+        "use common_utils::{\n    crypto::{self, GenerateDigest},\n    date_time,\n    ext_traits::Encode,\n    fp_utils,\n    id_type::CustomerId,\n    pii::{self, Email, IpAddress},\n    request::Method,\n    types::{FloatMajorUnit, MinorUnit, StringMajorUnit, StringMajorUnitForConnector},\n};",
+        "use hyperswitch_interfaces::{\n    consts::{NO_ERROR_CODE, NO_ERROR_MESSAGE},\n    errors::{self},\n};",
+        "use crate::{\n    types::{\n        PaymentsPreprocessingResponseRouterData, RefundsResponseRouterData, ResponseRouterData,\n    },\n    utils::{\n        self, convert_amount, missing_field_err, AddressData, AddressDetailsData,\n        BrowserInformationData, CardData, ForeignTryFrom, PaymentsAuthorizeRequestData,\n        PaymentsCancelRequestData, PaymentsPreProcessingRequestData,\n        PaymentsSetupMandateRequestData, RouterData as _,\n    },\n};",
+        "use hyperswitch_domain_models::{\n    address::{Address, AddressDetails},\n    payment_method_data::{\n        self, ApplePayWalletData, BankRedirectData, CardDetailsForNetworkTransactionId,\n        GooglePayWalletData, PayLaterData, PaymentMethodData, WalletData,\n    },\n    router_data::{\n        AdditionalPaymentMethodConnectorResponse, ConnectorAuthType, ConnectorResponseData,\n        ErrorResponse, L2L3Data, PaymentMethodToken, RouterData,\n    },\n    router_flow_types::{\n        refunds::{Execute, RSync},\n        Authorize, Capture, CompleteAuthorize, PSync, PostCaptureVoid, SetupMandate, Void,\n    },\n    router_request_types::{\n        authentication::MessageExtensionAttribute, AuthenticationData, BrowserInformation,\n        PaymentsAuthorizeData, PaymentsPreProcessingData, ResponseId, SetupMandateRequestData,\n    },\n    router_response_types::{\n        MandateReference, PaymentsResponseData, RedirectForm, RefundsResponseData,\n    },\n    types,\n};",
+        "use common_types::{\n    payments::{\n        ApplePayPaymentData, ApplePayPredecryptData, GPayPredecryptData, GpayTokenizationData,\n    },\n    primitive_wrappers,\n};"
+      ]
+    },
+    {
+      "id": "crates/common_types/src/payments.rs::struct::BillingDescriptor",
+      "file": "crates/common_types/src/payments.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "pub struct BillingDescriptor {\n    /// name to be put in billing description\n    pub name: Option<String>,\n    /// city to be put in billing description\n    pub city: Option<String>,\n    /// phone to be put in billing description\n    pub phone: Option<Secret<String>>,\n    /// a short description for the payment\n    pub statement_descriptor: Option<common_utils::types::StatementDescriptor>,\n}",
+      "after_code": "pub struct BillingDescriptor {\n    /// name to be put in billing description\n    pub name: Option<String>,\n    /// city to be put in billing description\n    pub city: Option<String>,\n    /// phone to be put in billing description\n    pub phone: Option<String>,\n    /// a short description for the payment\n    pub statement_descriptor: Option<common_utils::types::StatementDescriptor>,\n}",
+      "diff_span": {
+        "before": "    pub city: Option<String>,\n    /// phone to be put in billing description\n    pub phone: Option<Secret<String>>,\n    /// a short description for the payment\n    pub statement_descriptor: Option<common_utils::types::StatementDescriptor>,",
+        "after": "    pub city: Option<String>,\n    /// phone to be put in billing description\n    pub phone: Option<String>,\n    /// a short description for the payment\n    pub statement_descriptor: Option<common_utils::types::StatementDescriptor>,"
+      },
+      "commit_sha": "c9b9d52dfaa497dac7e6aef8bedad7c7350a5cae",
+      "before_imports": [
+        "use masking::{ExposeInterface, PeekInterface, Secret};",
+        "use euclid::frontend::{\n    ast::Program,\n    dir::{DirKeyKind, EuclidDirFilter},\n};",
+        "use diesel::{\n    sql_types::{Jsonb, Text},\n    AsExpression, FromSqlRow,\n};"
+      ],
+      "after_imports": [
+        "use euclid::frontend::{\n    ast::Program,\n    dir::{DirKeyKind, EuclidDirFilter},\n};",
+        "use diesel::{\n    sql_types::{Jsonb, Text},\n    AsExpression, FromSqlRow,\n};"
+      ]
+    }
+  ]
+}

diffs/pr_10077/f0027cc/diff.json

@@ -0,0 +1,39 @@
+{
+  "commit_sha": "f0027cc82968eaaa5f8224bed140b14bf4c18f12",
+  "pr_number": 10077,
+  "rust_files": [
+    "crates/router/src/types.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/types.rs::impl::PaymentsAuthorizeData",
+      "file": "crates/router/src/types.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl ForeignFrom<&SetupMandateRouterData> for PaymentsAuthorizeData {\n    fn foreign_from(data: &SetupMandateRouterData) -> Self {\n        Self {\n            currency: data.request.currency,\n            payment_method_data: data.request.payment_method_data.clone(),\n            confirm: data.request.confirm,\n            mandate_id: data.request.mandate_id.clone(),\n            setup_future_usage: data.request.setup_future_usage,\n            off_session: data.request.off_session,\n            setup_mandate_details: data.request.setup_mandate_details.clone(),\n            router_return_url: data.request.router_return_url.clone(),\n            email: data.request.email.clone(),\n            customer_name: data.request.customer_name.clone(),\n            amount: 0,\n            order_tax_amount: Some(MinorUnit::zero()),\n            minor_amount: MinorUnit::new(0),\n            capture_method: None,\n            webhook_url: None,\n            complete_authorize_url: None,\n            browser_info: data.request.browser_info.clone(),\n            order_details: None,\n            order_category: None,\n            session_token: None,\n            enrolled_for_3ds: true,\n            related_transaction_id: None,\n            payment_experience: None,\n            payment_method_type: None,\n            customer_id: None,\n            surcharge_details: None,\n            request_incremental_authorization: data.request.request_incremental_authorization,\n            metadata: None,\n            request_extended_authorization: None,\n            authentication_data: None,\n            customer_acceptance: data.request.customer_acceptance.clone(),\n            split_payments: None, // TODO: allow charges on mandates?\n            merchant_order_reference_id: None,\n            integrity_object: None,\n            additional_payment_method_data: None,\n            shipping_cost: data.request.shipping_cost,\n            merchant_account_id: None,\n            merchant_config_currency: None,\n            connector_testing_data: data.request.connector_testing_data.clone(),\n            order_id: None,\n            locale: None,\n            payment_channel: None,\n            enable_partial_authorization: data.request.enable_partial_authorization,\n            enable_overcapture: None,\n            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: None,\n        }\n    }\n}",
+      "after_code": "impl ForeignFrom<&SetupMandateRouterData> for PaymentsAuthorizeData {\n    fn foreign_from(data: &SetupMandateRouterData) -> Self {\n        Self {\n            currency: data.request.currency,\n            payment_method_data: data.request.payment_method_data.clone(),\n            confirm: data.request.confirm,\n            mandate_id: data.request.mandate_id.clone(),\n            setup_future_usage: data.request.setup_future_usage,\n            off_session: data.request.off_session,\n            setup_mandate_details: data.request.setup_mandate_details.clone(),\n            router_return_url: data.request.router_return_url.clone(),\n            email: data.request.email.clone(),\n            customer_name: data.request.customer_name.clone(),\n            amount: 0,\n            order_tax_amount: Some(MinorUnit::zero()),\n            minor_amount: MinorUnit::new(0),\n            capture_method: None,\n            webhook_url: None,\n            complete_authorize_url: None,\n            browser_info: data.request.browser_info.clone(),\n            order_details: None,\n            order_category: None,\n            session_token: None,\n            enrolled_for_3ds: true,\n            related_transaction_id: None,\n            payment_experience: None,\n            payment_method_type: None,\n            customer_id: None,\n            surcharge_details: None,\n            request_incremental_authorization: data.request.request_incremental_authorization,\n            metadata: None,\n            request_extended_authorization: None,\n            authentication_data: None,\n            customer_acceptance: data.request.customer_acceptance.clone(),\n            split_payments: None, // TODO: allow charges on mandates?\n            merchant_order_reference_id: None,\n            integrity_object: None,\n            additional_payment_method_data: None,\n            shipping_cost: data.request.shipping_cost,\n            merchant_account_id: None,\n            merchant_config_currency: None,\n            connector_testing_data: data.request.connector_testing_data.clone(),\n            order_id: None,\n            locale: None,\n            payment_channel: None,\n            enable_partial_authorization: data.request.enable_partial_authorization,\n            enable_overcapture: None,\n            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: data.request.billing_descriptor.clone(),\n        }\n    }\n}",
+      "diff_span": {
+        "before": "            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: None,\n        }\n    }",
+        "after": "            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: data.request.billing_descriptor.clone(),\n        }\n    }"
+      },
+      "commit_sha": "f0027cc82968eaaa5f8224bed140b14bf4c18f12"
+    },
+    {
+      "id": "crates/router/src/types.rs::PaymentsAuthorizeData::function::foreign_from",
+      "file": "crates/router/src/types.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn foreign_from(data: &SetupMandateRouterData) -> Self {\n        Self {\n            currency: data.request.currency,\n            payment_method_data: data.request.payment_method_data.clone(),\n            confirm: data.request.confirm,\n            mandate_id: data.request.mandate_id.clone(),\n            setup_future_usage: data.request.setup_future_usage,\n            off_session: data.request.off_session,\n            setup_mandate_details: data.request.setup_mandate_details.clone(),\n            router_return_url: data.request.router_return_url.clone(),\n            email: data.request.email.clone(),\n            customer_name: data.request.customer_name.clone(),\n            amount: 0,\n            order_tax_amount: Some(MinorUnit::zero()),\n            minor_amount: MinorUnit::new(0),\n            capture_method: None,\n            webhook_url: None,\n            complete_authorize_url: None,\n            browser_info: data.request.browser_info.clone(),\n            order_details: None,\n            order_category: None,\n            session_token: None,\n            enrolled_for_3ds: true,\n            related_transaction_id: None,\n            payment_experience: None,\n            payment_method_type: None,\n            customer_id: None,\n            surcharge_details: None,\n            request_incremental_authorization: data.request.request_incremental_authorization,\n            metadata: None,\n            request_extended_authorization: None,\n            authentication_data: None,\n            customer_acceptance: data.request.customer_acceptance.clone(),\n            split_payments: None, // TODO: allow charges on mandates?\n            merchant_order_reference_id: None,\n            integrity_object: None,\n            additional_payment_method_data: None,\n            shipping_cost: data.request.shipping_cost,\n            merchant_account_id: None,\n            merchant_config_currency: None,\n            connector_testing_data: data.request.connector_testing_data.clone(),\n            order_id: None,\n            locale: None,\n            payment_channel: None,\n            enable_partial_authorization: data.request.enable_partial_authorization,\n            enable_overcapture: None,\n            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: None,\n        }\n    }",
+      "after_code": "fn foreign_from(data: &SetupMandateRouterData) -> Self {\n        Self {\n            currency: data.request.currency,\n            payment_method_data: data.request.payment_method_data.clone(),\n            confirm: data.request.confirm,\n            mandate_id: data.request.mandate_id.clone(),\n            setup_future_usage: data.request.setup_future_usage,\n            off_session: data.request.off_session,\n            setup_mandate_details: data.request.setup_mandate_details.clone(),\n            router_return_url: data.request.router_return_url.clone(),\n            email: data.request.email.clone(),\n            customer_name: data.request.customer_name.clone(),\n            amount: 0,\n            order_tax_amount: Some(MinorUnit::zero()),\n            minor_amount: MinorUnit::new(0),\n            capture_method: None,\n            webhook_url: None,\n            complete_authorize_url: None,\n            browser_info: data.request.browser_info.clone(),\n            order_details: None,\n            order_category: None,\n            session_token: None,\n            enrolled_for_3ds: true,\n            related_transaction_id: None,\n            payment_experience: None,\n            payment_method_type: None,\n            customer_id: None,\n            surcharge_details: None,\n            request_incremental_authorization: data.request.request_incremental_authorization,\n            metadata: None,\n            request_extended_authorization: None,\n            authentication_data: None,\n            customer_acceptance: data.request.customer_acceptance.clone(),\n            split_payments: None, // TODO: allow charges on mandates?\n            merchant_order_reference_id: None,\n            integrity_object: None,\n            additional_payment_method_data: None,\n            shipping_cost: data.request.shipping_cost,\n            merchant_account_id: None,\n            merchant_config_currency: None,\n            connector_testing_data: data.request.connector_testing_data.clone(),\n            order_id: None,\n            locale: None,\n            payment_channel: None,\n            enable_partial_authorization: data.request.enable_partial_authorization,\n            enable_overcapture: None,\n            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: data.request.billing_descriptor.clone(),\n        }\n    }",
+      "diff_span": {
+        "before": "            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: None,\n        }\n    }",
+        "after": "            is_stored_credential: data.request.is_stored_credential,\n            mit_category: None,\n            billing_descriptor: data.request.billing_descriptor.clone(),\n        }\n    }"
+      },
+      "commit_sha": "f0027cc82968eaaa5f8224bed140b14bf4c18f12"
+    }
+  ]
+}

diffs/pr_10091/1082060/diff.json

@@ -0,0 +1,8 @@
+{
+  "commit_sha": "10820607b9ea2890b99940b6144fd0947309c3e4",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/hyperswitch_domain_models/src/router_response_types.rs"
+  ],
+  "diffs": []
+}

diffs/pr_10091/3fd244c/diff.json

@@ -0,0 +1,24 @@
+{
+  "commit_sha": "3fd244cd339037b532acc07c3b9e54d9d93bff3f",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/router/tests/connectors/aci.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/tests/connectors/aci.rs::function::get_threeds_payment_authorize_data",
+      "file": "crates/router/tests/connectors/aci.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn get_threeds_payment_authorize_data() -> Option<types::PaymentsAuthorizeData> {\n    Some(types::PaymentsAuthorizeData {\n        payment_method_data: PaymentMethodData::Card(Card {\n            card_number: cards::CardNumber::from_str(\"4200000000000000\").unwrap(),\n            card_exp_month: Secret::new(\"10\".to_string()),\n            card_exp_year: Secret::new(\"2025\".to_string()),\n            card_cvc: Secret::new(\"999\".to_string()),\n            card_holder_name: Some(Secret::new(\"John Doe\".to_string())),\n            ..utils::CCardType::default().0\n        }),\n        enrolled_for_3ds: true,\n        authentication_data: Some(AuthenticationData {\n            trans_status: None,\n            eci: Some(\"05\".to_string()),\n            cavv: Secret::new(\"jJ81HADVRtXfCBATEp01CJUAAAA\".to_string()),\n            threeds_server_transaction_id: Some(\"9458d8d4-f19f-4c28-b5c7-421b1dd2e1aa\".to_string()),\n            message_version: Some(common_utils::types::SemanticVersion::new(2, 1, 0)),\n            ds_trans_id: Some(\"97267598FAE648F28083B2D2AF7B1234\".to_string()),\n            created_at: common_utils::date_time::now(),\n            challenge_code: Some(\"01\".to_string()),\n            challenge_cancel: None,\n            challenge_code_reason: Some(\"01\".to_string()),\n            message_extension: None,\n            acs_trans_id: None,\n            authentication_type: None,\n            transaction_id: None,\n        }),\n        ..utils::PaymentAuthorizeType::default().0\n    })\n}",
+      "after_code": "fn get_threeds_payment_authorize_data() -> Option<types::PaymentsAuthorizeData> {\n    Some(types::PaymentsAuthorizeData {\n        payment_method_data: PaymentMethodData::Card(Card {\n            card_number: cards::CardNumber::from_str(\"4200000000000000\").unwrap(),\n            card_exp_month: Secret::new(\"10\".to_string()),\n            card_exp_year: Secret::new(\"2025\".to_string()),\n            card_cvc: Secret::new(\"999\".to_string()),\n            card_holder_name: Some(Secret::new(\"John Doe\".to_string())),\n            ..utils::CCardType::default().0\n        }),\n        enrolled_for_3ds: true,\n        authentication_data: Some(AuthenticationData {\n            trans_status: None,\n            eci: Some(\"05\".to_string()),\n            cavv: Secret::new(\"jJ81HADVRtXfCBATEp01CJUAAAA\".to_string()),\n            threeds_server_transaction_id: Some(\"9458d8d4-f19f-4c28-b5c7-421b1dd2e1aa\".to_string()),\n            message_version: Some(common_utils::types::SemanticVersion::new(2, 1, 0)),\n            ds_trans_id: Some(\"97267598FAE648F28083B2D2AF7B1234\".to_string()),\n            created_at: common_utils::date_time::now(),\n            challenge_code: Some(\"01\".to_string()),\n            challenge_cancel: None,\n            challenge_code_reason: Some(\"01\".to_string()),\n            message_extension: None,\n            acs_trans_id: None,\n            authentication_type: None,\n            transaction_id: None,\n            ucaf_collection_indicator: None,\n        }),\n        ..utils::PaymentAuthorizeType::default().0\n    })\n}",
+      "diff_span": {
+        "before": "",
+        "after": "            authentication_type: None,\n            transaction_id: None,\n            ucaf_collection_indicator: None,\n        }),\n        ..utils::PaymentAuthorizeType::default().0"
+      },
+      "commit_sha": "3fd244cd339037b532acc07c3b9e54d9d93bff3f"
+    }
+  ]
+}

diffs/pr_10091/47fcda1/diff.json

@@ -0,0 +1,6 @@
+{
+  "commit_sha": "47fcda181a329780258f06a2bc80a8f2adeae3f5",
+  "pr_number": 10091,
+  "rust_files": [],
+  "diffs": []
+}

diffs/pr_10091/688981d/diff.json

@@ -0,0 +1,253 @@
+{
+  "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/router/src/core/unified_connector_service/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::common_enums::TransactionStatus",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "impl transformers::ForeignFrom<payments_grpc::TransactionStatus>\n    for common_enums::TransactionStatus\n{\n    fn foreign_from(value: payments_grpc::TransactionStatus) -> Self {\n        match value {\n            payments_grpc::TransactionStatus::Success => Self::Success,\n            payments_grpc::TransactionStatus::Failure => Self::Failure,\n            payments_grpc::TransactionStatus::VerificationNotPerformed => {\n                Self::VerificationNotPerformed\n            }\n            payments_grpc::TransactionStatus::NotVerified => Self::NotVerified,\n            payments_grpc::TransactionStatus::Rejected => Self::Rejected,\n            payments_grpc::TransactionStatus::ChallengeRequired => Self::ChallengeRequired,\n            payments_grpc::TransactionStatus::ChallengeRequiredDecoupledAuthentication => {\n                Self::ChallengeRequiredDecoupledAuthentication\n            }\n            payments_grpc::TransactionStatus::InformationOnly => Self::InformationOnly,\n        }\n    }\n}",
+      "after_code": "impl ForeignFrom<payments_grpc::TransactionStatus> for common_enums::TransactionStatus {\n    fn foreign_from(value: payments_grpc::TransactionStatus) -> Self {\n        match value {\n            payments_grpc::TransactionStatus::Success => Self::Success,\n            payments_grpc::TransactionStatus::Failure => Self::Failure,\n            payments_grpc::TransactionStatus::VerificationNotPerformed => {\n                Self::VerificationNotPerformed\n            }\n            payments_grpc::TransactionStatus::NotVerified => Self::NotVerified,\n            payments_grpc::TransactionStatus::Rejected => Self::Rejected,\n            payments_grpc::TransactionStatus::ChallengeRequired => Self::ChallengeRequired,\n            payments_grpc::TransactionStatus::ChallengeRequiredDecoupledAuthentication => {\n                Self::ChallengeRequiredDecoupledAuthentication\n            }\n            payments_grpc::TransactionStatus::InformationOnly => Self::InformationOnly,\n        }\n    }\n}",
+      "diff_span": {
+        "before": "impl transformers::ForeignFrom<payments_grpc::TransactionStatus>\n    for common_enums::TransactionStatus\n{\n    fn foreign_from(value: payments_grpc::TransactionStatus) -> Self {\n        match value {",
+        "after": "impl ForeignFrom<payments_grpc::TransactionStatus> for common_enums::TransactionStatus {\n    fn foreign_from(value: payments_grpc::TransactionStatus) -> Self {\n        match value {"
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::AuthenticationData::function::foreign_try_from",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }",
+      "after_code": "fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }",
+      "diff_span": {
+        "before": "fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None",
+        "after": ""
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::AccessToken",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": false,
+      "imports_changed": true,
+      "before_code": "impl ForeignFrom<&payments_grpc::AccessToken> for AccessToken {\n    fn foreign_from(grpc_token: &payments_grpc::AccessToken) -> Self {\n        Self {\n            token: masking::Secret::new(grpc_token.token.clone()),\n            expires: grpc_token.expires_in_seconds.unwrap_or_default(),\n        }\n    }\n}",
+      "after_code": "impl ForeignFrom<&payments_grpc::AccessToken> for AccessToken {\n    fn foreign_from(grpc_token: &payments_grpc::AccessToken) -> Self {\n        Self {\n            token: masking::Secret::new(grpc_token.token.clone()),\n            expires: grpc_token.expires_in_seconds.unwrap_or_default(),\n        }\n    }\n}",
+      "diff_span": {
+        "before": "",
+        "after": ""
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::TransactionStatus",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "impl transformers::ForeignFrom<common_enums::TransactionStatus>\n    for payments_grpc::TransactionStatus\n{\n    fn foreign_from(value: common_enums::TransactionStatus) -> Self {\n        match value {\n            common_enums::TransactionStatus::Success => Self::Success,\n            common_enums::TransactionStatus::Failure => Self::Failure,\n            common_enums::TransactionStatus::VerificationNotPerformed => {\n                Self::VerificationNotPerformed\n            }\n            common_enums::TransactionStatus::NotVerified => Self::NotVerified,\n            common_enums::TransactionStatus::Rejected => Self::Rejected,\n            common_enums::TransactionStatus::ChallengeRequired => Self::ChallengeRequired,\n            common_enums::TransactionStatus::ChallengeRequiredDecoupledAuthentication => {\n                Self::ChallengeRequiredDecoupledAuthentication\n            }\n            common_enums::TransactionStatus::InformationOnly => Self::InformationOnly,\n        }\n    }\n}",
+      "after_code": "impl ForeignFrom<common_enums::TransactionStatus> for payments_grpc::TransactionStatus {\n    fn foreign_from(value: common_enums::TransactionStatus) -> Self {\n        match value {\n            common_enums::TransactionStatus::Success => Self::Success,\n            common_enums::TransactionStatus::Failure => Self::Failure,\n            common_enums::TransactionStatus::VerificationNotPerformed => {\n                Self::VerificationNotPerformed\n            }\n            common_enums::TransactionStatus::NotVerified => Self::NotVerified,\n            common_enums::TransactionStatus::Rejected => Self::Rejected,\n            common_enums::TransactionStatus::ChallengeRequired => Self::ChallengeRequired,\n            common_enums::TransactionStatus::ChallengeRequiredDecoupledAuthentication => {\n                Self::ChallengeRequiredDecoupledAuthentication\n            }\n            common_enums::TransactionStatus::InformationOnly => Self::InformationOnly,\n        }\n    }\n}",
+      "diff_span": {
+        "before": "impl transformers::ForeignFrom<common_enums::TransactionStatus>\n    for payments_grpc::TransactionStatus\n{\n    fn foreign_from(value: common_enums::TransactionStatus) -> Self {\n        match value {",
+        "after": "impl ForeignFrom<common_enums::TransactionStatus> for payments_grpc::TransactionStatus {\n    fn foreign_from(value: common_enums::TransactionStatus) -> Self {\n        match value {"
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::AuthenticationData::function::foreign_try_from",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }",
+      "after_code": "fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }",
+      "diff_span": {
+        "before": "            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,",
+        "after": "            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,"
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceError;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceError;",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::AuthenticationData",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "impl transformers::ForeignTryFrom<AuthenticationData> for payments_grpc::AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }\n}",
+      "after_code": "impl transformers::ForeignTryFrom<AuthenticationData> for payments_grpc::AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "\n    fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None",
+        "after": ""
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceError;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceError;",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::ConnectorState",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": false,
+      "imports_changed": true,
+      "before_code": "impl ForeignFrom<&AccessToken> for ConnectorState {\n    fn foreign_from(access_token: &AccessToken) -> Self {\n        Self {\n            access_token: Some(payments_grpc::AccessToken {\n                token: access_token.token.peek().to_string(),\n                expires_in_seconds: Some(access_token.expires),\n                token_type: None,\n            }),\n            connector_customer_id: None,\n        }\n    }\n}",
+      "after_code": "impl ForeignFrom<&AccessToken> for ConnectorState {\n    fn foreign_from(access_token: &AccessToken) -> Self {\n        Self {\n            access_token: Some(payments_grpc::AccessToken {\n                token: access_token.token.peek().to_string(),\n                expires_in_seconds: Some(access_token.expires),\n                token_type: None,\n            }),\n            connector_customer_id: None,\n        }\n    }\n}",
+      "diff_span": {
+        "before": "",
+        "after": ""
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::AuthenticationData",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "impl transformers::ForeignTryFrom<payments_grpc::AuthenticationData> for AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n    fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }\n}",
+      "after_code": "impl transformers::ForeignTryFrom<payments_grpc::AuthenticationData> for AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n    fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,",
+        "after": "            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,"
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2",
+      "before_imports": [
+        "use transformers::ForeignFrom;",
+        "use external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceError;",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ],
+      "after_imports": [
+        "use hyperswitch_domain_models::{\n    router_data::{AccessToken, ErrorResponse, RouterData},\n    router_flow_types::{\n        payments::{Authorize, Capture, PSync, SetupMandate},\n        refunds::{Execute, RSync},\n        unified_authentication_service as uas_flows, ExternalVaultProxy,\n    },\n    router_request_types::{\n        self, AuthenticationData, ExternalVaultProxyPaymentsData, PaymentsAuthorizeData,\n        PaymentsCancelData, PaymentsCaptureData, PaymentsSyncData, RefundsData,\n        SetupMandateRequestData,\n    },\n    router_response_types::{PaymentsResponseData, RedirectForm, RefundsResponseData},\n};",
+        "use unified_connector_service_client::payments::{\n    self as payments_grpc, ConnectorState, Identifier, PaymentServiceTransformRequest,\n    PaymentServiceTransformResponse,\n};",
+        "use external_services::grpc_client::unified_connector_service::UnifiedConnectorServiceError;",
+        "use crate::{\n    core::{errors, unified_connector_service},\n    types::{\n        api,\n        transformers::{self, ForeignFrom},\n    },\n};"
+      ]
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::PaymentServiceAuthorizeRequest::function::foreign_try_from",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            state: None,\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }",
+      "after_code": "fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }",
+      "diff_span": {
+        "before": "            state: None,\n            merchant_account_metadata: HashMap::new(),\n            state: None,\n            description: None,\n            setup_mandate_details: None,",
+        "after": ""
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::PaymentServiceAuthorizeRequest",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl\n    transformers::ForeignTryFrom<\n        &RouterData<ExternalVaultProxy, ExternalVaultProxyPaymentsData, PaymentsResponseData>,\n    > for payments_grpc::PaymentServiceAuthorizeRequest\n{\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            state: None,\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }\n}",
+      "after_code": "impl\n    transformers::ForeignTryFrom<\n        &RouterData<ExternalVaultProxy, ExternalVaultProxyPaymentsData, PaymentsResponseData>,\n    > for payments_grpc::PaymentServiceAuthorizeRequest\n{\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "            state: None,\n            merchant_account_metadata: HashMap::new(),\n            state: None,\n            description: None,\n            setup_mandate_details: None,",
+        "after": ""
+      },
+      "commit_sha": "688981d089ee7a1f526d13265c1f049f95a085c2"
+    }
+  ]
+}

diffs/pr_10091/84564ed/diff.json

@@ -0,0 +1,74 @@
+{
+  "commit_sha": "84564ed7025ff933ad9571470233297254881331",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/router/src/core/unified_connector_service.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/unified_connector_service.rs::function::decide_execution_path",
+      "file": "crates/router/src/core/unified_connector_service.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn decide_execution_path(\n    connector_type: ConnectorIntegrationType,\n    previous_gateway: Option<GatewaySystem>,\n    shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n    match (connector_type, previous_gateway, shadow_rollout_enabled) {\n        // Case 1: DirectConnector with no previous gateway and no shadow rollout\n        // This is a fresh payment request for a direct connector - use direct gateway\n        (\n            ConnectorIntegrationType::DirectConnector,\n            None,\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n        // Continue using the same direct gateway for consistency\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n        // Migration scenario: UCS was used before, but now we're reverting to Direct\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::UnifiedConnectorService),\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n        // Maintain Direct for backward compatibility - don't switch mid-transaction\n        (\n            ConnectorIntegrationType::UcsConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n        // Use Direct as primary, but also execute UCS in shadow mode for comparison\n        (\n            ConnectorIntegrationType::DirectConnector,\n            None,\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n        // Continue with Direct as primary, execute UCS in shadow mode for testing\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n        // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::UnifiedConnectorService),\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n        // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n        (\n            ConnectorIntegrationType::UcsConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n        // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n        (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n            Ok((\n                GatewaySystem::UnifiedConnectorService,\n                ExecutionPath::ShadowUnifiedConnectorService,\n            ))\n        }\n\n        // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n        // Fresh payment for a UCS-enabled connector - use UCS as primary\n        (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n            Ok((\n                GatewaySystem::UnifiedConnectorService,\n                ExecutionPath::UnifiedConnectorService,\n            ))\n        }\n\n        // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n        // Continue using UCS for consistency in the payment flow\n        (\n            ConnectorIntegrationType::UcsConnector,\n            Some(GatewaySystem::UnifiedConnectorService),\n            _,\n        ) => Ok((\n            GatewaySystem::UnifiedConnectorService,\n            ExecutionPath::UnifiedConnectorService,\n        )),\n    }\n}",
+      "after_code": "fn decide_execution_path(\n    connector_type: ConnectorIntegrationType,\n    previous_gateway: Option<GatewaySystem>,\n    shadow_rollout_enabled: ShadowRolloutAvailability,\n) -> RouterResult<(GatewaySystem, ExecutionPath)> {\n    match (connector_type, previous_gateway, shadow_rollout_enabled) {\n        // Case 1: DirectConnector with no previous gateway and no shadow rollout\n        // This is a fresh payment request for a direct connector - use direct gateway\n        (\n            ConnectorIntegrationType::DirectConnector,\n            None,\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 2: DirectConnector previously used Direct gateway, no shadow rollout\n        // Continue using the same direct gateway for consistency\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 3: DirectConnector previously used UCS, but now switching back to Direct (no shadow)\n        // Migration scenario: UCS was used before, but now we're reverting to Direct\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::UnifiedConnectorService),\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 4: UcsConnector configuration, but previously used Direct gateway (no shadow)\n        // Maintain Direct for backward compatibility - don't switch mid-transaction\n        (\n            ConnectorIntegrationType::UcsConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::NotAvailable,\n        ) => Ok((GatewaySystem::Direct, ExecutionPath::Direct)),\n\n        // Case 5: DirectConnector with no previous gateway, shadow rollout enabled\n        // Use Direct as primary, but also execute UCS in shadow mode for comparison\n        (\n            ConnectorIntegrationType::DirectConnector,\n            None,\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 6: DirectConnector previously used Direct, shadow rollout enabled\n        // Continue with Direct as primary, execute UCS in shadow mode for testing\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 7: DirectConnector previously used UCS, shadow rollout enabled\n        // Revert to Direct as primary, but keep UCS in shadow mode for comparison\n        (\n            ConnectorIntegrationType::DirectConnector,\n            Some(GatewaySystem::UnifiedConnectorService),\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 8: UcsConnector configuration, previously used Direct, shadow rollout enabled\n        // Maintain Direct as primary for transaction consistency, shadow UCS for testing\n        (\n            ConnectorIntegrationType::UcsConnector,\n            Some(GatewaySystem::Direct),\n            ShadowRolloutAvailability::IsAvailable,\n        ) => Ok((\n            GatewaySystem::Direct,\n            ExecutionPath::ShadowUnifiedConnectorService,\n        )),\n\n        // Case 9a: UcsConnector with no previous gateway and shadow rollout enabled\n        // Fresh payment for UCS-enabled connector with shadow mode - use shadow UCS\n        (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n            Ok((\n                GatewaySystem::Direct,\n                ExecutionPath::ShadowUnifiedConnectorService,\n            ))\n        }\n\n        // Case 9b: UcsConnector with no previous gateway and no shadow rollout\n        // Fresh payment for a UCS-enabled connector - use UCS as primary\n        (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::NotAvailable) => {\n            Ok((\n                GatewaySystem::UnifiedConnectorService,\n                ExecutionPath::UnifiedConnectorService,\n            ))\n        }\n\n        // Case 10: UcsConnector previously used UCS (regardless of shadow rollout)\n        // Continue using UCS for consistency in the payment flow\n        (\n            ConnectorIntegrationType::UcsConnector,\n            Some(GatewaySystem::UnifiedConnectorService),\n            _,\n        ) => Ok((\n            GatewaySystem::UnifiedConnectorService,\n            ExecutionPath::UnifiedConnectorService,\n        )),\n    }\n}",
+      "diff_span": {
+        "before": "        (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n            Ok((\n                GatewaySystem::UnifiedConnectorService,\n                ExecutionPath::ShadowUnifiedConnectorService,\n            ))",
+        "after": "        (ConnectorIntegrationType::UcsConnector, None, ShadowRolloutAvailability::IsAvailable) => {\n            Ok((\n                GatewaySystem::Direct,\n                ExecutionPath::ShadowUnifiedConnectorService,\n            ))"
+      },
+      "commit_sha": "84564ed7025ff933ad9571470233297254881331"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service_for_webhooks",
+      "file": "crates/router/src/core/unified_connector_service.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n    state: &SessionState,\n    merchant_context: &MerchantContext,\n    connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n    // Extract context information\n    let merchant_id = merchant_context\n        .get_merchant_account()\n        .get_id()\n        .get_string_repr();\n\n    let connector_enum = Connector::from_str(connector_name)\n        .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n        .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n    let flow_name = \"Webhooks\";\n\n    // Check UCS availability using idiomatic helper\n    let ucs_availability = check_ucs_availability(state).await;\n\n    // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n    let rollout_key = format!(\n        \"{}_{}_{}_{}\",\n        consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n        merchant_id,\n        connector_name,\n        flow_name\n    );\n    let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n    // Determine connector integration type\n    let connector_integration_type =\n        determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n    // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n    let previous_gateway = None;\n\n    // Check both rollout keys to determine priority based on shadow percentage\n    let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n    let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n    // Get shadow percentage to determine priority\n    let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n        .await\n        .unwrap_or(0.0);\n\n    let shadow_rollout_availability =\n        if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n            // Shadow is present and percentage is non-zero, use shadow\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else if rollout_result.should_execute {\n            // Either shadow is 0.0 or not present, use rollout if available\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else {\n            ShadowRolloutAvailability::NotAvailable\n        };\n\n    // Use the same decision logic as payments, with no call_connector_action to consider\n    let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n        router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n        (GatewaySystem::Direct, ExecutionPath::Direct)\n    } else {\n        // UCS is enabled, use decide function with no previous gateway for webhooks\n        decide_execution_path(\n            connector_integration_type,\n            previous_gateway,\n            shadow_rollout_availability,\n        )?\n    };\n\n    router_env::logger::info!(\n        \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n        gateway_system,\n        execution_path,\n        merchant_id,\n        connector_name,\n        flow_name\n    );\n\n    Ok(execution_path)\n}",
+      "after_code": "pub async fn should_call_unified_connector_service_for_webhooks(\n    state: &SessionState,\n    merchant_context: &MerchantContext,\n    connector_name: &str,\n) -> RouterResult<ExecutionPath> {\n    // Extract context information\n    let merchant_id = merchant_context\n        .get_merchant_account()\n        .get_id()\n        .get_string_repr();\n\n    let connector_enum = Connector::from_str(connector_name)\n        .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n        .attach_printable_lazy(|| format!(\"Failed to parse connector name: {}\", connector_name))?;\n\n    let flow_name = \"Webhooks\";\n\n    // Check UCS availability using idiomatic helper\n    let ucs_availability = check_ucs_availability(state).await;\n\n    // Build rollout keys - webhooks don't use payment method, so use a simplified key format\n    let rollout_key = format!(\n        \"{}_{}_{}_{}\",\n        consts::UCS_ROLLOUT_PERCENT_CONFIG_PREFIX,\n        merchant_id,\n        connector_name,\n        flow_name\n    );\n    let shadow_rollout_key = format!(\"{rollout_key}_shadow\");\n\n    // Determine connector integration type\n    let connector_integration_type =\n        determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n    // For webhooks, there is no previous gateway system to consider (webhooks are stateless)\n    let previous_gateway = None;\n\n    // Check both rollout keys to determine priority based on shadow percentage\n    let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n    let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n    // Get shadow percentage to determine priority\n    let (_shadow_key_exists, shadow_percentage) =\n        get_rollout_config_info(state, &shadow_rollout_key).await;\n\n    let shadow_rollout_availability =\n        if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n            // Shadow is present and percentage is non-zero, use shadow\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage.unwrap_or(0.0),\n                \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else if rollout_result.should_execute {\n            // Either shadow is 0.0 or not present, use rollout if available\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage.unwrap_or(0.0),\n                \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else {\n            ShadowRolloutAvailability::NotAvailable\n        };\n\n    // Use the same decision logic as payments, with no call_connector_action to consider\n    let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n        router_env::logger::debug!(\"UCS is disabled for webhooks, using Direct gateway\");\n        (GatewaySystem::Direct, ExecutionPath::Direct)\n    } else {\n        // UCS is enabled, use decide function with no previous gateway for webhooks\n        decide_execution_path(\n            connector_integration_type,\n            previous_gateway,\n            shadow_rollout_availability,\n        )?\n    };\n\n    router_env::logger::info!(\n        \"Webhook gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n        gateway_system,\n        execution_path,\n        merchant_id,\n        connector_name,\n        flow_name\n    );\n\n    Ok(execution_path)\n}",
+      "diff_span": {
+        "before": "\n    // Get shadow percentage to determine priority\n    let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n        .await\n        .unwrap_or(0.0);\n\n    let shadow_rollout_availability =\n        if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n            // Shadow is present and percentage is non-zero, use shadow\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else if rollout_result.should_execute {\n            // Either shadow is 0.0 or not present, use rollout if available\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n            );",
+        "after": "\n    // Get shadow percentage to determine priority\n    let (_shadow_key_exists, shadow_percentage) =\n        get_rollout_config_info(state, &shadow_rollout_key).await;\n\n    let shadow_rollout_availability =\n        if shadow_rollout_result.should_execute && shadow_percentage.unwrap_or(0.0) != 0.0 {\n            // Shadow is present and percentage is non-zero, use shadow\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage.unwrap_or(0.0),\n                \"Shadow rollout is present with non-zero percentage for webhooks, using shadow\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else if rollout_result.should_execute {\n            // Either shadow is 0.0 or not present, use rollout if available\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage.unwrap_or(0.0),\n                \"Shadow rollout is 0.0 or not present for webhooks, using rollout\"\n            );"
+      },
+      "commit_sha": "84564ed7025ff933ad9571470233297254881331"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service.rs::function::should_call_unified_connector_service",
+      "file": "crates/router/src/core/unified_connector_service.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n    state: &SessionState,\n    merchant_context: &MerchantContext,\n    router_data: &RouterData<F, T, R>,\n    payment_data: Option<&D>,\n    call_connector_action: CallConnectorAction,\n    shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n    D: OperationSessionGetters<F>,\n    R: Send + Sync + Clone,\n{\n    // Extract context information\n    let merchant_id = merchant_context\n        .get_merchant_account()\n        .get_id()\n        .get_string_repr();\n\n    let connector_name = &router_data.connector;\n    let connector_enum = Connector::from_str(connector_name)\n        .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n        .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n    let flow_name = get_flow_name::<F>()?;\n\n    // Check UCS availability using idiomatic helper\n    let ucs_availability = check_ucs_availability(state).await;\n\n    let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n        merchant_id,\n        connector_name,\n        &flow_name,\n        router_data.payment_method,\n    );\n\n    // Determine connector integration type\n    let connector_integration_type =\n        determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n    // Extract previous gateway from payment data\n    let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n    // Check both rollout keys to determine priority based on shadow percentage\n    let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n    let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n    // Get shadow percentage to determine priority\n    let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n        .await\n        .unwrap_or(0.0);\n\n    let shadow_rollout_availability =\n        if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n            // Shadow is present and percentage is non-zero, use shadow\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is present with non-zero percentage, using shadow\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else if rollout_result.should_execute {\n            // Either shadow is 0.0 or not present, use rollout if available\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is 0.0 or not present, using rollout\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else {\n            ShadowRolloutAvailability::NotAvailable\n        };\n\n    // Single decision point using pattern matching\n    let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n        match call_connector_action {\n            CallConnectorAction::UCSConsumeResponse(_)\n            | CallConnectorAction::UCSHandleResponse(_) => {\n                Err(errors::ApiErrorResponse::InternalServerError)\n                    .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n            }\n            CallConnectorAction::Avoid\n            | CallConnectorAction::Trigger\n            | CallConnectorAction::HandleResponse(_)\n            | CallConnectorAction::StatusUpdate { .. } => {\n                router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n                (GatewaySystem::Direct, ExecutionPath::Direct)\n            }\n        }\n    } else {\n        match call_connector_action {\n            CallConnectorAction::UCSConsumeResponse(_)\n            | CallConnectorAction::UCSHandleResponse(_) => {\n                router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n                (\n                    GatewaySystem::UnifiedConnectorService,\n                    ExecutionPath::UnifiedConnectorService,\n                )\n            }\n            CallConnectorAction::HandleResponse(_) => {\n                router_env::logger::info!(\n                    \"CallConnectorAction HandleResponse received, using Direct gateway\"\n                );\n                if shadow_ucs_call_connector_action.is_some() {\n                    (\n                        GatewaySystem::Direct,\n                        ExecutionPath::ShadowUnifiedConnectorService,\n                    )\n                } else {\n                    (GatewaySystem::Direct, ExecutionPath::Direct)\n                }\n            }\n            CallConnectorAction::Trigger\n            | CallConnectorAction::Avoid\n            | CallConnectorAction::StatusUpdate { .. } => {\n                // UCS is enabled, call decide function\n                decide_execution_path(\n                    connector_integration_type,\n                    previous_gateway,\n                    shadow_rollout_availability,\n                )?\n            }\n        }\n    };\n\n    router_env::logger::info!(\n        \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n        gateway_system,\n        execution_path,\n        merchant_id,\n        connector_name,\n        flow_name\n    );\n\n    // Handle proxy configuration for Shadow UCS flows\n    let session_state = match execution_path {\n        ExecutionPath::ShadowUnifiedConnectorService => {\n            // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n            match &rollout_result.proxy_override {\n                Some(proxy_override) => {\n                    router_env::logger::debug!(\n                        proxy_override = ?proxy_override,\n                        \"Creating updated session state with proxy configuration for Shadow UCS\"\n                    );\n                    create_updated_session_state_with_proxy(state.clone(), proxy_override)\n                }\n                None => {\n                    router_env::logger::debug!(\n                        \"No proxy override available for Shadow UCS, using original state\"\n                    );\n                    state.clone()\n                }\n            }\n        }\n        _ => {\n            // For Direct and UCS flows, use original state\n            state.clone()\n        }\n    };\n\n    Ok((execution_path, session_state))\n}",
+      "after_code": "pub async fn should_call_unified_connector_service<F: Clone, T, R, D>(\n    state: &SessionState,\n    merchant_context: &MerchantContext,\n    router_data: &RouterData<F, T, R>,\n    payment_data: Option<&D>,\n    call_connector_action: CallConnectorAction,\n    shadow_ucs_call_connector_action: Option<CallConnectorAction>,\n) -> RouterResult<(ExecutionPath, SessionState)>\nwhere\n    D: OperationSessionGetters<F>,\n    R: Send + Sync + Clone,\n{\n    // Extract context information\n    let merchant_id = merchant_context\n        .get_merchant_account()\n        .get_id()\n        .get_string_repr();\n\n    let connector_name = &router_data.connector;\n    let connector_enum = Connector::from_str(connector_name)\n        .change_context(errors::ApiErrorResponse::IncorrectConnectorNameGiven)\n        .attach_printable_lazy(|| format!(\"Failed to parse connector name: {connector_name}\"))?;\n\n    let flow_name = get_flow_name::<F>()?;\n\n    // Check UCS availability using idiomatic helper\n    let ucs_availability = check_ucs_availability(state).await;\n\n    let (rollout_key, shadow_rollout_key) = build_rollout_keys(\n        merchant_id,\n        connector_name,\n        &flow_name,\n        router_data.payment_method,\n    );\n\n    // Determine connector integration type\n    let connector_integration_type =\n        determine_connector_integration_type(state, connector_enum, &rollout_key).await?;\n\n    // Extract previous gateway from payment data\n    let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n    // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n    let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n    let (shadow_key_exists, _shadow_percentage) =\n        get_rollout_config_info(state, &shadow_rollout_key).await;\n\n    // Simplified decision logic: Shadow takes priority, then rollout, then direct\n    let shadow_rollout_availability = if shadow_key_exists {\n        // Block 1: Shadow key exists - check if it's enabled\n        let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n        if shadow_percentage != 0.0 {\n            router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n            ShadowRolloutAvailability::IsAvailable\n        } else {\n            router_env::logger::debug!(\n                shadow_key = %shadow_rollout_key,\n                shadow_percentage = shadow_percentage,\n                rollout_enabled = rollout_result.should_execute,\n                \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n            );\n            // Shadow disabled, result is the same regardless of rollout status\n            ShadowRolloutAvailability::NotAvailable\n        }\n    } else if rollout_result.should_execute {\n        // Block 2: No shadow key, but rollout is enabled - use primary UCS\n        router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n        ShadowRolloutAvailability::NotAvailable\n    } else {\n        // Block 3: Neither shadow nor rollout enabled - use direct\n        router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n        ShadowRolloutAvailability::NotAvailable\n    };\n\n    // Single decision point using pattern matching\n    let (gateway_system, execution_path) = if ucs_availability == UcsAvailability::Disabled {\n        match call_connector_action {\n            CallConnectorAction::UCSConsumeResponse(_)\n            | CallConnectorAction::UCSHandleResponse(_) => {\n                Err(errors::ApiErrorResponse::InternalServerError)\n                    .attach_printable(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received but UCS is disabled. These actions are only valid in UCS gateway\")?\n            }\n            CallConnectorAction::Avoid\n            | CallConnectorAction::Trigger\n            | CallConnectorAction::HandleResponse(_)\n            | CallConnectorAction::StatusUpdate { .. } => {\n                router_env::logger::debug!(\"UCS is disabled, using Direct gateway\");\n                (GatewaySystem::Direct, ExecutionPath::Direct)\n            }\n        }\n    } else {\n        match call_connector_action {\n            CallConnectorAction::UCSConsumeResponse(_)\n            | CallConnectorAction::UCSHandleResponse(_) => {\n                router_env::logger::info!(\"CallConnectorAction UCSHandleResponse/UCSConsumeResponse received, using UCS gateway\");\n                (\n                    GatewaySystem::UnifiedConnectorService,\n                    ExecutionPath::UnifiedConnectorService,\n                )\n            }\n            CallConnectorAction::HandleResponse(_) => {\n                router_env::logger::info!(\n                    \"CallConnectorAction HandleResponse received, using Direct gateway\"\n                );\n                if shadow_ucs_call_connector_action.is_some() {\n                    (\n                        GatewaySystem::Direct,\n                        ExecutionPath::ShadowUnifiedConnectorService,\n                    )\n                } else {\n                    (GatewaySystem::Direct, ExecutionPath::Direct)\n                }\n            }\n            CallConnectorAction::Trigger\n            | CallConnectorAction::Avoid\n            | CallConnectorAction::StatusUpdate { .. } => {\n                // UCS is enabled, call decide function\n                decide_execution_path(\n                    connector_integration_type,\n                    previous_gateway,\n                    shadow_rollout_availability,\n                )?\n            }\n        }\n    };\n\n    router_env::logger::info!(\n        \"Payment gateway decision: gateway={:?}, execution_path={:?} - merchant_id={}, connector={}, flow={}\",\n        gateway_system,\n        execution_path,\n        merchant_id,\n        connector_name,\n        flow_name\n    );\n\n    // Handle proxy configuration for Shadow UCS flows\n    let session_state = match execution_path {\n        ExecutionPath::ShadowUnifiedConnectorService => {\n            // For shadow UCS, use rollout_result for proxy configuration since it takes priority\n            match &rollout_result.proxy_override {\n                Some(proxy_override) => {\n                    router_env::logger::debug!(\n                        proxy_override = ?proxy_override,\n                        \"Creating updated session state with proxy configuration for Shadow UCS\"\n                    );\n                    create_updated_session_state_with_proxy(state.clone(), proxy_override)\n                }\n                None => {\n                    router_env::logger::debug!(\n                        \"No proxy override available for Shadow UCS, using original state\"\n                    );\n                    state.clone()\n                }\n            }\n        }\n        _ => {\n            // For Direct and UCS flows, use original state\n            state.clone()\n        }\n    };\n\n    Ok((execution_path, session_state))\n}",
+      "diff_span": {
+        "before": "    let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n    // Check both rollout keys to determine priority based on shadow percentage\n    let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n    let shadow_rollout_result = should_execute_based_on_rollout(state, &shadow_rollout_key).await?;\n\n    // Get shadow percentage to determine priority\n    let shadow_percentage = get_rollout_percentage(state, &shadow_rollout_key)\n        .await\n        .unwrap_or(0.0);\n\n    let shadow_rollout_availability =\n        if shadow_rollout_result.should_execute && shadow_percentage != 0.0 {\n            // Shadow is present and percentage is non-zero, use shadow\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is present with non-zero percentage, using shadow\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else if rollout_result.should_execute {\n            // Either shadow is 0.0 or not present, use rollout if available\n            router_env::logger::debug!(\n                shadow_percentage = shadow_percentage,\n                \"Shadow rollout is 0.0 or not present, using rollout\"\n            );\n            ShadowRolloutAvailability::IsAvailable\n        } else {\n            ShadowRolloutAvailability::NotAvailable\n        };\n\n    // Single decision point using pattern matching",
+        "after": "    let previous_gateway = payment_data.and_then(extract_gateway_system_from_payment_intent);\n\n    // Check rollout key availability and shadow key presence (optimized to reduce DB calls)\n    let rollout_result = should_execute_based_on_rollout(state, &rollout_key).await?;\n    let (shadow_key_exists, _shadow_percentage) =\n        get_rollout_config_info(state, &shadow_rollout_key).await;\n\n    // Simplified decision logic: Shadow takes priority, then rollout, then direct\n    let shadow_rollout_availability = if shadow_key_exists {\n        // Block 1: Shadow key exists - check if it's enabled\n        let shadow_percentage = _shadow_percentage.unwrap_or(0.0);\n\n        if shadow_percentage != 0.0 {\n            router_env::logger::debug!( shadow_key = %shadow_rollout_key, shadow_percentage = shadow_percentage, \"Shadow key enabled, using shadow mode for comparison\" );\n            ShadowRolloutAvailability::IsAvailable\n        } else {\n            router_env::logger::debug!(\n                shadow_key = %shadow_rollout_key,\n                shadow_percentage = shadow_percentage,\n                rollout_enabled = rollout_result.should_execute,\n                \"Shadow key exists but disabled (0.0%), falling back to rollout or direct\"\n            );\n            // Shadow disabled, result is the same regardless of rollout status\n            ShadowRolloutAvailability::NotAvailable\n        }\n    } else if rollout_result.should_execute {\n        // Block 2: No shadow key, but rollout is enabled - use primary UCS\n        router_env::logger::debug!( rollout_key = %rollout_key, \"No shadow key, rollout enabled, using primary UCS mode\" );\n        ShadowRolloutAvailability::NotAvailable\n    } else {\n        // Block 3: Neither shadow nor rollout enabled - use direct\n        router_env::logger::debug!( rollout_key = %rollout_key, shadow_key = %shadow_rollout_key, \"Neither shadow nor rollout enabled, using Direct mode\" );\n        ShadowRolloutAvailability::NotAvailable\n    };\n\n    // Single decision point using pattern matching"
+      },
+      "commit_sha": "84564ed7025ff933ad9571470233297254881331"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_config_info",
+      "file": "crates/router/src/core/unified_connector_service.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "async fn get_rollout_config_info(state: &SessionState, config_key: &str) -> (bool, Option<f64>) {\n    let db = state.store.as_ref();\n\n    match db.find_config_by_key(config_key).await {\n        Ok(rollout_config) => {\n            // Key exists, try to parse percentage\n            let percentage =\n                match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n                    Ok(config) => Some(config.rollout_percent),\n                    Err(_) => {\n                        // Fallback to legacy format (simple float)\n                        rollout_config.config.parse::<f64>().ok()\n                    }\n                };\n            (true, percentage)\n        }\n        Err(_) => (false, None), // Key doesn't exist\n    }\n}",
+      "diff_span": null,
+      "commit_sha": "84564ed7025ff933ad9571470233297254881331"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service.rs::function::get_rollout_percentage",
+      "file": "crates/router/src/core/unified_connector_service.rs",
+      "kind": "function_item",
+      "status": "removed",
+      "before_code": "async fn get_rollout_percentage(state: &SessionState, config_key: &str) -> Option<f64> {\n    let db = state.store.as_ref();\n\n    match db.find_config_by_key(config_key).await {\n        Ok(rollout_config) => {\n            // Try to parse as JSON first (new format), fallback to float (legacy format)\n            match serde_json::from_str::<helpers::RolloutConfig>(&rollout_config.config) {\n                Ok(config) => Some(config.rollout_percent),\n                Err(_) => {\n                    // Fallback to legacy format (simple float)\n                    rollout_config.config.parse::<f64>().ok()\n                }\n            }\n        }\n        Err(_) => None,\n    }\n}",
+      "after_code": null,
+      "diff_span": null,
+      "commit_sha": "84564ed7025ff933ad9571470233297254881331"
+    }
+  ]
+}

diffs/pr_10091/86c975c/diff.json

@@ -0,0 +1,39 @@
+{
+  "commit_sha": "86c975c896a639c4c66d8a4d3a57661151596541",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/router/src/core/unified_connector_service/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::PaymentServiceAuthorizeRequest::function::foreign_try_from",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            merchant_account_metadata: router_data\n                .connector_meta_data\n                .as_ref()\n                .and_then(|meta| meta.peek().as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }",
+      "after_code": "fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            merchant_account_metadata: router_data\n                .connector_meta_data\n                .as_ref()\n                .and_then(|meta| meta.peek().as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }",
+      "diff_span": {
+        "before": "            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            description: None,\n            setup_mandate_details: None,",
+        "after": ""
+      },
+      "commit_sha": "86c975c896a639c4c66d8a4d3a57661151596541"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::PaymentServiceAuthorizeRequest",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl\n    transformers::ForeignTryFrom<\n        &RouterData<ExternalVaultProxy, ExternalVaultProxyPaymentsData, PaymentsResponseData>,\n    > for payments_grpc::PaymentServiceAuthorizeRequest\n{\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            merchant_account_metadata: router_data\n                .connector_meta_data\n                .as_ref()\n                .and_then(|meta| meta.peek().as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }\n}",
+      "after_code": "impl\n    transformers::ForeignTryFrom<\n        &RouterData<ExternalVaultProxy, ExternalVaultProxyPaymentsData, PaymentsResponseData>,\n    > for payments_grpc::PaymentServiceAuthorizeRequest\n{\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(\n        router_data: &RouterData<\n            ExternalVaultProxy,\n            ExternalVaultProxyPaymentsData,\n            PaymentsResponseData,\n        >,\n    ) -> Result<Self, Self::Error> {\n        let currency = payments_grpc::Currency::foreign_try_from(router_data.request.currency)?;\n\n        let payment_method = router_data\n            .request\n            .payment_method_type\n            .map(|payment_method_type| {\n                unified_connector_service::build_unified_connector_service_payment_method_for_external_proxy(\n                    router_data.request.payment_method_data.clone(),\n                    payment_method_type,\n                )\n            })\n            .transpose()?;\n\n        let address = payments_grpc::PaymentAddress::foreign_try_from(router_data.address.clone())?;\n\n        let auth_type = payments_grpc::AuthenticationType::foreign_try_from(router_data.auth_type)?;\n\n        let browser_info = router_data\n            .request\n            .browser_info\n            .clone()\n            .map(payments_grpc::BrowserInformation::foreign_try_from)\n            .transpose()?;\n\n        let capture_method = router_data\n            .request\n            .capture_method\n            .map(payments_grpc::CaptureMethod::foreign_try_from)\n            .transpose()?;\n\n        let authentication_data = router_data\n            .request\n            .authentication_data\n            .clone()\n            .map(payments_grpc::AuthenticationData::foreign_try_from)\n            .transpose()?;\n\n        let setup_future_usage = router_data\n            .request\n            .setup_future_usage\n            .map(payments_grpc::FutureUsage::foreign_try_from)\n            .transpose()?;\n\n        let customer_acceptance = router_data\n            .request\n            .customer_acceptance\n            .clone()\n            .map(payments_grpc::CustomerAcceptance::foreign_try_from)\n            .transpose()?;\n\n        Ok(Self {\n            amount: router_data.request.amount,\n            currency: currency.into(),\n            payment_method,\n            return_url: router_data.request.router_return_url.clone(),\n            address: Some(address),\n            auth_type: auth_type.into(),\n            enrolled_for_3ds: router_data.request.enrolled_for_3ds,\n            request_incremental_authorization: router_data\n                .request\n                .request_incremental_authorization,\n            minor_amount: router_data.request.amount,\n            email: router_data\n                .request\n                .email\n                .clone()\n                .map(|e| e.expose().expose().into()),\n            browser_info,\n\n            session_token: None,\n            order_tax_amount: router_data\n                .request\n                .order_tax_amount\n                .map(|order_tax_amount| order_tax_amount.get_amount_as_i64()),\n            customer_name: router_data\n                .request\n                .customer_name\n                .clone()\n                .map(|customer_name| customer_name.peek().to_owned()),\n            capture_method: capture_method.map(|capture_method| capture_method.into()),\n            webhook_url: router_data.request.webhook_url.clone(),\n            complete_authorize_url: router_data.request.complete_authorize_url.clone(),\n            setup_future_usage: setup_future_usage.map(|s| s.into()),\n            off_session: router_data.request.off_session,\n            customer_acceptance,\n            order_category: router_data.request.order_category.clone(),\n            payment_experience: None,\n            authentication_data,\n            request_extended_authorization: router_data\n                .request\n                .request_extended_authorization\n                .map(|request_extended_authorization| request_extended_authorization.is_true()),\n            merchant_order_reference_id: router_data\n                .request\n                .merchant_order_reference_id\n                .as_ref()\n                .map(|merchant_order_reference_id| {\n                    merchant_order_reference_id.get_string_repr().to_string()\n                }),\n            shipping_cost: router_data\n                .request\n                .shipping_cost\n                .map(|shipping_cost| shipping_cost.get_amount_as_i64()),\n            request_ref_id: Some(Identifier {\n                id_type: Some(payments_grpc::identifier::IdType::Id(\n                    router_data.connector_request_reference_id.clone(),\n                )),\n            }),\n            customer_id: router_data\n                .request\n                .customer_id\n                .as_ref()\n                .map(|id| id.get_string_repr().to_string()),\n            metadata: router_data\n                .request\n                .metadata\n                .as_ref()\n                .and_then(|val| val.as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            merchant_account_metadata: router_data\n                .connector_meta_data\n                .as_ref()\n                .and_then(|meta| meta.peek().as_object())\n                .map(|map| {\n                    map.iter()\n                        .filter_map(|(k, v)| v.as_str().map(|s| (k.clone(), s.to_string())))\n                        .collect::<HashMap<String, String>>()\n                })\n                .unwrap_or_default(),\n            test_mode: router_data.test_mode,\n            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            description: None,\n            setup_mandate_details: None,\n            statement_descriptor_name: None,\n            statement_descriptor_suffix: None,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "            connector_customer_id: router_data.connector_customer.clone(),\n            state: None,\n            merchant_account_metadata: HashMap::new(),\n            description: None,\n            setup_mandate_details: None,",
+        "after": ""
+      },
+      "commit_sha": "86c975c896a639c4c66d8a4d3a57661151596541"
+    }
+  ]
+}

diffs/pr_10091/dd1f7b2/diff.json

@@ -0,0 +1,116 @@
+{
+  "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/hyperswitch_domain_models/src/router_request_types.rs",
+    "crates/router/src/core/payments/types.rs",
+    "crates/router/src/core/unified_connector_service/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::payments_grpc::AuthenticationData::function::foreign_try_from",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv: Some(authentication_data.cavv.expose()),\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n        })\n    }",
+      "after_code": "fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }",
+      "diff_span": {
+        "before": "        Ok(Self {\n            eci: authentication_data.eci,\n            cavv: Some(authentication_data.cavv.expose()),\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {",
+        "after": "fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    },
+    {
+      "id": "crates/hyperswitch_domain_models/src/router_request_types.rs::struct::AuthenticationData",
+      "file": "crates/hyperswitch_domain_models/src/router_request_types.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub struct AuthenticationData {\n    pub eci: Option<String>,\n    pub cavv: Secret<String>,\n    pub threeds_server_transaction_id: Option<String>,\n    pub message_version: Option<common_utils::types::SemanticVersion>,\n    pub ds_trans_id: Option<String>,\n    pub created_at: time::PrimitiveDateTime,\n    pub challenge_code: Option<String>,\n    pub challenge_cancel: Option<String>,\n    pub challenge_code_reason: Option<String>,\n    pub message_extension: Option<pii::SecretSerdeValue>,\n    pub acs_trans_id: Option<String>,\n    pub trans_status: Option<common_enums::TransactionStatus>,\n    pub authentication_type: Option<common_enums::DecoupledAuthenticationType>,\n    pub transaction_id: Option<String>,\n}",
+      "after_code": "pub struct AuthenticationData {\n    pub eci: Option<String>,\n    pub cavv: Secret<String>,\n    pub threeds_server_transaction_id: Option<String>,\n    pub message_version: Option<common_utils::types::SemanticVersion>,\n    pub ds_trans_id: Option<String>,\n    pub created_at: time::PrimitiveDateTime,\n    pub challenge_code: Option<String>,\n    pub challenge_cancel: Option<String>,\n    pub challenge_code_reason: Option<String>,\n    pub message_extension: Option<pii::SecretSerdeValue>,\n    pub acs_trans_id: Option<String>,\n    pub trans_status: Option<common_enums::TransactionStatus>,\n    pub authentication_type: Option<common_enums::DecoupledAuthenticationType>,\n    pub transaction_id: Option<String>,\n    pub ucaf_collection_indicator: Option<String>,\n}",
+      "diff_span": {
+        "before": "",
+        "after": "    pub authentication_type: Option<common_enums::DecoupledAuthenticationType>,\n    pub transaction_id: Option<String>,\n    pub ucaf_collection_indicator: Option<String>,\n}"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::AuthenticationData::function::foreign_try_from",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n        })\n    }",
+      "after_code": "fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }",
+      "diff_span": {
+        "before": "",
+        "after": "            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::payments_grpc::AuthenticationData",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl transformers::ForeignTryFrom<AuthenticationData> for payments_grpc::AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv: Some(authentication_data.cavv.expose()),\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n        })\n    }\n}",
+      "after_code": "impl transformers::ForeignTryFrom<AuthenticationData> for payments_grpc::AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n\n    fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "        Ok(Self {\n            eci: authentication_data.eci,\n            cavv: Some(authentication_data.cavv.expose()),\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {",
+        "after": "    fn foreign_try_from(authentication_data: AuthenticationData) -> Result<Self, Self::Error> {\n        use transformers::ForeignFrom;\n        let cavv = if authentication_data.cavv.peek().is_empty() {\n            None\n        } else {\n            Some(authentication_data.cavv.expose().to_string())\n        };\n        Ok(Self {\n            eci: authentication_data.eci,\n            cavv,\n            threeds_server_transaction_id: authentication_data.threeds_server_transaction_id.map(\n                |id| Identifier {\n                    id_type: Some(payments_grpc::identifier::IdType::Id(id)),\n                },\n            ),\n            message_version: authentication_data\n                .message_version\n                .map(|message_version| message_version.to_string()),\n            ds_transaction_id: authentication_data.ds_trans_id,\n            trans_status: authentication_data\n                .trans_status\n                .map(payments_grpc::TransactionStatus::foreign_from)\n                .map(i32::from),\n            acs_transaction_id: authentication_data.acs_trans_id,\n            transaction_id: authentication_data.transaction_id,\n            ucaf_collection_indicator: authentication_data.ucaf_collection_indicator,\n        })\n    }"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    },
+    {
+      "id": "crates/router/src/core/payments/types.rs::AuthenticationData::function::foreign_try_from",
+      "file": "crates/router/src/core/payments/types.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn foreign_try_from(\n        authentication_store: &hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore,\n    ) -> Result<Self, Self::Error> {\n        let authentication = &authentication_store.authentication;\n        if authentication.authentication_status == common_enums::AuthenticationStatus::Success {\n            let threeds_server_transaction_id =\n                authentication.threeds_server_transaction_id.clone();\n            let message_version = authentication.message_version.clone();\n            let cavv = authentication_store\n                .cavv\n                .clone()\n                .get_required_value(\"cavv\")\n                .change_context(errors::ApiErrorResponse::InternalServerError)\n                .attach_printable(\"cavv must not be null when authentication_status is success\")?;\n            Ok(Self {\n                trans_status: authentication.trans_status.clone(),\n                eci: authentication.eci.clone(),\n                created_at: authentication.created_at,\n                cavv,\n                threeds_server_transaction_id,\n                message_version,\n                ds_trans_id: authentication.ds_trans_id.clone(),\n                authentication_type: authentication.authentication_type,\n                challenge_code: authentication.challenge_code.clone(),\n                challenge_cancel: authentication.challenge_cancel.clone(),\n                challenge_code_reason: authentication.challenge_code_reason.clone(),\n                message_extension: authentication.message_extension.clone(),\n                acs_trans_id: authentication.acs_trans_id.clone(),\n                transaction_id: authentication.connector_authentication_id.clone(),\n            })\n        } else {\n            Err(errors::ApiErrorResponse::PaymentAuthenticationFailed { data: None }.into())\n        }\n    }",
+      "after_code": "fn foreign_try_from(\n        authentication_store: &hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore,\n    ) -> Result<Self, Self::Error> {\n        let authentication = &authentication_store.authentication;\n        if authentication.authentication_status == common_enums::AuthenticationStatus::Success {\n            let threeds_server_transaction_id =\n                authentication.threeds_server_transaction_id.clone();\n            let message_version = authentication.message_version.clone();\n            let cavv = authentication_store\n                .cavv\n                .clone()\n                .get_required_value(\"cavv\")\n                .change_context(errors::ApiErrorResponse::InternalServerError)\n                .attach_printable(\"cavv must not be null when authentication_status is success\")?;\n            Ok(Self {\n                trans_status: authentication.trans_status.clone(),\n                eci: authentication.eci.clone(),\n                created_at: authentication.created_at,\n                cavv,\n                threeds_server_transaction_id,\n                message_version,\n                ds_trans_id: authentication.ds_trans_id.clone(),\n                authentication_type: authentication.authentication_type,\n                challenge_code: authentication.challenge_code.clone(),\n                challenge_cancel: authentication.challenge_cancel.clone(),\n                challenge_code_reason: authentication.challenge_code_reason.clone(),\n                message_extension: authentication.message_extension.clone(),\n                acs_trans_id: authentication.acs_trans_id.clone(),\n                transaction_id: authentication.connector_authentication_id.clone(),\n                ucaf_collection_indicator: None,\n            })\n        } else {\n            Err(errors::ApiErrorResponse::PaymentAuthenticationFailed { data: None }.into())\n        }\n    }",
+      "diff_span": {
+        "before": "",
+        "after": "                acs_trans_id: authentication.acs_trans_id.clone(),\n                transaction_id: authentication.connector_authentication_id.clone(),\n                ucaf_collection_indicator: None,\n            })\n        } else {"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    },
+    {
+      "id": "crates/router/src/core/unified_connector_service/transformers.rs::impl::AuthenticationData",
+      "file": "crates/router/src/core/unified_connector_service/transformers.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl transformers::ForeignTryFrom<payments_grpc::AuthenticationData> for AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n    fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n        })\n    }\n}",
+      "after_code": "impl transformers::ForeignTryFrom<payments_grpc::AuthenticationData> for AuthenticationData {\n    type Error = error_stack::Report<UnifiedConnectorServiceError>;\n    fn foreign_try_from(response: payments_grpc::AuthenticationData) -> Result<Self, Self::Error> {\n        let payments_grpc::AuthenticationData {\n            eci,\n            cavv,\n            threeds_server_transaction_id,\n            message_version,\n            ds_transaction_id,\n            trans_status,\n            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "",
+        "after": "            acs_transaction_id,\n            transaction_id,\n            ucaf_collection_indicator,\n        } = response;\n        let trans_status = trans_status\n            .map(payments_grpc::TransactionStatus::try_from)\n            .transpose()\n            .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n            .attach_printable(\"Failed to convert TransactionStatus from grpc to domain\")?\n            .map(transformers::ForeignFrom::foreign_from);\n        Ok(Self {\n            trans_status,\n            eci,\n            cavv: cavv.map(masking::Secret::new).unwrap_or_default(),\n            threeds_server_transaction_id: threeds_server_transaction_id\n                .and_then(|id| id.id_type)\n                .and_then(|id_type| match id_type {\n                    payments_grpc::identifier::IdType::Id(id) => Some(id),\n                    payments_grpc::identifier::IdType::EncodedData(encoded_data) => {\n                        Some(encoded_data)\n                    }\n                    payments_grpc::identifier::IdType::NoResponseIdMarker(_) => None,\n                }),\n            message_version: message_version\n                .map(|message_version_str| {\n                    types::SemanticVersion::from_str(message_version_str.as_ref())\n                        .change_context(UnifiedConnectorServiceError::ResponseDeserializationFailed)\n                        .attach_printable(\"Failed to Deserialize message_version\")\n                })\n                .transpose()?,\n            ds_trans_id: ds_transaction_id,\n            created_at: time::PrimitiveDateTime::MIN,\n            challenge_code: None,\n            challenge_cancel: None,\n            challenge_code_reason: None,\n            message_extension: None,\n            acs_trans_id: acs_transaction_id,\n            authentication_type: None,\n            transaction_id,\n            ucaf_collection_indicator,\n        })\n    }"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    },
+    {
+      "id": "crates/router/src/core/payments/types.rs::impl::AuthenticationData",
+      "file": "crates/router/src/core/payments/types.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl\n    ForeignTryFrom<\n        &hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore,\n    > for AuthenticationData\n{\n    type Error = error_stack::Report<errors::ApiErrorResponse>;\n    fn foreign_try_from(\n        authentication_store: &hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore,\n    ) -> Result<Self, Self::Error> {\n        let authentication = &authentication_store.authentication;\n        if authentication.authentication_status == common_enums::AuthenticationStatus::Success {\n            let threeds_server_transaction_id =\n                authentication.threeds_server_transaction_id.clone();\n            let message_version = authentication.message_version.clone();\n            let cavv = authentication_store\n                .cavv\n                .clone()\n                .get_required_value(\"cavv\")\n                .change_context(errors::ApiErrorResponse::InternalServerError)\n                .attach_printable(\"cavv must not be null when authentication_status is success\")?;\n            Ok(Self {\n                trans_status: authentication.trans_status.clone(),\n                eci: authentication.eci.clone(),\n                created_at: authentication.created_at,\n                cavv,\n                threeds_server_transaction_id,\n                message_version,\n                ds_trans_id: authentication.ds_trans_id.clone(),\n                authentication_type: authentication.authentication_type,\n                challenge_code: authentication.challenge_code.clone(),\n                challenge_cancel: authentication.challenge_cancel.clone(),\n                challenge_code_reason: authentication.challenge_code_reason.clone(),\n                message_extension: authentication.message_extension.clone(),\n                acs_trans_id: authentication.acs_trans_id.clone(),\n                transaction_id: authentication.connector_authentication_id.clone(),\n            })\n        } else {\n            Err(errors::ApiErrorResponse::PaymentAuthenticationFailed { data: None }.into())\n        }\n    }\n}",
+      "after_code": "impl\n    ForeignTryFrom<\n        &hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore,\n    > for AuthenticationData\n{\n    type Error = error_stack::Report<errors::ApiErrorResponse>;\n    fn foreign_try_from(\n        authentication_store: &hyperswitch_domain_models::router_request_types::authentication::AuthenticationStore,\n    ) -> Result<Self, Self::Error> {\n        let authentication = &authentication_store.authentication;\n        if authentication.authentication_status == common_enums::AuthenticationStatus::Success {\n            let threeds_server_transaction_id =\n                authentication.threeds_server_transaction_id.clone();\n            let message_version = authentication.message_version.clone();\n            let cavv = authentication_store\n                .cavv\n                .clone()\n                .get_required_value(\"cavv\")\n                .change_context(errors::ApiErrorResponse::InternalServerError)\n                .attach_printable(\"cavv must not be null when authentication_status is success\")?;\n            Ok(Self {\n                trans_status: authentication.trans_status.clone(),\n                eci: authentication.eci.clone(),\n                created_at: authentication.created_at,\n                cavv,\n                threeds_server_transaction_id,\n                message_version,\n                ds_trans_id: authentication.ds_trans_id.clone(),\n                authentication_type: authentication.authentication_type,\n                challenge_code: authentication.challenge_code.clone(),\n                challenge_cancel: authentication.challenge_cancel.clone(),\n                challenge_code_reason: authentication.challenge_code_reason.clone(),\n                message_extension: authentication.message_extension.clone(),\n                acs_trans_id: authentication.acs_trans_id.clone(),\n                transaction_id: authentication.connector_authentication_id.clone(),\n                ucaf_collection_indicator: None,\n            })\n        } else {\n            Err(errors::ApiErrorResponse::PaymentAuthenticationFailed { data: None }.into())\n        }\n    }\n}",
+      "diff_span": {
+        "before": "",
+        "after": "                acs_trans_id: authentication.acs_trans_id.clone(),\n                transaction_id: authentication.connector_authentication_id.clone(),\n                ucaf_collection_indicator: None,\n            })\n        } else {"
+      },
+      "commit_sha": "dd1f7b28d08ff77f1bd173103344c4eedcebcbe0"
+    }
+  ]
+}

diffs/pr_10091/de3edfa/diff.json

@@ -0,0 +1,39 @@
+{
+  "commit_sha": "de3edfab34f5200a1e126105dc95e25358691197",
+  "pr_number": 10091,
+  "rust_files": [
+    "crates/router/src/core/payments/flows/complete_authorize_flow.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/payments/flows/complete_authorize_flow.rs::types::RouterData<\n        api::CompleteAuthorize,\n        types::CompleteAuthorizeData,\n        types::PaymentsResponseData,\n    >::function::call_preprocessing_through_unified_connector_service",
+      "file": "crates/router/src/core/payments/flows/complete_authorize_flow.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "async fn call_preprocessing_through_unified_connector_service<'a>(\n        self,\n        state: &SessionState,\n        header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n        lineage_ids: &grpc_client::LineageIds,\n        #[cfg(feature = \"v1\")] merchant_connector_account: helpers::MerchantConnectorAccountType,\n        #[cfg(feature = \"v2\")]\n        merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n        merchant_context: &domain::MerchantContext,\n        connector_data: &api::ConnectorData,\n        unified_connector_service_execution_mode: common_enums::ExecutionMode,\n        merchant_order_reference_id: Option<String>,\n    ) -> RouterResult<(Self, bool)> {\n        let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n            request_data: &self.request,\n        };\n        let optional_preprocessing_flow = connector_data\n            .connector\n            .get_preprocessing_flow_if_needed(current_flow);\n        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                )\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {\n                    response: &updated_router_data.response,\n                    attempt_status: updated_router_data.status,\n                };\n                let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n                    request_data: &updated_router_data.request,\n                };\n                let should_continue = connector_data\n                    .connector\n                    .decide_should_continue_after_preprocessing(\n                        current_flow,\n                        preprocessing_flow,\n                        pre_processing_flow_response,\n                    );\n                Ok((updated_router_data, should_continue))\n            }\n            None => Ok((self, true)),\n        }\n    }",
+      "after_code": "async fn call_preprocessing_through_unified_connector_service<'a>(\n        self,\n        state: &SessionState,\n        header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n        lineage_ids: &grpc_client::LineageIds,\n        #[cfg(feature = \"v1\")] merchant_connector_account: helpers::MerchantConnectorAccountType,\n        #[cfg(feature = \"v2\")]\n        merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n        merchant_context: &domain::MerchantContext,\n        connector_data: &api::ConnectorData,\n        unified_connector_service_execution_mode: common_enums::ExecutionMode,\n        merchant_order_reference_id: Option<String>,\n    ) -> RouterResult<(Self, bool)> {\n        let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n            request_data: &self.request,\n        };\n        let optional_preprocessing_flow = connector_data\n            .connector\n            .get_preprocessing_flow_if_needed(current_flow);\n        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = Box::pin(handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                ))\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {\n                    response: &updated_router_data.response,\n                    attempt_status: updated_router_data.status,\n                };\n                let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n                    request_data: &updated_router_data.request,\n                };\n                let should_continue = connector_data\n                    .connector\n                    .decide_should_continue_after_preprocessing(\n                        current_flow,\n                        preprocessing_flow,\n                        pre_processing_flow_response,\n                    );\n                Ok((updated_router_data, should_continue))\n            }\n            None => Ok((self, true)),\n        }\n    }",
+      "diff_span": {
+        "before": "        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                )\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {",
+        "after": "        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = Box::pin(handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                ))\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {"
+      },
+      "commit_sha": "de3edfab34f5200a1e126105dc95e25358691197"
+    },
+    {
+      "id": "crates/router/src/core/payments/flows/complete_authorize_flow.rs::impl::types::RouterData<\n        api::CompleteAuthorize,\n        types::CompleteAuthorizeData,\n        types::PaymentsResponseData,\n    >",
+      "file": "crates/router/src/core/payments/flows/complete_authorize_flow.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl Feature<api::CompleteAuthorize, types::CompleteAuthorizeData>\n    for types::RouterData<\n        api::CompleteAuthorize,\n        types::CompleteAuthorizeData,\n        types::PaymentsResponseData,\n    >\n{\n    async fn decide_flows<'a>(\n        mut self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        call_connector_action: payments::CallConnectorAction,\n        connector_request: Option<services::Request>,\n        business_profile: &domain::Profile,\n        header_payload: hyperswitch_domain_models::payments::HeaderPayload,\n        _return_raw_connector_response: Option<bool>,\n    ) -> RouterResult<Self> {\n        let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n            api::CompleteAuthorize,\n            types::CompleteAuthorizeData,\n            types::PaymentsResponseData,\n        > = connector.connector.get_connector_integration();\n\n        let mut complete_authorize_router_data = services::execute_connector_processing_step(\n            state,\n            connector_integration,\n            &self,\n            call_connector_action.clone(),\n            connector_request,\n            None,\n        )\n        .await\n        .to_payment_failed_response()?;\n        match complete_authorize_router_data.response.clone() {\n            Err(_) => Ok(complete_authorize_router_data),\n            Ok(complete_authorize_response) => {\n                // Check if the Capture API should be called based on the connector and other parameters\n                if super::should_initiate_capture_flow(\n                    &connector.connector_name,\n                    self.request.customer_acceptance,\n                    self.request.capture_method,\n                    self.request.setup_future_usage,\n                    complete_authorize_router_data.status,\n                ) {\n                    complete_authorize_router_data = Box::pin(process_capture_flow(\n                        complete_authorize_router_data,\n                        complete_authorize_response,\n                        state,\n                        connector,\n                        call_connector_action.clone(),\n                        business_profile,\n                        header_payload,\n                    ))\n                    .await?;\n                }\n                Ok(complete_authorize_router_data)\n            }\n        }\n    }\n\n    async fn add_access_token<'a>(\n        &self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        _merchant_context: &domain::MerchantContext,\n        creds_identifier: Option<&str>,\n    ) -> RouterResult<types::AddAccessTokenResult> {\n        Box::pin(access_token::add_access_token(\n            state,\n            connector,\n            self,\n            creds_identifier,\n        ))\n        .await\n    }\n\n    async fn add_payment_method_token<'a>(\n        &mut self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        _tokenization_action: &payments::TokenizationAction,\n        should_continue_payment: bool,\n    ) -> RouterResult<types::PaymentMethodTokenResult> {\n        // TODO: remove this and handle it in core\n        if matches!(connector.connector_name, types::Connector::Payme) {\n            let request = self.request.clone();\n            payments::tokenization::add_payment_method_token(\n                state,\n                connector,\n                &payments::TokenizationAction::TokenizeInConnector,\n                self,\n                types::PaymentMethodTokenizationData::try_from(request)?,\n                should_continue_payment,\n            )\n            .await\n        } else {\n            Ok(types::PaymentMethodTokenResult {\n                payment_method_token_result: Ok(None),\n                is_payment_method_tokenization_performed: false,\n                connector_response: None,\n            })\n        }\n    }\n\n    async fn build_flow_specific_connector_request(\n        &mut self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        call_connector_action: payments::CallConnectorAction,\n    ) -> RouterResult<(Option<services::Request>, bool)> {\n        let request = match call_connector_action {\n            payments::CallConnectorAction::Trigger => {\n                let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n                    api::CompleteAuthorize,\n                    types::CompleteAuthorizeData,\n                    types::PaymentsResponseData,\n                > = connector.connector.get_connector_integration();\n\n                connector_integration\n                    .build_request(self, &state.conf.connectors)\n                    .to_payment_failed_response()?\n            }\n            _ => None,\n        };\n\n        Ok((request, true))\n    }\n\n    async fn preprocessing_steps<'a>(\n        self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n    ) -> RouterResult<Self> {\n        complete_authorize_preprocessing_steps(state, &self, true, connector).await\n    }\n\n    async fn call_preprocessing_through_unified_connector_service<'a>(\n        self,\n        state: &SessionState,\n        header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n        lineage_ids: &grpc_client::LineageIds,\n        #[cfg(feature = \"v1\")] merchant_connector_account: helpers::MerchantConnectorAccountType,\n        #[cfg(feature = \"v2\")]\n        merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n        merchant_context: &domain::MerchantContext,\n        connector_data: &api::ConnectorData,\n        unified_connector_service_execution_mode: common_enums::ExecutionMode,\n        merchant_order_reference_id: Option<String>,\n    ) -> RouterResult<(Self, bool)> {\n        let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n            request_data: &self.request,\n        };\n        let optional_preprocessing_flow = connector_data\n            .connector\n            .get_preprocessing_flow_if_needed(current_flow);\n        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                )\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {\n                    response: &updated_router_data.response,\n                    attempt_status: updated_router_data.status,\n                };\n                let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n                    request_data: &updated_router_data.request,\n                };\n                let should_continue = connector_data\n                    .connector\n                    .decide_should_continue_after_preprocessing(\n                        current_flow,\n                        preprocessing_flow,\n                        pre_processing_flow_response,\n                    );\n                Ok((updated_router_data, should_continue))\n            }\n            None => Ok((self, true)),\n        }\n    }\n\n    async fn call_unified_connector_service<'a>(\n        &mut self,\n        state: &SessionState,\n        header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n        lineage_ids: grpc_client::LineageIds,\n        #[cfg(feature = \"v1\")] merchant_connector_account: helpers::MerchantConnectorAccountType,\n        #[cfg(feature = \"v2\")]\n        merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n        merchant_context: &domain::MerchantContext,\n        connector_data: &api::ConnectorData,\n        unified_connector_service_execution_mode: common_enums::ExecutionMode,\n        merchant_order_reference_id: Option<String>,\n        _call_connector_action: common_enums::CallConnectorAction,\n        _creds_identifier: Option<String>,\n    ) -> RouterResult<()> {\n        // Call UCS for Complete Authorize flow\n        Box::pin(call_unified_connector_service_complete_authorize(\n            self,\n            state,\n            header_payload,\n            lineage_ids,\n            merchant_connector_account,\n            merchant_context,\n            connector_data.connector_name,\n            unified_connector_service_execution_mode,\n            merchant_order_reference_id,\n        ))\n        .await\n    }\n}",
+      "after_code": "impl Feature<api::CompleteAuthorize, types::CompleteAuthorizeData>\n    for types::RouterData<\n        api::CompleteAuthorize,\n        types::CompleteAuthorizeData,\n        types::PaymentsResponseData,\n    >\n{\n    async fn decide_flows<'a>(\n        mut self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        call_connector_action: payments::CallConnectorAction,\n        connector_request: Option<services::Request>,\n        business_profile: &domain::Profile,\n        header_payload: hyperswitch_domain_models::payments::HeaderPayload,\n        _return_raw_connector_response: Option<bool>,\n    ) -> RouterResult<Self> {\n        let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n            api::CompleteAuthorize,\n            types::CompleteAuthorizeData,\n            types::PaymentsResponseData,\n        > = connector.connector.get_connector_integration();\n\n        let mut complete_authorize_router_data = services::execute_connector_processing_step(\n            state,\n            connector_integration,\n            &self,\n            call_connector_action.clone(),\n            connector_request,\n            None,\n        )\n        .await\n        .to_payment_failed_response()?;\n        match complete_authorize_router_data.response.clone() {\n            Err(_) => Ok(complete_authorize_router_data),\n            Ok(complete_authorize_response) => {\n                // Check if the Capture API should be called based on the connector and other parameters\n                if super::should_initiate_capture_flow(\n                    &connector.connector_name,\n                    self.request.customer_acceptance,\n                    self.request.capture_method,\n                    self.request.setup_future_usage,\n                    complete_authorize_router_data.status,\n                ) {\n                    complete_authorize_router_data = Box::pin(process_capture_flow(\n                        complete_authorize_router_data,\n                        complete_authorize_response,\n                        state,\n                        connector,\n                        call_connector_action.clone(),\n                        business_profile,\n                        header_payload,\n                    ))\n                    .await?;\n                }\n                Ok(complete_authorize_router_data)\n            }\n        }\n    }\n\n    async fn add_access_token<'a>(\n        &self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        _merchant_context: &domain::MerchantContext,\n        creds_identifier: Option<&str>,\n    ) -> RouterResult<types::AddAccessTokenResult> {\n        Box::pin(access_token::add_access_token(\n            state,\n            connector,\n            self,\n            creds_identifier,\n        ))\n        .await\n    }\n\n    async fn add_payment_method_token<'a>(\n        &mut self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        _tokenization_action: &payments::TokenizationAction,\n        should_continue_payment: bool,\n    ) -> RouterResult<types::PaymentMethodTokenResult> {\n        // TODO: remove this and handle it in core\n        if matches!(connector.connector_name, types::Connector::Payme) {\n            let request = self.request.clone();\n            payments::tokenization::add_payment_method_token(\n                state,\n                connector,\n                &payments::TokenizationAction::TokenizeInConnector,\n                self,\n                types::PaymentMethodTokenizationData::try_from(request)?,\n                should_continue_payment,\n            )\n            .await\n        } else {\n            Ok(types::PaymentMethodTokenResult {\n                payment_method_token_result: Ok(None),\n                is_payment_method_tokenization_performed: false,\n                connector_response: None,\n            })\n        }\n    }\n\n    async fn build_flow_specific_connector_request(\n        &mut self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n        call_connector_action: payments::CallConnectorAction,\n    ) -> RouterResult<(Option<services::Request>, bool)> {\n        let request = match call_connector_action {\n            payments::CallConnectorAction::Trigger => {\n                let connector_integration: services::BoxedPaymentConnectorIntegrationInterface<\n                    api::CompleteAuthorize,\n                    types::CompleteAuthorizeData,\n                    types::PaymentsResponseData,\n                > = connector.connector.get_connector_integration();\n\n                connector_integration\n                    .build_request(self, &state.conf.connectors)\n                    .to_payment_failed_response()?\n            }\n            _ => None,\n        };\n\n        Ok((request, true))\n    }\n\n    async fn preprocessing_steps<'a>(\n        self,\n        state: &SessionState,\n        connector: &api::ConnectorData,\n    ) -> RouterResult<Self> {\n        complete_authorize_preprocessing_steps(state, &self, true, connector).await\n    }\n\n    async fn call_preprocessing_through_unified_connector_service<'a>(\n        self,\n        state: &SessionState,\n        header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n        lineage_ids: &grpc_client::LineageIds,\n        #[cfg(feature = \"v1\")] merchant_connector_account: helpers::MerchantConnectorAccountType,\n        #[cfg(feature = \"v2\")]\n        merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n        merchant_context: &domain::MerchantContext,\n        connector_data: &api::ConnectorData,\n        unified_connector_service_execution_mode: common_enums::ExecutionMode,\n        merchant_order_reference_id: Option<String>,\n    ) -> RouterResult<(Self, bool)> {\n        let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n            request_data: &self.request,\n        };\n        let optional_preprocessing_flow = connector_data\n            .connector\n            .get_preprocessing_flow_if_needed(current_flow);\n        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = Box::pin(handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                ))\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {\n                    response: &updated_router_data.response,\n                    attempt_status: updated_router_data.status,\n                };\n                let current_flow = api_interface::CurrentFlowInfo::CompleteAuthorize {\n                    request_data: &updated_router_data.request,\n                };\n                let should_continue = connector_data\n                    .connector\n                    .decide_should_continue_after_preprocessing(\n                        current_flow,\n                        preprocessing_flow,\n                        pre_processing_flow_response,\n                    );\n                Ok((updated_router_data, should_continue))\n            }\n            None => Ok((self, true)),\n        }\n    }\n\n    async fn call_unified_connector_service<'a>(\n        &mut self,\n        state: &SessionState,\n        header_payload: &hyperswitch_domain_models::payments::HeaderPayload,\n        lineage_ids: grpc_client::LineageIds,\n        #[cfg(feature = \"v1\")] merchant_connector_account: helpers::MerchantConnectorAccountType,\n        #[cfg(feature = \"v2\")]\n        merchant_connector_account: domain::MerchantConnectorAccountTypeDetails,\n        merchant_context: &domain::MerchantContext,\n        connector_data: &api::ConnectorData,\n        unified_connector_service_execution_mode: common_enums::ExecutionMode,\n        merchant_order_reference_id: Option<String>,\n        _call_connector_action: common_enums::CallConnectorAction,\n        _creds_identifier: Option<String>,\n    ) -> RouterResult<()> {\n        // Call UCS for Complete Authorize flow\n        Box::pin(call_unified_connector_service_complete_authorize(\n            self,\n            state,\n            header_payload,\n            lineage_ids,\n            merchant_connector_account,\n            merchant_context,\n            connector_data.connector_name,\n            unified_connector_service_execution_mode,\n            merchant_order_reference_id,\n        ))\n        .await\n    }\n}",
+      "diff_span": {
+        "before": "        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                )\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {",
+        "after": "        match optional_preprocessing_flow {\n            Some(preprocessing_flow) => {\n                let updated_router_data = Box::pin(handle_preprocessing_through_unified_connector_service(\n                    self,\n                    state,\n                    header_payload,\n                    lineage_ids.clone(),\n                    merchant_connector_account.clone(),\n                    merchant_context,\n                    connector_data,\n                    unified_connector_service_execution_mode,\n                    merchant_order_reference_id.clone(),\n                    preprocessing_flow,\n                ))\n                .await?;\n                let pre_processing_flow_response = api_interface::PreProcessingFlowResponse {"
+      },
+      "commit_sha": "de3edfab34f5200a1e126105dc95e25358691197"
+    }
+  ]
+}

diffs/pr_10239/ba952a7/diff.json

@@ -0,0 +1,68 @@
+{
+  "commit_sha": "ba952a7f71eebef09df1fc7f20e56854865fa4ad",
+  "pr_number": 10239,
+  "rust_files": [
+    "crates/hyperswitch_connectors/src/connectors/trustpay.rs",
+    "crates/hyperswitch_connectors/src/connectors/trustpay/transformers.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/hyperswitch_connectors/src/connectors/trustpay/transformers.rs::function::handle_bank_redirects_error_response",
+      "file": "crates/hyperswitch_connectors/src/connectors/trustpay/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn handle_bank_redirects_error_response(\n    response: ErrorResponseBankRedirect,\n    status_code: u16,\n    previous_attempt_status: enums::AttemptStatus,\n) -> CustomResult<\n    (\n        enums::AttemptStatus,\n        Option<ErrorResponse>,\n        PaymentsResponseData,\n    ),\n    errors::ConnectorError,\n> {\n    let status = if matches!(response.payment_result_info.result_code, 1132014 | 1132005) {\n        previous_attempt_status\n    } else {\n        enums::AttemptStatus::AuthorizationFailed\n    };\n    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        // message vary for the same code, so relying on code alone as it is unique\n        message: response.payment_result_info.result_code.to_string(),\n        reason: response.payment_result_info.additional_info,\n        status_code,\n        attempt_status: Some(status),\n        connector_transaction_id: None,\n        network_advice_code: None,\n        network_decline_code: None,\n        network_error_message: None,\n        connector_metadata: None,\n    });\n    let payment_response_data = PaymentsResponseData::TransactionResponse {\n        resource_id: ResponseId::NoResponseId,\n        redirection_data: Box::new(None),\n        mandate_reference: Box::new(None),\n        connector_metadata: None,\n        network_txn_id: None,\n        connector_response_reference_id: None,\n        incremental_authorization_allowed: None,\n        charges: None,\n    };\n    Ok((status, error, payment_response_data))\n}",
+      "after_code": "fn handle_bank_redirects_error_response(\n    response: ErrorResponseBankRedirect,\n    status_code: u16,\n    previous_attempt_status: enums::AttemptStatus,\n) -> CustomResult<\n    (\n        enums::AttemptStatus,\n        Option<ErrorResponse>,\n        PaymentsResponseData,\n    ),\n    errors::ConnectorError,\n> {\n    let status = if matches!(response.payment_result_info.result_code, 1132014 | 1132005) {\n        previous_attempt_status\n    } else {\n        enums::AttemptStatus::AuthorizationFailed\n    };\n    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        message: response\n            .payment_result_info\n            .additional_info\n            .clone()\n            .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n        reason: response.payment_result_info.additional_info,\n        status_code,\n        attempt_status: Some(status),\n        connector_transaction_id: None,\n        network_advice_code: None,\n        network_decline_code: None,\n        network_error_message: None,\n        connector_metadata: None,\n    });\n    let payment_response_data = PaymentsResponseData::TransactionResponse {\n        resource_id: ResponseId::NoResponseId,\n        redirection_data: Box::new(None),\n        mandate_reference: Box::new(None),\n        connector_metadata: None,\n        network_txn_id: None,\n        connector_response_reference_id: None,\n        incremental_authorization_allowed: None,\n        charges: None,\n    };\n    Ok((status, error, payment_response_data))\n}",
+      "diff_span": {
+        "before": "    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        // message vary for the same code, so relying on code alone as it is unique\n        message: response.payment_result_info.result_code.to_string(),\n        reason: response.payment_result_info.additional_info,\n        status_code,",
+        "after": "    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        message: response\n            .payment_result_info\n            .additional_info\n            .clone()\n            .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n        reason: response.payment_result_info.additional_info,\n        status_code,"
+      },
+      "commit_sha": "ba952a7f71eebef09df1fc7f20e56854865fa4ad"
+    },
+    {
+      "id": "crates/hyperswitch_connectors/src/connectors/trustpay.rs::Trustpay::function::build_error_response",
+      "file": "crates/hyperswitch_connectors/src/connectors/trustpay.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn build_error_response(\n        &self,\n        res: Response,\n        event_builder: Option<&mut ConnectorEvent>,\n    ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n        let response: Result<\n            trustpay::TrustpayErrorResponse,\n            Report<common_utils::errors::ParsingError>,\n        > = res.response.parse_struct(\"trustpay ErrorResponse\");\n\n        match response {\n            Ok(response_data) => {\n                event_builder.map(|i| i.set_error_response_body(&response_data));\n                router_env::logger::info!(connector_response=?response_data);\n                let error_list = response_data.errors.clone().unwrap_or_default();\n                let option_error_code_message =\n                    utils::get_error_code_error_message_based_on_priority(\n                        self.clone(),\n                        error_list.into_iter().map(|errors| errors.into()).collect(),\n                    );\n                let reason = response_data.errors.map(|errors| {\n                    errors\n                        .iter()\n                        .map(|error| error.description.clone())\n                        .collect::<Vec<String>>()\n                        .join(\" & \")\n                });\n                Ok(ErrorResponse {\n                    status_code: res.status_code,\n                    code: option_error_code_message\n                        .clone()\n                        .map(|error_code_message| error_code_message.error_code)\n                        .unwrap_or(consts::NO_ERROR_CODE.to_string()),\n                    // message vary for the same code, so relying on code alone as it is unique\n                    message: option_error_code_message\n                        .map(|error_code_message| error_code_message.error_code)\n                        .unwrap_or(consts::NO_ERROR_MESSAGE.to_string()),\n                    reason: reason\n                        .or(response_data.description)\n                        .or(response_data.payment_description),\n                    attempt_status: None,\n                    connector_transaction_id: response_data.instance_id,\n                    network_advice_code: None,\n                    network_decline_code: None,\n                    network_error_message: None,\n                    connector_metadata: None,\n                })\n            }\n            Err(error_msg) => {\n                event_builder.map(|event| event.set_error(serde_json::json!({\"error\": res.response.escape_ascii().to_string(), \"status_code\": res.status_code})));\n                router_env::logger::error!(deserialization_error =? error_msg);\n                utils::handle_json_response_deserialization_failure(res, \"trustpay\")\n            }\n        }\n    }",
+      "after_code": "fn build_error_response(\n        &self,\n        res: Response,\n        event_builder: Option<&mut ConnectorEvent>,\n    ) -> CustomResult<ErrorResponse, errors::ConnectorError> {\n        let response: Result<\n            trustpay::TrustpayErrorResponse,\n            Report<common_utils::errors::ParsingError>,\n        > = res.response.parse_struct(\"trustpay ErrorResponse\");\n\n        match response {\n            Ok(response_data) => {\n                event_builder.map(|i| i.set_error_response_body(&response_data));\n                router_env::logger::info!(connector_response=?response_data);\n                let error_list = response_data.errors.clone().unwrap_or_default();\n                let option_error_code_message =\n                    utils::get_error_code_error_message_based_on_priority(\n                        self.clone(),\n                        error_list.into_iter().map(|errors| errors.into()).collect(),\n                    );\n                let reason = response_data.errors.map(|errors| {\n                    errors\n                        .iter()\n                        .map(|error| error.description.clone())\n                        .collect::<Vec<String>>()\n                        .join(\" & \")\n                });\n                Ok(ErrorResponse {\n                    status_code: res.status_code,\n                    code: option_error_code_message\n                        .clone()\n                        .map(|error_code_message| error_code_message.error_code)\n                        .unwrap_or(consts::NO_ERROR_CODE.to_string()),\n                    message: option_error_code_message\n                        .map(|error_code_message| error_code_message.error_message)\n                        .unwrap_or(consts::NO_ERROR_MESSAGE.to_string()),\n                    reason: reason\n                        .or(response_data.description)\n                        .or(response_data.payment_description),\n                    attempt_status: None,\n                    connector_transaction_id: response_data.instance_id,\n                    network_advice_code: None,\n                    network_decline_code: None,\n                    network_error_message: None,\n                    connector_metadata: None,\n                })\n            }\n            Err(error_msg) => {\n                event_builder.map(|event| event.set_error(serde_json::json!({\"error\": res.response.escape_ascii().to_string(), \"status_code\": res.status_code})));\n                router_env::logger::error!(deserialization_error =? error_msg);\n                utils::handle_json_response_deserialization_failure(res, \"trustpay\")\n            }\n        }\n    }",
+      "diff_span": {
+        "before": "                        .map(|error_code_message| error_code_message.error_code)\n                        .unwrap_or(consts::NO_ERROR_CODE.to_string()),\n                    // message vary for the same code, so relying on code alone as it is unique\n                    message: option_error_code_message\n                        .map(|error_code_message| error_code_message.error_code)\n                        .unwrap_or(consts::NO_ERROR_MESSAGE.to_string()),\n                    reason: reason",
+        "after": "                        .unwrap_or(consts::NO_ERROR_CODE.to_string()),\n                    message: option_error_code_message\n                        .map(|error_code_message| error_code_message.error_message)\n                        .unwrap_or(consts::NO_ERROR_MESSAGE.to_string()),\n                    reason: reason"
+      },
+      "commit_sha": "ba952a7f71eebef09df1fc7f20e56854865fa4ad"
+    },
+    {
+      "id": "crates/hyperswitch_connectors/src/connectors/trustpay/transformers.rs::function::handle_bank_redirects_refund_sync_error_response",
+      "file": "crates/hyperswitch_connectors/src/connectors/trustpay/transformers.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "fn handle_bank_redirects_refund_sync_error_response(\n    response: ErrorResponseBankRedirect,\n    status_code: u16,\n) -> (Option<ErrorResponse>, RefundsResponseData) {\n    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        // message vary for the same code, so relying on code alone as it is unique\n        message: response.payment_result_info.result_code.to_string(),\n        reason: response.payment_result_info.additional_info,\n        status_code,\n        attempt_status: None,\n        connector_transaction_id: None,\n        network_advice_code: None,\n        network_decline_code: None,\n        network_error_message: None,\n        connector_metadata: None,\n    });\n    //unreachable case as we are sending error as Some()\n    let refund_response_data = RefundsResponseData {\n        connector_refund_id: \"\".to_string(),\n        refund_status: enums::RefundStatus::Failure,\n    };\n    (error, refund_response_data)\n}",
+      "after_code": "fn handle_bank_redirects_refund_sync_error_response(\n    response: ErrorResponseBankRedirect,\n    status_code: u16,\n) -> (Option<ErrorResponse>, RefundsResponseData) {\n    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        message: response\n            .payment_result_info\n            .additional_info\n            .clone()\n            .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n        reason: response.payment_result_info.additional_info,\n        status_code,\n        attempt_status: None,\n        connector_transaction_id: None,\n        network_advice_code: None,\n        network_decline_code: None,\n        network_error_message: None,\n        connector_metadata: None,\n    });\n    //unreachable case as we are sending error as Some()\n    let refund_response_data = RefundsResponseData {\n        connector_refund_id: \"\".to_string(),\n        refund_status: enums::RefundStatus::Failure,\n    };\n    (error, refund_response_data)\n}",
+      "diff_span": {
+        "before": "    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        // message vary for the same code, so relying on code alone as it is unique\n        message: response.payment_result_info.result_code.to_string(),\n        reason: response.payment_result_info.additional_info,\n        status_code,",
+        "after": "    let error = Some(ErrorResponse {\n        code: response.payment_result_info.result_code.to_string(),\n        message: response\n            .payment_result_info\n            .additional_info\n            .clone()\n            .unwrap_or_else(|| consts::NO_ERROR_MESSAGE.to_string()),\n        reason: response.payment_result_info.additional_info,\n        status_code,"
+      },
+      "commit_sha": "ba952a7f71eebef09df1fc7f20e56854865fa4ad",
+      "before_imports": [
+        "use common_utils::{\n    errors::CustomResult,\n    pii::{self, Email},\n    request::Method,\n    types::{FloatMajorUnit, StringMajorUnit},\n};",
+        "use hyperswitch_domain_models::{\n    network_tokenization::NetworkTokenNumber,\n    payment_method_data::{BankRedirectData, BankTransferData, Card, PaymentMethodData},\n    router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n    router_request_types::{BrowserInformation, PaymentsPreProcessingData, ResponseId},\n    router_response_types::{\n        PaymentsResponseData, PreprocessingResponseId, RedirectForm, RefundsResponseData,\n    },\n    types::{\n        PaymentsAuthorizeRouterData, PaymentsPreProcessingRouterData, RefreshTokenRouterData,\n        RefundsRouterData,\n    },\n};",
+        "use common_enums::enums;",
+        "use crate::{\n    types::{\n        PaymentsPreprocessingResponseRouterData, RefundsResponseRouterData, ResponseRouterData,\n    },\n    utils::{\n        self, AddressDetailsData, BrowserInformationData, CardData, NetworkTokenData,\n        PaymentsAuthorizeRequestData, PaymentsPreProcessingRequestData,\n        RouterData as OtherRouterData,\n    },\n};"
+      ],
+      "after_imports": [
+        "use hyperswitch_interfaces::{consts, errors};",
+        "use common_enums::enums;",
+        "use common_utils::{\n    errors::CustomResult,\n    pii::{self, Email},\n    request::Method,\n    types::{FloatMajorUnit, StringMajorUnit},\n};",
+        "use hyperswitch_domain_models::{\n    network_tokenization::NetworkTokenNumber,\n    payment_method_data::{BankRedirectData, BankTransferData, Card, PaymentMethodData},\n    router_data::{AccessToken, ConnectorAuthType, ErrorResponse, RouterData},\n    router_request_types::{BrowserInformation, PaymentsPreProcessingData, ResponseId},\n    router_response_types::{\n        PaymentsResponseData, PreprocessingResponseId, RedirectForm, RefundsResponseData,\n    },\n    types::{\n        PaymentsAuthorizeRouterData, PaymentsPreProcessingRouterData, RefreshTokenRouterData,\n        RefundsRouterData,\n    },\n};",
+        "use crate::{\n    types::{\n        PaymentsPreprocessingResponseRouterData, RefundsResponseRouterData, ResponseRouterData,\n    },\n    utils::{\n        self, AddressDetailsData, BrowserInformationData, CardData, NetworkTokenData,\n        PaymentsAuthorizeRequestData, PaymentsPreProcessingRequestData,\n        RouterData as OtherRouterData,\n    },\n};"
+      ]
+    }
+  ]
+}

diffs/pr_6701/1cd045f/diff.json

@@ -0,0 +1,205 @@
+{
+  "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af",
+  "pr_number": 6701,
+  "rust_files": [
+    "crates/diesel_models/src/query/role.rs",
+    "crates/router/src/core/user_role.rs",
+    "crates/router/src/core/user_role/role.rs",
+    "crates/router/src/db/kafka_store.rs",
+    "crates/router/src/db/role.rs",
+    "crates/router/src/types/domain/user/decision_manager.rs",
+    "crates/router/src/utils/user_role.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/db/role.rs::trait::RoleInterface",
+      "file": "crates/router/src/db/role.rs",
+      "kind": "trait_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub trait RoleInterface {\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    //TODO:remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError>;\n\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError>;\n}",
+      "after_code": "pub trait RoleInterface {\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    //TODO:Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError>;\n\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError>;\n}",
+      "diff_span": {
+        "before": "    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    //TODO:remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,",
+        "after": "    ) -> CustomResult<storage::Role, errors::StorageError>;\n\n    //TODO:Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/core/user_role.rs::function::delete_user_role",
+      "file": "crates/router/src/core/user_role.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn delete_user_role(\n    state: SessionState,\n    user_from_token: auth::UserFromToken,\n    request: user_role_api::DeleteUserRoleRequest,\n    _req_state: ReqState,\n) -> UserResponse<()> {\n    let user_from_db: domain::UserFromStorage = state\n        .global_store\n        .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?.into_inner())\n        .await\n        .map_err(|e| {\n            if e.current_context().is_db_not_found() {\n                e.change_context(UserErrors::InvalidRoleOperation)\n                    .attach_printable(\"User not found in our records\")\n            } else {\n                e.change_context(UserErrors::InternalServerError)\n            }\n        })?\n        .into();\n\n    if user_from_db.get_user_id() == user_from_token.user_id {\n        return Err(report!(UserErrors::InvalidDeleteOperation))\n            .attach_printable(\"User deleting himself\");\n    }\n\n    let deletion_requestor_role_info = roles::RoleInfo::from_role_id_in_lineage(\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    let mut user_role_deleted_flag = false;\n\n    // Find in V2\n    let user_role_v2 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V2,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v2 {\n        let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n            &state,\n            &role_to_be_deleted.role_id,\n            &user_from_token.org_id,\n        )\n        .await\n        .change_context(UserErrors::InternalServerError)?;\n\n        if !target_role_info.is_deletable() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, role_id = {} is not deletable\",\n                role_to_be_deleted.role_id\n            ));\n        }\n\n        if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n                deletion_requestor_role_info.get_entity_type(),\n                target_role_info.get_entity_type()\n            ));\n        }\n\n        user_role_deleted_flag = true;\n        state\n            .global_store\n            .delete_user_role_by_user_id_and_lineage(\n                user_from_db.get_user_id(),\n                user_from_token\n                    .tenant_id\n                    .as_ref()\n                    .unwrap_or(&state.tenant.tenant_id),\n                &user_from_token.org_id,\n                &user_from_token.merchant_id,\n                &user_from_token.profile_id,\n                UserRoleVersion::V2,\n            )\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user role\")?;\n    }\n\n    // Find in V1\n    let user_role_v1 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V1,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v1 {\n        let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n            &state,\n            &role_to_be_deleted.role_id,\n            &user_from_token.org_id,\n        )\n        .await\n        .change_context(UserErrors::InternalServerError)?;\n\n        if !target_role_info.is_deletable() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, role_id = {} is not deletable\",\n                role_to_be_deleted.role_id\n            ));\n        }\n\n        if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n                deletion_requestor_role_info.get_entity_type(),\n                target_role_info.get_entity_type()\n            ));\n        }\n\n        user_role_deleted_flag = true;\n        state\n            .global_store\n            .delete_user_role_by_user_id_and_lineage(\n                user_from_db.get_user_id(),\n                user_from_token\n                    .tenant_id\n                    .as_ref()\n                    .unwrap_or(&state.tenant.tenant_id),\n                &user_from_token.org_id,\n                &user_from_token.merchant_id,\n                &user_from_token.profile_id,\n                UserRoleVersion::V1,\n            )\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user role\")?;\n    }\n\n    if !user_role_deleted_flag {\n        return Err(report!(UserErrors::InvalidDeleteOperation))\n            .attach_printable(\"User is not associated with the merchant\");\n    }\n\n    // Check if user has any more role associations\n    let remaining_roles = state\n        .global_store\n        .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n            user_id: user_from_db.get_user_id(),\n            tenant_id: user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n\n            org_id: None,\n            merchant_id: None,\n            profile_id: None,\n            entity_id: None,\n            version: None,\n            status: None,\n            limit: None,\n        })\n        .await\n        .change_context(UserErrors::InternalServerError)?;\n\n    // If user has no more role associated with him then deleting user\n    if remaining_roles.is_empty() {\n        state\n            .global_store\n            .delete_user_by_user_id(user_from_db.get_user_id())\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user entry\")?;\n    }\n\n    auth::blacklist::insert_user_in_blacklist(&state, user_from_db.get_user_id()).await?;\n    Ok(ApplicationResponse::StatusOk)\n}",
+      "after_code": "pub async fn delete_user_role(\n    state: SessionState,\n    user_from_token: auth::UserFromToken,\n    request: user_role_api::DeleteUserRoleRequest,\n    _req_state: ReqState,\n) -> UserResponse<()> {\n    let user_from_db: domain::UserFromStorage = state\n        .global_store\n        .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?.into_inner())\n        .await\n        .map_err(|e| {\n            if e.current_context().is_db_not_found() {\n                e.change_context(UserErrors::InvalidRoleOperation)\n                    .attach_printable(\"User not found in our records\")\n            } else {\n                e.change_context(UserErrors::InternalServerError)\n            }\n        })?\n        .into();\n\n    if user_from_db.get_user_id() == user_from_token.user_id {\n        return Err(report!(UserErrors::InvalidDeleteOperation))\n            .attach_printable(\"User deleting himself\");\n    }\n\n    let deletion_requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n        &state,\n        &user_from_token.role_id,\n        &user_from_token.org_id,\n    )\n    .await\n    .change_context(UserErrors::InternalServerError)?;\n\n    let mut user_role_deleted_flag = false;\n\n    // Find in V2\n    let user_role_v2 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V2,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v2 {\n        let target_role_info = roles::RoleInfo::from_role_id_in_lineage(\n            &state,\n            &role_to_be_deleted.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 !target_role_info.is_deletable() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, role_id = {} is not deletable\",\n                role_to_be_deleted.role_id\n            ));\n        }\n\n        if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n                deletion_requestor_role_info.get_entity_type(),\n                target_role_info.get_entity_type()\n            ));\n        }\n\n        user_role_deleted_flag = true;\n        state\n            .global_store\n            .delete_user_role_by_user_id_and_lineage(\n                user_from_db.get_user_id(),\n                user_from_token\n                    .tenant_id\n                    .as_ref()\n                    .unwrap_or(&state.tenant.tenant_id),\n                &user_from_token.org_id,\n                &user_from_token.merchant_id,\n                &user_from_token.profile_id,\n                UserRoleVersion::V2,\n            )\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user role\")?;\n    }\n\n    // Find in V1\n    let user_role_v1 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V1,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v1 {\n        let target_role_info = roles::RoleInfo::from_role_id_in_lineage(\n            &state,\n            &role_to_be_deleted.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 !target_role_info.is_deletable() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, role_id = {} is not deletable\",\n                role_to_be_deleted.role_id\n            ));\n        }\n\n        if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n                deletion_requestor_role_info.get_entity_type(),\n                target_role_info.get_entity_type()\n            ));\n        }\n\n        user_role_deleted_flag = true;\n        state\n            .global_store\n            .delete_user_role_by_user_id_and_lineage(\n                user_from_db.get_user_id(),\n                user_from_token\n                    .tenant_id\n                    .as_ref()\n                    .unwrap_or(&state.tenant.tenant_id),\n                &user_from_token.org_id,\n                &user_from_token.merchant_id,\n                &user_from_token.profile_id,\n                UserRoleVersion::V1,\n            )\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user role\")?;\n    }\n\n    if !user_role_deleted_flag {\n        return Err(report!(UserErrors::InvalidDeleteOperation))\n            .attach_printable(\"User is not associated with the merchant\");\n    }\n\n    // Check if user has any more role associations\n    let remaining_roles = state\n        .global_store\n        .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n            user_id: user_from_db.get_user_id(),\n            tenant_id: user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n\n            org_id: None,\n            merchant_id: None,\n            profile_id: None,\n            entity_id: None,\n            version: None,\n            status: None,\n            limit: None,\n        })\n        .await\n        .change_context(UserErrors::InternalServerError)?;\n\n    // If user has no more role associated with him then deleting user\n    if remaining_roles.is_empty() {\n        state\n            .global_store\n            .delete_user_by_user_id(user_from_db.get_user_id())\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user entry\")?;\n    }\n\n    auth::blacklist::insert_user_in_blacklist(&state, user_from_db.get_user_id()).await?;\n    Ok(ApplicationResponse::StatusOk)\n}",
+      "diff_span": {
+        "before": "    }\n\n    let deletion_requestor_role_info = roles::RoleInfo::from_role_id_in_lineage(\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    let mut user_role_deleted_flag = false;\n\n    // Find in V2\n    let user_role_v2 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V2,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v2 {\n        let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n            &state,\n            &role_to_be_deleted.role_id,\n            &user_from_token.org_id,\n        )\n        .await\n        .change_context(UserErrors::InternalServerError)?;\n\n        if !target_role_info.is_deletable() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, role_id = {} is not deletable\",\n                role_to_be_deleted.role_id\n            ));\n        }\n\n        if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n                deletion_requestor_role_info.get_entity_type(),\n                target_role_info.get_entity_type()\n            ));\n        }\n\n        user_role_deleted_flag = true;\n        state\n            .global_store\n            .delete_user_role_by_user_id_and_lineage(\n                user_from_db.get_user_id(),\n                user_from_token\n                    .tenant_id\n                    .as_ref()\n                    .unwrap_or(&state.tenant.tenant_id),\n                &user_from_token.org_id,\n                &user_from_token.merchant_id,\n                &user_from_token.profile_id,\n                UserRoleVersion::V2,\n            )\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user role\")?;\n    }\n\n    // Find in V1\n    let user_role_v1 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V1,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v1 {\n        let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n            &state,\n            &role_to_be_deleted.role_id,",
+        "after": "    }\n\n    let deletion_requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n        &state,\n        &user_from_token.role_id,\n        &user_from_token.org_id,\n    )\n    .await\n    .change_context(UserErrors::InternalServerError)?;\n\n    let mut user_role_deleted_flag = false;\n\n    // Find in V2\n    let user_role_v2 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V2,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v2 {\n        let target_role_info = roles::RoleInfo::from_role_id_in_lineage(\n            &state,\n            &role_to_be_deleted.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 !target_role_info.is_deletable() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, role_id = {} is not deletable\",\n                role_to_be_deleted.role_id\n            ));\n        }\n\n        if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n            return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n                \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n                deletion_requestor_role_info.get_entity_type(),\n                target_role_info.get_entity_type()\n            ));\n        }\n\n        user_role_deleted_flag = true;\n        state\n            .global_store\n            .delete_user_role_by_user_id_and_lineage(\n                user_from_db.get_user_id(),\n                user_from_token\n                    .tenant_id\n                    .as_ref()\n                    .unwrap_or(&state.tenant.tenant_id),\n                &user_from_token.org_id,\n                &user_from_token.merchant_id,\n                &user_from_token.profile_id,\n                UserRoleVersion::V2,\n            )\n            .await\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"Error while deleting user role\")?;\n    }\n\n    // Find in V1\n    let user_role_v1 = match state\n        .global_store\n        .find_user_role_by_user_id_and_lineage(\n            user_from_db.get_user_id(),\n            user_from_token\n                .tenant_id\n                .as_ref()\n                .unwrap_or(&state.tenant.tenant_id),\n            &user_from_token.org_id,\n            &user_from_token.merchant_id,\n            &user_from_token.profile_id,\n            UserRoleVersion::V1,\n        )\n        .await\n    {\n        Ok(user_role) => Some(user_role),\n        Err(e) => {\n            if e.current_context().is_db_not_found() {\n                None\n            } else {\n                return Err(UserErrors::InternalServerError.into());\n            }\n        }\n    };\n\n    if let Some(role_to_be_deleted) = user_role_v1 {\n        let target_role_info = roles::RoleInfo::from_role_id_in_lineage(\n            &state,\n            &role_to_be_deleted.role_id,\n            &user_from_token.merchant_id,\n            &user_from_token.org_id,\n        )"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/diesel_models/src/query/role.rs::impl::Role",
+      "file": "crates/diesel_models/src/query/role.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl Role {\n    pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    // TODO:remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()).and(\n                dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n                    .eq(org_id.to_owned())\n                    .and(dsl::scope.eq(RoleScope::Organization))),\n            ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_in_lineage(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned()))\n                .and(\n                    dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                        .eq(merchant_id.to_owned())\n                        .and(dsl::scope.eq(RoleScope::Merchant))),\n                ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_and_org_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned())),\n        )\n        .await\n    }\n\n    pub async fn update_by_role_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        role_update: RoleUpdate,\n    ) -> StorageResult<Self> {\n        generics::generic_update_with_unique_predicate_get_result::<\n            <Self as HasTable>::Table,\n            _,\n            _,\n            _,\n        >(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n            RoleUpdateInternal::from(role_update),\n        )\n        .await\n    }\n\n    pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }\n}",
+      "after_code": "impl Role {\n    pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()).and(\n                dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n                    .eq(org_id.to_owned())\n                    .and(dsl::scope.eq(RoleScope::Organization))),\n            ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_in_lineage(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned()))\n                .and(\n                    dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                        .eq(merchant_id.to_owned())\n                        .and(dsl::scope.eq(RoleScope::Merchant))),\n                ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_and_org_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned())),\n        )\n        .await\n    }\n\n    pub async fn update_by_role_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        role_update: RoleUpdate,\n    ) -> StorageResult<Self> {\n        generics::generic_update_with_unique_predicate_get_result::<\n            <Self as HasTable>::Table,\n            _,\n            _,\n            _,\n        >(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n            RoleUpdateInternal::from(role_update),\n        )\n        .await\n    }\n\n    pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }\n}",
+      "diff_span": {
+        "before": "    }\n\n    // TODO:remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,",
+        "after": "    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/types/domain/user/decision_manager.rs::NextFlow::function::get_token",
+      "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 get_token(&self, state: &SessionState) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                let user_role = state\n                    .global_store\n                    .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                        user_id: self.user.get_user_id(),\n                        tenant_id: self.tenant_id.as_ref().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: Some(1),\n                    })\n                    .await\n                    .change_context(UserErrors::InternalServerError)?\n                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, &user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await\n            }\n        }\n    }",
+      "after_code": "pub async fn get_token(&self, state: &SessionState) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                let user_role = state\n                    .global_store\n                    .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                        user_id: self.user.get_user_id(),\n                        tenant_id: self.tenant_id.as_ref().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: Some(1),\n                    })\n                    .await\n                    .change_context(UserErrors::InternalServerError)?\n                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_info_in_cache_by_user_role(state, &user_role).await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await\n            }\n        }\n    }",
+      "diff_span": {
+        "before": "                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, &user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await",
+        "after": "                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_info_in_cache_by_user_role(state, &user_role).await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/types/domain/user/decision_manager.rs::NextFlow::function::get_token_with_user_role",
+      "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 get_token_with_user_role(\n        &self,\n        state: &SessionState,\n        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await\n            }\n        }\n    }",
+      "after_code": "pub async fn get_token_with_user_role(\n        &self,\n        state: &SessionState,\n        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_info_in_cache_by_user_role(state, user_role).await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await\n            }\n        }\n    }",
+      "diff_span": {
+        "before": "                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await",
+        "after": "                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_info_in_cache_by_user_role(state, user_role).await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/db/role.rs::impl::MockDb",
+      "file": "crates/router/src/db/role.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl RoleInterface for MockDb {\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        if roles\n            .iter()\n            .any(|role_inner| role_inner.role_id == role.role_id)\n        {\n            Err(errors::StorageError::DuplicateValue {\n                entity: \"role_id\",\n                key: None,\n            })?\n        }\n        let role = storage::Role {\n            role_name: role.role_name,\n            role_id: role.role_id,\n            merchant_id: role.merchant_id,\n            org_id: role.org_id,\n            groups: role.groups,\n            scope: role.scope,\n            entity_type: role.entity_type,\n            created_by: role.created_by,\n            created_at: role.created_at,\n            last_modified_at: role.last_modified_at,\n            last_modified_by: role.last_modified_by,\n        };\n        roles.push(role.clone());\n        Ok(role)\n    }\n\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available role_id  = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    // TODO:remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && (role.merchant_id == *merchant_id\n                        || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && role.org_id == *org_id\n                    && ((role.scope == enums::RoleScope::Organization)\n                        || (role.merchant_id == *merchant_id\n                            && role.scope == enums::RoleScope::Merchant))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id && role.org_id == *org_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in org scope for role_id = {role_id} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        roles\n            .iter_mut()\n            .find(|role| role.role_id == role_id)\n            .map(|role| {\n                *role = match role_update {\n                    storage::RoleUpdate::UpdateDetails {\n                        groups,\n                        role_name,\n                        last_modified_at,\n                        last_modified_by,\n                    } => storage::Role {\n                        groups: groups.unwrap_or(role.groups.to_owned()),\n                        role_name: role_name.unwrap_or(role.role_name.to_owned()),\n                        last_modified_by,\n                        last_modified_at,\n                        ..role.to_owned()\n                    },\n                };\n                role.to_owned()\n            })\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available for role_id = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        let role_index = roles\n            .iter()\n            .position(|role| role.role_id == role_id)\n            .ok_or(errors::StorageError::ValueNotFound(format!(\n                \"No role available for role_id = {role_id}\"\n            )))?;\n\n        Ok(roles.remove(role_index))\n    }\n\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                role.merchant_id == *merchant_id\n                    || (role.org_id == *org_id\n                        && role.scope == diesel_models::enums::RoleScope::Organization)\n            })\n            .cloned()\n            .collect();\n\n        if roles_list.is_empty() {\n            return Err(errors::StorageError::ValueNotFound(format!(\n                \"No role found for merchant id = {:?} and org_id = {:?}\",\n                merchant_id, org_id\n            ))\n            .into());\n        }\n\n        Ok(roles_list)\n    }\n\n    #[instrument(skip_all)]\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        let limit_usize = limit.unwrap_or(u32::MAX).try_into().unwrap_or(usize::MAX);\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                let matches_merchant = match merchant_id {\n                    Some(merchant_id) => role.merchant_id == *merchant_id,\n                    None => true,\n                };\n\n                matches_merchant && role.org_id == *org_id && Some(role.entity_type) == entity_type\n            })\n            .take(limit_usize)\n            .cloned()\n            .collect();\n\n        Ok(roles_list)\n    }\n}",
+      "after_code": "impl RoleInterface for MockDb {\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        if roles\n            .iter()\n            .any(|role_inner| role_inner.role_id == role.role_id)\n        {\n            Err(errors::StorageError::DuplicateValue {\n                entity: \"role_id\",\n                key: None,\n            })?\n        }\n        let role = storage::Role {\n            role_name: role.role_name,\n            role_id: role.role_id,\n            merchant_id: role.merchant_id,\n            org_id: role.org_id,\n            groups: role.groups,\n            scope: role.scope,\n            entity_type: role.entity_type,\n            created_by: role.created_by,\n            created_at: role.created_at,\n            last_modified_at: role.last_modified_at,\n            last_modified_by: role.last_modified_by,\n        };\n        roles.push(role.clone());\n        Ok(role)\n    }\n\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available role_id  = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && (role.merchant_id == *merchant_id\n                        || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && role.org_id == *org_id\n                    && ((role.scope == enums::RoleScope::Organization)\n                        || (role.merchant_id == *merchant_id\n                            && role.scope == enums::RoleScope::Merchant))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id && role.org_id == *org_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in org scope for role_id = {role_id} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        roles\n            .iter_mut()\n            .find(|role| role.role_id == role_id)\n            .map(|role| {\n                *role = match role_update {\n                    storage::RoleUpdate::UpdateDetails {\n                        groups,\n                        role_name,\n                        last_modified_at,\n                        last_modified_by,\n                    } => storage::Role {\n                        groups: groups.unwrap_or(role.groups.to_owned()),\n                        role_name: role_name.unwrap_or(role.role_name.to_owned()),\n                        last_modified_by,\n                        last_modified_at,\n                        ..role.to_owned()\n                    },\n                };\n                role.to_owned()\n            })\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available for role_id = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        let role_index = roles\n            .iter()\n            .position(|role| role.role_id == role_id)\n            .ok_or(errors::StorageError::ValueNotFound(format!(\n                \"No role available for role_id = {role_id}\"\n            )))?;\n\n        Ok(roles.remove(role_index))\n    }\n\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                role.merchant_id == *merchant_id\n                    || (role.org_id == *org_id\n                        && role.scope == diesel_models::enums::RoleScope::Organization)\n            })\n            .cloned()\n            .collect();\n\n        if roles_list.is_empty() {\n            return Err(errors::StorageError::ValueNotFound(format!(\n                \"No role found for merchant id = {:?} and org_id = {:?}\",\n                merchant_id, org_id\n            ))\n            .into());\n        }\n\n        Ok(roles_list)\n    }\n\n    #[instrument(skip_all)]\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        let limit_usize = limit.unwrap_or(u32::MAX).try_into().unwrap_or(usize::MAX);\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                let matches_merchant = match merchant_id {\n                    Some(merchant_id) => role.merchant_id == *merchant_id,\n                    None => true,\n                };\n\n                matches_merchant && role.org_id == *org_id && Some(role.entity_type) == entity_type\n            })\n            .take(limit_usize)\n            .cloned()\n            .collect();\n\n        Ok(roles_list)\n    }\n}",
+      "diff_span": {
+        "before": "    }\n\n    // TODO:remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,",
+        "after": "    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/db/role.rs::impl::Store",
+      "file": "crates/router/src/db/role.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl RoleInterface for Store {\n    #[instrument(skip_all)]\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_write(self).await?;\n        role.insert(&conn)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id(&conn, role_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    //TODO:remove once find_by_role_id_in_lineage is stable\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id_in_merchant_scope(&conn, role_id, merchant_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id_in_lineage(&conn, role_id, merchant_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id_and_org_id(&conn, role_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_write(self).await?;\n        storage::Role::update_by_role_id(&conn, role_id, role_update)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_write(self).await?;\n        storage::Role::delete_by_role_id(&conn, role_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::list_roles(&conn, merchant_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::generic_roles_list_for_org(\n            &conn,\n            org_id.to_owned(),\n            merchant_id.cloned(),\n            entity_type,\n            limit,\n        )\n        .await\n        .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n}",
+      "after_code": "impl RoleInterface for Store {\n    #[instrument(skip_all)]\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_write(self).await?;\n        role.insert(&conn)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id(&conn, role_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    //TODO:Remove once find_by_role_id_in_lineage is stable\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id_in_merchant_scope(&conn, role_id, merchant_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id_in_lineage(&conn, role_id, merchant_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::find_by_role_id_and_org_id(&conn, role_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_write(self).await?;\n        storage::Role::update_by_role_id(&conn, role_id, role_update)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let conn = connection::pg_connection_write(self).await?;\n        storage::Role::delete_by_role_id(&conn, role_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::list_roles(&conn, merchant_id, org_id)\n            .await\n            .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n\n    #[instrument(skip_all)]\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let conn = connection::pg_connection_read(self).await?;\n        storage::Role::generic_roles_list_for_org(\n            &conn,\n            org_id.to_owned(),\n            merchant_id.cloned(),\n            entity_type,\n            limit,\n        )\n        .await\n        .map_err(|error| report!(errors::StorageError::from(error)))\n    }\n}",
+      "diff_span": {
+        "before": "    }\n\n    //TODO:remove once find_by_role_id_in_lineage is stable\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id_in_merchant_scope(",
+        "after": "    }\n\n    //TODO:Remove once find_by_role_id_in_lineage is stable\n    #[instrument(skip_all)]\n    async fn find_role_by_role_id_in_merchant_scope("
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/core/user_role/role.rs::function::update_role",
+      "file": "crates/router/src/core/user_role/role.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn update_role(\n    state: SessionState,\n    user_from_token: UserFromToken,\n    req: role_api::UpdateRoleRequest,\n    role_id: &str,\n) -> UserResponse<role_api::RoleInfoWithGroupsResponse> {\n    let role_name = req.role_name.map(RoleName::new).transpose()?;\n\n    if let Some(ref role_name) = role_name {\n        utils::user_role::validate_role_name(\n            &state,\n            role_name,\n            &user_from_token.merchant_id,\n            &user_from_token.org_id,\n        )\n        .await?;\n    }\n\n    if let Some(ref groups) = req.groups {\n        utils::user_role::validate_role_groups(groups)?;\n    }\n\n    let role_info = roles::RoleInfo::from_role_id_in_lineage(\n        &state,\n        role_id,\n        &user_from_token.merchant_id,\n        &user_from_token.org_id,\n    )\n    .await\n    .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n    let user_from_token_role_info = roles::RoleInfo::from_role_id_and_org_id(\n        &state,\n        &user_from_token.role_id,\n        &user_from_token.org_id,\n    )\n    .await\n    .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n    if matches!(role_info.get_scope(), RoleScope::Organization)\n        && user_from_token_role_info.get_entity_type() != EntityType::Organization\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))\n            .attach_printable(\"Non org admin user changing org level role\");\n    }\n\n    let updated_role = state\n        .store\n        .update_role_by_role_id(\n            role_id,\n            RoleUpdate::UpdateDetails {\n                groups: req.groups,\n                role_name: role_name.map(RoleName::get_role_name),\n                last_modified_at: common_utils::date_time::now(),\n                last_modified_by: user_from_token.user_id,\n            },\n        )\n        .await\n        .to_duplicate_response(UserErrors::RoleNameAlreadyExists)?;\n\n    blacklist::insert_role_in_blacklist(&state, role_id).await?;\n\n    Ok(ApplicationResponse::Json(\n        role_api::RoleInfoWithGroupsResponse {\n            groups: updated_role.groups,\n            role_id: updated_role.role_id,\n            role_name: updated_role.role_name,\n            role_scope: updated_role.scope,\n        },\n    ))\n}",
+      "after_code": "pub async fn update_role(\n    state: SessionState,\n    user_from_token: UserFromToken,\n    req: role_api::UpdateRoleRequest,\n    role_id: &str,\n) -> UserResponse<role_api::RoleInfoWithGroupsResponse> {\n    let role_name = req.role_name.map(RoleName::new).transpose()?;\n\n    if let Some(ref role_name) = role_name {\n        utils::user_role::validate_role_name(\n            &state,\n            role_name,\n            &user_from_token.merchant_id,\n            &user_from_token.org_id,\n        )\n        .await?;\n    }\n\n    if let Some(ref groups) = req.groups {\n        utils::user_role::validate_role_groups(groups)?;\n    }\n\n    let role_info = roles::RoleInfo::from_role_id_in_lineage(\n        &state,\n        role_id,\n        &user_from_token.merchant_id,\n        &user_from_token.org_id,\n    )\n    .await\n    .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n    let user_role_info = user_from_token.get_role_info_from_db(&state).await?;\n\n    if matches!(role_info.get_scope(), RoleScope::Organization)\n        && user_role_info.get_entity_type() != EntityType::Organization\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))\n            .attach_printable(\"Non org admin user changing org level role\");\n    }\n\n    let updated_role = state\n        .store\n        .update_role_by_role_id(\n            role_id,\n            RoleUpdate::UpdateDetails {\n                groups: req.groups,\n                role_name: role_name.map(RoleName::get_role_name),\n                last_modified_at: common_utils::date_time::now(),\n                last_modified_by: user_from_token.user_id,\n            },\n        )\n        .await\n        .to_duplicate_response(UserErrors::RoleNameAlreadyExists)?;\n\n    blacklist::insert_role_in_blacklist(&state, role_id).await?;\n\n    Ok(ApplicationResponse::Json(\n        role_api::RoleInfoWithGroupsResponse {\n            groups: updated_role.groups,\n            role_id: updated_role.role_id,\n            role_name: updated_role.role_name,\n            role_scope: updated_role.scope,\n        },\n    ))\n}",
+      "diff_span": {
+        "before": "    .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n    let user_from_token_role_info = roles::RoleInfo::from_role_id_and_org_id(\n        &state,\n        &user_from_token.role_id,\n        &user_from_token.org_id,\n    )\n    .await\n    .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n    if matches!(role_info.get_scope(), RoleScope::Organization)\n        && user_from_token_role_info.get_entity_type() != EntityType::Organization\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))",
+        "after": "    .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n    let user_role_info = user_from_token.get_role_info_from_db(&state).await?;\n\n    if matches!(role_info.get_scope(), RoleScope::Organization)\n        && user_role_info.get_entity_type() != EntityType::Organization\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/utils/user_role.rs::function::set_role_info_in_cache_by_role_id_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 set_role_info_in_cache_by_role_id_org_id(\n    state: &SessionState,\n    role_id: &str,\n    org_id: &id_type::OrganizationId,\n) -> bool {\n    set_role_permissions_in_cache_if_required(state, role_id, org_id)\n        .await\n        .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n        .is_ok()\n}",
+      "after_code": "pub async fn set_role_info_in_cache_by_role_id_org_id(\n    state: &SessionState,\n    role_id: &str,\n    org_id: &id_type::OrganizationId,\n) -> bool {\n    set_role_info_in_cache_if_required(state, role_id, org_id)\n        .await\n        .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n        .is_ok()\n}",
+      "diff_span": {
+        "before": "    org_id: &id_type::OrganizationId,\n) -> bool {\n    set_role_permissions_in_cache_if_required(state, role_id, org_id)\n        .await\n        .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))",
+        "after": "    org_id: &id_type::OrganizationId,\n) -> bool {\n    set_role_info_in_cache_if_required(state, role_id, org_id)\n        .await\n        .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/types/domain/user/decision_manager.rs::impl::NextFlow",
+      "file": "crates/router/src/types/domain/user/decision_manager.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl NextFlow {\n    pub async fn from_origin(\n        origin: Origin,\n        user: UserFromStorage,\n        state: &SessionState,\n    ) -> UserResult<Self> {\n        let flows = origin.get_flows();\n        let path = vec![];\n        for flow in flows {\n            if flow\n                .is_required(&user, &path, state, &state.tenant.tenant_id)\n                .await?\n            {\n                return Ok(Self {\n                    origin,\n                    next_flow: *flow,\n                    user,\n                    path,\n                    tenant_id: Some(state.tenant.tenant_id.clone()),\n                });\n            }\n        }\n        Err(UserErrors::InternalServerError.into())\n    }\n\n    pub fn get_flow(&self) -> UserFlow {\n        self.next_flow\n    }\n\n    pub async fn get_token(&self, state: &SessionState) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                let user_role = state\n                    .global_store\n                    .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                        user_id: self.user.get_user_id(),\n                        tenant_id: self.tenant_id.as_ref().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: Some(1),\n                    })\n                    .await\n                    .change_context(UserErrors::InternalServerError)?\n                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, &user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await\n            }\n        }\n    }\n\n    pub async fn get_token_with_user_role(\n        &self,\n        state: &SessionState,\n        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await\n            }\n        }\n    }\n\n    pub async fn skip(self, user: UserFromStorage, state: &SessionState) -> UserResult<Self> {\n        let flows = self.origin.get_flows();\n        let index = flows\n            .iter()\n            .position(|flow| flow == &self.get_flow())\n            .ok_or(UserErrors::InternalServerError)?;\n        let remaining_flows = flows.iter().skip(index + 1);\n        for flow in remaining_flows {\n            if flow\n                .is_required(&user, &self.path, state, &state.tenant.tenant_id)\n                .await?\n            {\n                return Ok(Self {\n                    origin: self.origin.clone(),\n                    next_flow: *flow,\n                    user,\n                    path: self.path,\n                    tenant_id: Some(state.tenant.tenant_id.clone()),\n                });\n            }\n        }\n        Err(UserErrors::InternalServerError.into())\n    }\n}",
+      "after_code": "impl NextFlow {\n    pub async fn from_origin(\n        origin: Origin,\n        user: UserFromStorage,\n        state: &SessionState,\n    ) -> UserResult<Self> {\n        let flows = origin.get_flows();\n        let path = vec![];\n        for flow in flows {\n            if flow\n                .is_required(&user, &path, state, &state.tenant.tenant_id)\n                .await?\n            {\n                return Ok(Self {\n                    origin,\n                    next_flow: *flow,\n                    user,\n                    path,\n                    tenant_id: Some(state.tenant.tenant_id.clone()),\n                });\n            }\n        }\n        Err(UserErrors::InternalServerError.into())\n    }\n\n    pub fn get_flow(&self) -> UserFlow {\n        self.next_flow\n    }\n\n    pub async fn get_token(&self, state: &SessionState) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                let user_role = state\n                    .global_store\n                    .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                        user_id: self.user.get_user_id(),\n                        tenant_id: self.tenant_id.as_ref().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: Some(1),\n                    })\n                    .await\n                    .change_context(UserErrors::InternalServerError)?\n                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_info_in_cache_by_user_role(state, &user_role).await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await\n            }\n        }\n    }\n\n    pub async fn get_token_with_user_role(\n        &self,\n        state: &SessionState,\n        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_info_in_cache_by_user_role(state, user_role).await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await\n            }\n        }\n    }\n\n    pub async fn skip(self, user: UserFromStorage, state: &SessionState) -> UserResult<Self> {\n        let flows = self.origin.get_flows();\n        let index = flows\n            .iter()\n            .position(|flow| flow == &self.get_flow())\n            .ok_or(UserErrors::InternalServerError)?;\n        let remaining_flows = flows.iter().skip(index + 1);\n        for flow in remaining_flows {\n            if flow\n                .is_required(&user, &self.path, state, &state.tenant.tenant_id)\n                .await?\n            {\n                return Ok(Self {\n                    origin: self.origin.clone(),\n                    next_flow: *flow,\n                    user,\n                    path: self.path,\n                    tenant_id: Some(state.tenant.tenant_id.clone()),\n                });\n            }\n        }\n        Err(UserErrors::InternalServerError.into())\n    }\n}",
+      "diff_span": {
+        "before": "                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, &user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await\n            }\n        }\n    }\n\n    pub async fn get_token_with_user_role(\n        &self,\n        state: &SessionState,\n        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_permissions_in_cache_by_user_role(state, user_role)\n                    .await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await",
+        "after": "                    .pop()\n                    .ok_or(UserErrors::InternalServerError)?;\n                utils::user_role::set_role_info_in_cache_by_user_role(state, &user_role).await;\n\n                jwt_flow.generate_jwt(state, self, &user_role).await\n            }\n        }\n    }\n\n    pub async fn get_token_with_user_role(\n        &self,\n        state: &SessionState,\n        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        match self.next_flow {\n            UserFlow::SPTFlow(spt_flow) => spt_flow.generate_spt(state, self).await,\n            UserFlow::JWTFlow(jwt_flow) => {\n                #[cfg(feature = \"email\")]\n                {\n                    self.user.get_verification_days_left(state)?;\n                }\n                utils::user_role::set_role_info_in_cache_by_user_role(state, user_role).await;\n\n                jwt_flow.generate_jwt(state, self, user_role).await"
+      },
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/utils/user_role.rs::function::set_role_info_in_cache_if_required",
+      "file": "crates/router/src/utils/user_role.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "pub async fn set_role_info_in_cache_if_required(\n    state: &SessionState,\n    role_id: &str,\n    org_id: &id_type::OrganizationId,\n) -> UserResult<()> {\n    if roles::predefined_roles::PREDEFINED_ROLES.contains_key(role_id) {\n        return Ok(());\n    }\n\n    let role_info = roles::RoleInfo::from_role_id_and_org_id(state, role_id, org_id)\n        .await\n        .change_context(UserErrors::InternalServerError)\n        .attach_printable(\"Error getting role_info from role_id\")?;\n\n    authz::set_role_info_in_cache(\n        state,\n        role_id,\n        &role_info,\n        i64::try_from(consts::JWT_TOKEN_TIME_IN_SECS)\n            .change_context(UserErrors::InternalServerError)?,\n    )\n    .await\n    .change_context(UserErrors::InternalServerError)\n    .attach_printable(\"Error setting permissions in redis\")\n}",
+      "diff_span": null,
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/utils/user_role.rs::function::set_role_info_in_cache_by_user_role",
+      "file": "crates/router/src/utils/user_role.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "pub async fn set_role_info_in_cache_by_user_role(\n    state: &SessionState,\n    user_role: &UserRole,\n) -> bool {\n    let Some(ref org_id) = user_role.org_id else {\n        return false;\n    };\n    set_role_info_in_cache_if_required(state, user_role.role_id.as_str(), org_id)\n        .await\n        .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n        .is_ok()\n}",
+      "diff_span": null,
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/utils/user_role.rs::function::set_role_permissions_in_cache_if_required",
+      "file": "crates/router/src/utils/user_role.rs",
+      "kind": "function_item",
+      "status": "removed",
+      "before_code": "pub async fn set_role_permissions_in_cache_if_required(\n    state: &SessionState,\n    role_id: &str,\n    org_id: &id_type::OrganizationId,\n) -> UserResult<()> {\n    if roles::predefined_roles::PREDEFINED_ROLES.contains_key(role_id) {\n        return Ok(());\n    }\n\n    let role_info = roles::RoleInfo::from_role_id_and_org_id(state, role_id, org_id)\n        .await\n        .change_context(UserErrors::InternalServerError)\n        .attach_printable(\"Error getting role_info from role_id\")?;\n\n    authz::set_role_info_in_cache(\n        state,\n        role_id,\n        &role_info,\n        i64::try_from(consts::JWT_TOKEN_TIME_IN_SECS)\n            .change_context(UserErrors::InternalServerError)?,\n    )\n    .await\n    .change_context(UserErrors::InternalServerError)\n    .attach_printable(\"Error setting permissions in redis\")\n}",
+      "after_code": null,
+      "diff_span": null,
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    },
+    {
+      "id": "crates/router/src/utils/user_role.rs::function::set_role_permissions_in_cache_by_user_role",
+      "file": "crates/router/src/utils/user_role.rs",
+      "kind": "function_item",
+      "status": "removed",
+      "before_code": "pub async fn set_role_permissions_in_cache_by_user_role(\n    state: &SessionState,\n    user_role: &UserRole,\n) -> bool {\n    let Some(ref org_id) = user_role.org_id else {\n        return false;\n    };\n    set_role_permissions_in_cache_if_required(state, user_role.role_id.as_str(), org_id)\n        .await\n        .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n        .is_ok()\n}",
+      "after_code": null,
+      "diff_span": null,
+      "commit_sha": "1cd045f72f99f01ed4c84435f157dacb5a1076af"
+    }
+  ]
+}

diffs/pr_6701/5cb5954/diff.json

@@ -0,0 +1,54 @@
+{
+  "commit_sha": "5cb5954c1d5945775e8c4f58d4ea5839f5323c62",
+  "pr_number": 6701,
+  "rust_files": [
+    "crates/diesel_models/src/query/role.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/diesel_models/src/query/role.rs::impl::Role",
+      "file": "crates/diesel_models/src/query/role.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl Role {\n    pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    // TODO:remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()).and(\n                dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n                    .eq(org_id.to_owned())\n                    .and(dsl::scope.eq(RoleScope::Organization))),\n            ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_in_lineage(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned()))\n                .and(\n                    dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                        .eq(merchant_id.to_owned())\n                        .and(dsl::scope.eq(RoleScope::Merchant))),\n                ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_and_org_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned())),\n        )\n        .await\n    }\n\n    pub async fn update_by_role_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        role_update: RoleUpdate,\n    ) -> StorageResult<Self> {\n        generics::generic_update_with_unique_predicate_get_result::<\n            <Self as HasTable>::Table,\n            _,\n            _,\n            _,\n        >(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n            RoleUpdateInternal::from(role_update),\n        )\n        .await\n    }\n\n    pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n            .eq(org_id.to_owned())\n            .and(dsl::scope.eq(RoleScope::Organization)));\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                dsl::merchant_id\n                    .eq(merchant_id)\n                    .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }\n}",
+      "after_code": "impl Role {\n    pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    // TODO:remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()).and(\n                dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n                    .eq(org_id.to_owned())\n                    .and(dsl::scope.eq(RoleScope::Organization))),\n            ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_in_lineage(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned()))\n                .and(\n                    dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                        .eq(merchant_id.to_owned())\n                        .and(dsl::scope.eq(RoleScope::Merchant))),\n                ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_and_org_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned())),\n        )\n        .await\n    }\n\n    pub async fn update_by_role_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        role_update: RoleUpdate,\n    ) -> StorageResult<Self> {\n        generics::generic_update_with_unique_predicate_get_result::<\n            <Self as HasTable>::Table,\n            _,\n            _,\n            _,\n        >(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n            RoleUpdateInternal::from(role_update),\n        )\n        .await\n    }\n\n    pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }\n}",
+      "diff_span": {
+        "before": "        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n            .eq(org_id.to_owned())\n            .and(dsl::scope.eq(RoleScope::Organization)));\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                dsl::merchant_id\n                    .eq(merchant_id)\n                    .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }",
+        "after": "        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }"
+      },
+      "commit_sha": "5cb5954c1d5945775e8c4f58d4ea5839f5323c62"
+    },
+    {
+      "id": "crates/diesel_models/src/query/role.rs::Role::function::list_roles",
+      "file": "crates/diesel_models/src/query/role.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n            .eq(org_id.to_owned())\n            .and(dsl::scope.eq(RoleScope::Organization)));\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }",
+      "after_code": "pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }",
+      "diff_span": {
+        "before": "        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n            .eq(org_id.to_owned())\n            .and(dsl::scope.eq(RoleScope::Organization)));\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(",
+        "after": "        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>("
+      },
+      "commit_sha": "5cb5954c1d5945775e8c4f58d4ea5839f5323c62"
+    },
+    {
+      "id": "crates/diesel_models/src/query/role.rs::Role::function::generic_roles_list_for_org",
+      "file": "crates/diesel_models/src/query/role.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                dsl::merchant_id\n                    .eq(merchant_id)\n                    .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }",
+      "after_code": "pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }",
+      "diff_span": {
+        "before": "        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                dsl::merchant_id\n                    .eq(merchant_id)\n                    .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }",
+        "after": "        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }"
+      },
+      "commit_sha": "5cb5954c1d5945775e8c4f58d4ea5839f5323c62"
+    }
+  ]
+}

diffs/pr_6701/f70f3cf/diff.json

@@ -0,0 +1,72 @@
+{
+  "commit_sha": "f70f3cf57b9b0c6acb1047941494f7f6f0c1cb98",
+  "pr_number": 6701,
+  "rust_files": [
+    "crates/diesel_models/src/query/role.rs",
+    "crates/diesel_models/src/user_role.rs",
+    "crates/router/src/core/user_role/role.rs",
+    "crates/router/src/db/role.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/diesel_models/src/query/role.rs::impl::Role",
+      "file": "crates/diesel_models/src/query/role.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl Role {\n    pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()).and(\n                dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n                    .eq(org_id.to_owned())\n                    .and(dsl::scope.eq(RoleScope::Organization))),\n            ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_in_lineage(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned()))\n                .and(\n                    dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                        .eq(merchant_id.to_owned())\n                        .and(dsl::scope.eq(RoleScope::Merchant))),\n                ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_and_org_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned())),\n        )\n        .await\n    }\n\n    pub async fn update_by_role_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        role_update: RoleUpdate,\n    ) -> StorageResult<Self> {\n        generics::generic_update_with_unique_predicate_get_result::<\n            <Self as HasTable>::Table,\n            _,\n            _,\n            _,\n        >(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n            RoleUpdateInternal::from(role_update),\n        )\n        .await\n    }\n\n    pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }\n}",
+      "after_code": "impl Role {\n    pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    // TODO: Remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()).and(\n                dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n                    .eq(org_id.to_owned())\n                    .and(dsl::scope.eq(RoleScope::Organization))),\n            ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_in_lineage(\n        conn: &PgPooledConn,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned()))\n                .and(\n                    dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                        .eq(merchant_id.to_owned())\n                        .and(dsl::scope.eq(RoleScope::Merchant))),\n                ),\n        )\n        .await\n    }\n\n    pub async fn find_by_role_id_and_org_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Self> {\n        generics::generic_find_one::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id\n                .eq(role_id.to_owned())\n                .and(dsl::org_id.eq(org_id.to_owned())),\n        )\n        .await\n    }\n\n    pub async fn update_by_role_id(\n        conn: &PgPooledConn,\n        role_id: &str,\n        role_update: RoleUpdate,\n    ) -> StorageResult<Self> {\n        generics::generic_update_with_unique_predicate_get_result::<\n            <Self as HasTable>::Table,\n            _,\n            _,\n            _,\n        >(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n            RoleUpdateInternal::from(role_update),\n        )\n        .await\n    }\n\n    pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult<Self> {\n        generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(\n            conn,\n            dsl::role_id.eq(role_id.to_owned()),\n        )\n        .await\n    }\n\n    pub async fn list_roles(\n        conn: &PgPooledConn,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> StorageResult<Vec<Self>> {\n        let predicate = dsl::org_id.eq(org_id.to_owned()).and(\n            dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n                .eq(merchant_id.to_owned())\n                .and(dsl::scope.eq(RoleScope::Merchant))),\n        );\n\n        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(\n            conn,\n            predicate,\n            None,\n            None,\n            Some(dsl::last_modified_at.asc()),\n        )\n        .await\n    }\n\n    pub async fn generic_roles_list_for_org(\n        conn: &PgPooledConn,\n        org_id: id_type::OrganizationId,\n        merchant_id: Option<id_type::MerchantId>,\n        entity_type: Option<common_enums::EntityType>,\n        limit: Option<u32>,\n    ) -> StorageResult<Vec<Self>> {\n        let mut query = <Self as HasTable>::table()\n            .filter(dsl::org_id.eq(org_id))\n            .into_boxed();\n\n        if let Some(merchant_id) = merchant_id {\n            query = query.filter(\n                (dsl::merchant_id\n                    .eq(merchant_id)\n                    .and(dsl::scope.eq(RoleScope::Merchant)))\n                .or(dsl::scope.eq(RoleScope::Organization)),\n            );\n        }\n\n        if let Some(entity_type) = entity_type {\n            query = query.filter(dsl::entity_type.eq(entity_type))\n        }\n\n        if let Some(limit) = limit {\n            query = query.limit(limit.into());\n        }\n\n        router_env::logger::debug!(query = %debug_query::<Pg,_>(&query).to_string());\n\n        match generics::db_metrics::track_database_call::<Self, _, _>(\n            query.get_results_async(conn),\n            generics::db_metrics::DatabaseOperation::Filter,\n        )\n        .await\n        {\n            Ok(value) => Ok(value),\n            Err(err) => match err {\n                DieselError::NotFound => {\n                    Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n                }\n                _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n            },\n        }\n    }\n}",
+      "diff_span": {
+        "before": "    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,",
+        "after": "    }\n\n    // TODO: Remove once find_by_role_id_in_lineage is stable\n    pub async fn find_by_role_id_in_merchant_scope(\n        conn: &PgPooledConn,"
+      },
+      "commit_sha": "f70f3cf57b9b0c6acb1047941494f7f6f0c1cb98"
+    },
+    {
+      "id": "crates/router/src/db/role.rs::impl::MockDb",
+      "file": "crates/router/src/db/role.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl RoleInterface for MockDb {\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        if roles\n            .iter()\n            .any(|role_inner| role_inner.role_id == role.role_id)\n        {\n            Err(errors::StorageError::DuplicateValue {\n                entity: \"role_id\",\n                key: None,\n            })?\n        }\n        let role = storage::Role {\n            role_name: role.role_name,\n            role_id: role.role_id,\n            merchant_id: role.merchant_id,\n            org_id: role.org_id,\n            groups: role.groups,\n            scope: role.scope,\n            entity_type: role.entity_type,\n            created_by: role.created_by,\n            created_at: role.created_at,\n            last_modified_at: role.last_modified_at,\n            last_modified_by: role.last_modified_by,\n        };\n        roles.push(role.clone());\n        Ok(role)\n    }\n\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available role_id  = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && (role.merchant_id == *merchant_id\n                        || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && role.org_id == *org_id\n                    && ((role.scope == enums::RoleScope::Organization)\n                        || (role.merchant_id == *merchant_id\n                            && role.scope == enums::RoleScope::Merchant))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id && role.org_id == *org_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in org scope for role_id = {role_id} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        roles\n            .iter_mut()\n            .find(|role| role.role_id == role_id)\n            .map(|role| {\n                *role = match role_update {\n                    storage::RoleUpdate::UpdateDetails {\n                        groups,\n                        role_name,\n                        last_modified_at,\n                        last_modified_by,\n                    } => storage::Role {\n                        groups: groups.unwrap_or(role.groups.to_owned()),\n                        role_name: role_name.unwrap_or(role.role_name.to_owned()),\n                        last_modified_by,\n                        last_modified_at,\n                        ..role.to_owned()\n                    },\n                };\n                role.to_owned()\n            })\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available for role_id = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        let role_index = roles\n            .iter()\n            .position(|role| role.role_id == role_id)\n            .ok_or(errors::StorageError::ValueNotFound(format!(\n                \"No role available for role_id = {role_id}\"\n            )))?;\n\n        Ok(roles.remove(role_index))\n    }\n\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                role.merchant_id == *merchant_id\n                    || (role.org_id == *org_id\n                        && role.scope == diesel_models::enums::RoleScope::Organization)\n            })\n            .cloned()\n            .collect();\n\n        if roles_list.is_empty() {\n            return Err(errors::StorageError::ValueNotFound(format!(\n                \"No role found for merchant id = {:?} and org_id = {:?}\",\n                merchant_id, org_id\n            ))\n            .into());\n        }\n\n        Ok(roles_list)\n    }\n\n    #[instrument(skip_all)]\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        let limit_usize = limit.unwrap_or(u32::MAX).try_into().unwrap_or(usize::MAX);\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                let matches_merchant = match merchant_id {\n                    Some(merchant_id) => role.merchant_id == *merchant_id,\n                    None => true,\n                };\n\n                matches_merchant && role.org_id == *org_id && Some(role.entity_type) == entity_type\n            })\n            .take(limit_usize)\n            .cloned()\n            .collect();\n\n        Ok(roles_list)\n    }\n}",
+      "after_code": "impl RoleInterface for MockDb {\n    async fn insert_role(\n        &self,\n        role: storage::RoleNew,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        if roles\n            .iter()\n            .any(|role_inner| role_inner.role_id == role.role_id)\n        {\n            Err(errors::StorageError::DuplicateValue {\n                entity: \"role_id\",\n                key: None,\n            })?\n        }\n        let role = storage::Role {\n            role_name: role.role_name,\n            role_id: role.role_id,\n            merchant_id: role.merchant_id,\n            org_id: role.org_id,\n            groups: role.groups,\n            scope: role.scope,\n            entity_type: role.entity_type,\n            created_by: role.created_by,\n            created_at: role.created_at,\n            last_modified_at: role.last_modified_at,\n            last_modified_by: role.last_modified_by,\n        };\n        roles.push(role.clone());\n        Ok(role)\n    }\n\n    async fn find_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available role_id  = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    // TODO: Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && (role.merchant_id == *merchant_id\n                        || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_role_by_role_id_in_lineage(\n        &self,\n        role_id: &str,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| {\n                role.role_id == role_id\n                    && role.org_id == *org_id\n                    && ((role.scope == enums::RoleScope::Organization)\n                        || (role.merchant_id == *merchant_id\n                            && role.scope == enums::RoleScope::Merchant))\n            })\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in merchant scope for role_id = {role_id}, \\\n                    merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn find_by_role_id_and_org_id(\n        &self,\n        role_id: &str,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        roles\n            .iter()\n            .find(|role| role.role_id == role_id && role.org_id == *org_id)\n            .cloned()\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available in org scope for role_id = {role_id} and org_id = {org_id:?}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn update_role_by_role_id(\n        &self,\n        role_id: &str,\n        role_update: storage::RoleUpdate,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        roles\n            .iter_mut()\n            .find(|role| role.role_id == role_id)\n            .map(|role| {\n                *role = match role_update {\n                    storage::RoleUpdate::UpdateDetails {\n                        groups,\n                        role_name,\n                        last_modified_at,\n                        last_modified_by,\n                    } => storage::Role {\n                        groups: groups.unwrap_or(role.groups.to_owned()),\n                        role_name: role_name.unwrap_or(role.role_name.to_owned()),\n                        last_modified_by,\n                        last_modified_at,\n                        ..role.to_owned()\n                    },\n                };\n                role.to_owned()\n            })\n            .ok_or(\n                errors::StorageError::ValueNotFound(format!(\n                    \"No role available for role_id = {role_id}\"\n                ))\n                .into(),\n            )\n    }\n\n    async fn delete_role_by_role_id(\n        &self,\n        role_id: &str,\n    ) -> CustomResult<storage::Role, errors::StorageError> {\n        let mut roles = self.roles.lock().await;\n        let role_index = roles\n            .iter()\n            .position(|role| role.role_id == role_id)\n            .ok_or(errors::StorageError::ValueNotFound(format!(\n                \"No role available for role_id = {role_id}\"\n            )))?;\n\n        Ok(roles.remove(role_index))\n    }\n\n    async fn list_all_roles(\n        &self,\n        merchant_id: &id_type::MerchantId,\n        org_id: &id_type::OrganizationId,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                role.merchant_id == *merchant_id\n                    || (role.org_id == *org_id\n                        && role.scope == diesel_models::enums::RoleScope::Organization)\n            })\n            .cloned()\n            .collect();\n\n        if roles_list.is_empty() {\n            return Err(errors::StorageError::ValueNotFound(format!(\n                \"No role found for merchant id = {:?} and org_id = {:?}\",\n                merchant_id, org_id\n            ))\n            .into());\n        }\n\n        Ok(roles_list)\n    }\n\n    #[instrument(skip_all)]\n    async fn list_roles_for_org_by_parameters(\n        &self,\n        org_id: &id_type::OrganizationId,\n        merchant_id: Option<&id_type::MerchantId>,\n        entity_type: Option<enums::EntityType>,\n        limit: Option<u32>,\n    ) -> CustomResult<Vec<storage::Role>, errors::StorageError> {\n        let roles = self.roles.lock().await;\n        let limit_usize = limit.unwrap_or(u32::MAX).try_into().unwrap_or(usize::MAX);\n        let roles_list: Vec<_> = roles\n            .iter()\n            .filter(|role| {\n                let matches_merchant = match merchant_id {\n                    Some(merchant_id) => role.merchant_id == *merchant_id,\n                    None => true,\n                };\n\n                matches_merchant && role.org_id == *org_id && Some(role.entity_type) == entity_type\n            })\n            .take(limit_usize)\n            .cloned()\n            .collect();\n\n        Ok(roles_list)\n    }\n}",
+      "diff_span": {
+        "before": "    }\n\n    // TODO:Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,",
+        "after": "    }\n\n    // TODO: Remove once find_by_role_id_in_lineage is stable\n    async fn find_role_by_role_id_in_merchant_scope(\n        &self,"
+      },
+      "commit_sha": "f70f3cf57b9b0c6acb1047941494f7f6f0c1cb98"
+    },
+    {
+      "id": "crates/router/src/core/user_role/role.rs::function::create_role",
+      "file": "crates/router/src/core/user_role/role.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub async fn create_role(\n    state: SessionState,\n    user_from_token: UserFromToken,\n    req: role_api::CreateRoleRequest,\n    _req_state: ReqState,\n) -> UserResponse<role_api::RoleInfoWithGroupsResponse> {\n    let now = common_utils::date_time::now();\n    let role_name = RoleName::new(req.role_name)?;\n\n    utils::user_role::validate_role_groups(&req.groups)?;\n    utils::user_role::validate_role_name(\n        &state,\n        &role_name,\n        &user_from_token.merchant_id,\n        &user_from_token.org_id,\n    )\n    .await?;\n\n    if matches!(req.role_scope, RoleScope::Organization)\n        && user_from_token.role_id != common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))\n            .attach_printable(\"Non org admin user creating org level role\");\n    }\n\n    let role = state\n        .store\n        .insert_role(RoleNew {\n            role_id: generate_id_with_default_len(\"role\"),\n            role_name: role_name.get_role_name(),\n            merchant_id: user_from_token.merchant_id,\n            org_id: user_from_token.org_id,\n            groups: req.groups,\n            scope: req.role_scope,\n            entity_type: EntityType::Merchant,\n            created_by: user_from_token.user_id.clone(),\n            last_modified_by: user_from_token.user_id,\n            created_at: now,\n            last_modified_at: now,\n        })\n        .await\n        .to_duplicate_response(UserErrors::RoleNameAlreadyExists)?;\n\n    Ok(ApplicationResponse::Json(\n        role_api::RoleInfoWithGroupsResponse {\n            groups: role.groups,\n            role_id: role.role_id,\n            role_name: role.role_name,\n            role_scope: role.scope,\n        },\n    ))\n}",
+      "after_code": "pub async fn create_role(\n    state: SessionState,\n    user_from_token: UserFromToken,\n    req: role_api::CreateRoleRequest,\n    _req_state: ReqState,\n) -> UserResponse<role_api::RoleInfoWithGroupsResponse> {\n    let now = common_utils::date_time::now();\n    let role_name = RoleName::new(req.role_name)?;\n\n    utils::user_role::validate_role_groups(&req.groups)?;\n    utils::user_role::validate_role_name(\n        &state,\n        &role_name,\n        &user_from_token.merchant_id,\n        &user_from_token.org_id,\n    )\n    .await?;\n\n    let user_role_info = user_from_token.get_role_info_from_db(&state).await?;\n\n    if matches!(req.role_scope, RoleScope::Organization)\n        && user_role_info.get_entity_type() != EntityType::Organization\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))\n            .attach_printable(\"Non org admin user creating org level role\");\n    }\n\n    let role = state\n        .store\n        .insert_role(RoleNew {\n            role_id: generate_id_with_default_len(\"role\"),\n            role_name: role_name.get_role_name(),\n            merchant_id: user_from_token.merchant_id,\n            org_id: user_from_token.org_id,\n            groups: req.groups,\n            scope: req.role_scope,\n            entity_type: EntityType::Merchant,\n            created_by: user_from_token.user_id.clone(),\n            last_modified_by: user_from_token.user_id,\n            created_at: now,\n            last_modified_at: now,\n        })\n        .await\n        .to_duplicate_response(UserErrors::RoleNameAlreadyExists)?;\n\n    Ok(ApplicationResponse::Json(\n        role_api::RoleInfoWithGroupsResponse {\n            groups: role.groups,\n            role_id: role.role_id,\n            role_name: role.role_name,\n            role_scope: role.scope,\n        },\n    ))\n}",
+      "diff_span": {
+        "before": "\n    if matches!(req.role_scope, RoleScope::Organization)\n        && user_from_token.role_id != common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))",
+        "after": "    .await?;\n\n    let user_role_info = user_from_token.get_role_info_from_db(&state).await?;\n\n    if matches!(req.role_scope, RoleScope::Organization)\n        && user_role_info.get_entity_type() != EntityType::Organization\n    {\n        return Err(report!(UserErrors::InvalidRoleOperation))"
+      },
+      "commit_sha": "f70f3cf57b9b0c6acb1047941494f7f6f0c1cb98"
+    },
+    {
+      "id": "crates/diesel_models/src/user_role.rs::UserRole::function::get_entity_id_and_type",
+      "file": "crates/diesel_models/src/user_role.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub fn get_entity_id_and_type(&self) -> Option<(String, EntityType)> {\n        match (self.version, self.entity_type, self.role_id.as_str()) {\n            (enums::UserRoleVersion::V1, None, consts::ROLE_ID_ORGANIZATION_ADMIN) => {\n                let org_id = self.org_id.clone()?.get_string_repr().to_string();\n                Some((org_id, EntityType::Organization))\n            }\n            (enums::UserRoleVersion::V1, None, _) => {\n                let merchant_id = self.merchant_id.clone()?.get_string_repr().to_string();\n                Some((merchant_id, EntityType::Merchant))\n            }\n            _ => self.entity_id.clone().zip(self.entity_type),\n        }\n    }",
+      "after_code": "pub fn get_entity_id_and_type(&self) -> Option<(String, EntityType)> {\n        match (self.version, self.entity_type, self.role_id.as_str()) {\n            (enums::UserRoleVersion::V1, None, consts::ROLE_ID_ORGANIZATION_ADMIN) => {\n                let org_id = self.org_id.clone()?.get_string_repr().to_string();\n                Some((org_id, EntityType::Organization))\n            }\n            (enums::UserRoleVersion::V1, None, _) => {\n                let merchant_id = self.merchant_id.clone()?.get_string_repr().to_string();\n                Some((merchant_id, EntityType::Merchant))\n            }\n            (enums::UserRoleVersion::V1, Some(_), _) => {\n                self.entity_id.clone().zip(self.entity_type)\n            }\n            (enums::UserRoleVersion::V2, _, _) => self.entity_id.clone().zip(self.entity_type),\n        }\n    }",
+      "diff_span": {
+        "before": "                Some((merchant_id, EntityType::Merchant))\n            }\n            _ => self.entity_id.clone().zip(self.entity_type),\n        }\n    }",
+        "after": "                Some((merchant_id, EntityType::Merchant))\n            }\n            (enums::UserRoleVersion::V1, Some(_), _) => {\n                self.entity_id.clone().zip(self.entity_type)\n            }\n            (enums::UserRoleVersion::V2, _, _) => self.entity_id.clone().zip(self.entity_type),\n        }\n    }"
+      },
+      "commit_sha": "f70f3cf57b9b0c6acb1047941494f7f6f0c1cb98"
+    }
+  ]
+}

diffs/pr_6708/0b93ec2/diff.json

@@ -0,0 +1,24 @@
+{
+  "commit_sha": "0b93ec2981f6a32db0da3fed1f84b18826829732",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/router/src/services/authorization/roles/predefined_roles.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/services/authorization/roles/predefined_roles.rs::static::PREDEFINED_ROLES",
+      "file": "crates/router/src/services/authorization/roles/predefined_roles.rs",
+      "kind": "static_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|| {\n    let mut roles = HashMap::new();\n\n    // Internal Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_ADMIN.to_string(),\n            role_name: \"internal_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),\n            role_name: \"internal_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n\n    // Tenant Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_TENANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n            role_name: \"tenant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Tenant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: false,\n        },\n    );\n\n    // Organization Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n            role_name: \"organization_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Organization,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // MERCHANT ROLES\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),\n            role_name: \"merchant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),\n            role_name: \"merchant_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),\n            role_name: \"merchant_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),\n            role_name: \"merchant_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),\n            role_name: \"merchant_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // Profile Roles\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_ADMIN.to_string(),\n            role_name: \"profile_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY.to_string(),\n            role_name: \"profile_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN.to_string(),\n            role_name: \"profile_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_DEVELOPER.to_string(),\n            role_name: \"profile_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_OPERATOR.to_string(),\n            role_name: \"profile_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"profile_customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles\n});",
+      "after_code": "pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|| {\n    let mut roles = HashMap::new();\n\n    // Internal Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_ADMIN.to_string(),\n            role_name: \"internal_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),\n            role_name: \"internal_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n\n    // Tenant Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_TENANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n            role_name: \"tenant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Tenant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: false,\n        },\n    );\n\n    // Organization Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n            role_name: \"organization_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Organization,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // MERCHANT ROLES\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),\n            role_name: \"merchant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),\n            role_name: \"merchant_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),\n            role_name: \"merchant_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),\n            role_name: \"merchant_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),\n            role_name: \"merchant_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconReportsView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // Profile Roles\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_ADMIN.to_string(),\n            role_name: \"profile_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY.to_string(),\n            role_name: \"profile_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN.to_string(),\n            role_name: \"profile_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_DEVELOPER.to_string(),\n            role_name: \"profile_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_OPERATOR.to_string(),\n            role_name: \"profile_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"profile_customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles\n});",
+      "diff_span": {
+        "before": "                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),",
+        "after": "                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOpsView,\n                PermissionGroup::ReconOpsManage,\n                PermissionGroup::ReconReportsView,\n                PermissionGroup::ReconReportsManage,\n            ],\n            role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),"
+      },
+      "commit_sha": "0b93ec2981f6a32db0da3fed1f84b18826829732"
+    }
+  ]
+}

diffs/pr_6708/1fc97d8/diff.json

@@ -0,0 +1,127 @@
+{
+  "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/router/src/core/user.rs",
+    "crates/router/src/services/authorization/roles/predefined_roles.rs",
+    "crates/router/src/types/domain/user/decision_manager.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/services/authorization/roles/predefined_roles.rs::static::PREDEFINED_ROLES",
+      "file": "crates/router/src/services/authorization/roles/predefined_roles.rs",
+      "kind": "static_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|| {\n    let mut roles = HashMap::new();\n\n    // Internal Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_ADMIN.to_string(),\n            role_name: \"internal_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),\n            role_name: \"internal_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n\n    // Tenant Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_TENANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n            role_name: \"tenant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Tenant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // Organization Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n            role_name: \"organization_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Organization,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // MERCHANT ROLES\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),\n            role_name: \"merchant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),\n            role_name: \"merchant_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),\n            role_name: \"merchant_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),\n            role_name: \"merchant_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),\n            role_name: \"merchant_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // Profile Roles\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_ADMIN.to_string(),\n            role_name: \"profile_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY.to_string(),\n            role_name: \"profile_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN.to_string(),\n            role_name: \"profile_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_DEVELOPER.to_string(),\n            role_name: \"profile_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_OPERATOR.to_string(),\n            role_name: \"profile_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"profile_customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles\n});",
+      "after_code": "pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|| {\n    let mut roles = HashMap::new();\n\n    // Internal Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_ADMIN.to_string(),\n            role_name: \"internal_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n    roles.insert(\n        common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),\n            role_name: \"internal_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: true,\n        },\n    );\n\n    // Tenant Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_TENANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n            role_name: \"tenant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Tenant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: false,\n        },\n    );\n\n    // Organization Roles\n    roles.insert(\n        common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::OrganizationManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n            role_name: \"organization_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Organization,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // MERCHANT ROLES\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n                PermissionGroup::ReconOps,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),\n            role_name: \"merchant_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),\n            role_name: \"merchant_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),\n            role_name: \"merchant_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),\n            role_name: \"merchant_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),\n            role_name: \"merchant_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Merchant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n\n    // Profile Roles\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::ConnectorsManage,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::WorkflowsManage,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_ADMIN.to_string(),\n            role_name: \"profile_admin\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY.to_string(),\n            role_name: \"profile_view_only\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::UsersManage,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN.to_string(),\n            role_name: \"profile_iam\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_DEVELOPER,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n                PermissionGroup::MerchantDetailsManage,\n                PermissionGroup::AccountManage,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_DEVELOPER.to_string(),\n            role_name: \"profile_developer\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_OPERATOR,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::OperationsManage,\n                PermissionGroup::ConnectorsView,\n                PermissionGroup::WorkflowsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_OPERATOR.to_string(),\n            role_name: \"profile_operator\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles.insert(\n        consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT,\n        RoleInfo {\n            groups: vec![\n                PermissionGroup::OperationsView,\n                PermissionGroup::AnalyticsView,\n                PermissionGroup::UsersView,\n                PermissionGroup::MerchantDetailsView,\n                PermissionGroup::AccountView,\n            ],\n            role_id: consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT.to_string(),\n            role_name: \"profile_customer_support\".to_string(),\n            scope: RoleScope::Organization,\n            entity_type: EntityType::Profile,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },\n    );\n    roles\n});",
+      "diff_span": {
+        "before": "            scope: RoleScope::Organization,\n            entity_type: EntityType::Tenant,\n            is_invitable: true,\n            is_deletable: true,\n            is_updatable: true,\n            is_internal: false,\n        },",
+        "after": "            scope: RoleScope::Organization,\n            entity_type: EntityType::Tenant,\n            is_invitable: false,\n            is_deletable: false,\n            is_updatable: false,\n            is_internal: false,\n        },"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d"
+    },
+    {
+      "id": "crates/router/src/core/user.rs::function::switch_org_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 switch_org_for_user(\n    state: SessionState,\n    request: user_api::SwitchOrganizationRequest,\n    user_from_token: auth::UserFromToken,\n) -> UserResponse<user_api::TokenResponse> {\n    if user_from_token.org_id == request.org_id {\n        return Err(UserErrors::InvalidRoleOperationWithMessage(\n            \"User switching to same org\".to_string(),\n        )\n        .into());\n    }\n\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    .attach_printable(\"Failed to retrieve role information\")?;\n\n    if role_info.is_internal() {\n        return Err(UserErrors::InvalidRoleOperationWithMessage(\n            \"Org switching not allowed for Internal role\".to_string(),\n        )\n        .into());\n    }\n\n    let (merchant_id, profile_id) = match role_info.get_entity_type() {\n        EntityType::Tenant => {\n            let merchant_id = state\n                .store\n                .list_merchant_accounts_by_organization_id(&(&state).into(), &request.org_id)\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to get merchant list for org\")?\n                .first()\n                .ok_or(UserErrors::InternalServerError)\n                .attach_printable(\"No merchants found for org id\")?\n                .get_id()\n                .clone();\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\n            (merchant_id, profile_id)\n        }\n        EntityType::Organization | EntityType::Merchant | EntityType::Profile => {\n            let user_role = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id: &user_from_token.user_id,\n                    tenant_id: user_from_token\n                        .tenant_id\n                        .as_ref()\n                        .unwrap_or(&state.tenant.tenant_id),\n                    org_id: Some(&request.org_id),\n                    merchant_id: None,\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::Active),\n                    limit: Some(1),\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n                .pop()\n                .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n                    \"No user role found for the requested org_id\".to_string(),\n                ))?;\n\n            let (merchant_id, profile_id) =\n                utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n            (merchant_id, profile_id)\n        }\n    };\n\n    let token = utils::user::generate_jwt_auth_token_with_attributes(\n        &state,\n        user_from_token.user_id,\n        merchant_id.clone(),\n        request.org_id.clone(),\n        user_from_token.role_id.clone(),\n        profile_id.clone(),\n        user_from_token.tenant_id,\n    )\n    .await?;\n\n    utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n        &state,\n        &user_from_token.role_id,\n        &merchant_id,\n        &request.org_id,\n    )\n    .await;\n\n    let response = user_api::TokenResponse {\n        token: token.clone(),\n        token_type: common_enums::TokenPurpose::UserInfo,\n    };\n\n    auth::cookies::set_cookie_response(response, token)\n}",
+      "after_code": "pub async fn switch_org_for_user(\n    state: SessionState,\n    request: user_api::SwitchOrganizationRequest,\n    user_from_token: auth::UserFromToken,\n) -> UserResponse<user_api::TokenResponse> {\n    if user_from_token.org_id == request.org_id {\n        return Err(UserErrors::InvalidRoleOperationWithMessage(\n            \"User switching to same org\".to_string(),\n        )\n        .into());\n    }\n\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    .attach_printable(\"Failed to retrieve role information\")?;\n\n    if role_info.is_internal() {\n        return Err(UserErrors::InvalidRoleOperationWithMessage(\n            \"Org switching not allowed for Internal role\".to_string(),\n        )\n        .into());\n    }\n\n    let (merchant_id, profile_id, role_id) = match role_info.get_entity_type() {\n        EntityType::Tenant => {\n            let merchant_id = state\n                .store\n                .list_merchant_accounts_by_organization_id(&(&state).into(), &request.org_id)\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to get merchant list for org\")?\n                .pop()\n                .ok_or(UserErrors::InvalidRoleOperation)\n                .attach_printable(\"No merchants found for the org id\")?\n                .get_id()\n                .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\n            (merchant_id, profile_id, user_from_token.role_id)\n        }\n        EntityType::Organization | EntityType::Merchant | EntityType::Profile => {\n            let user_role = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id: &user_from_token.user_id,\n                    tenant_id: user_from_token\n                        .tenant_id\n                        .as_ref()\n                        .unwrap_or(&state.tenant.tenant_id),\n                    org_id: Some(&request.org_id),\n                    merchant_id: None,\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::Active),\n                    limit: Some(1),\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n                .pop()\n                .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n                    \"No user role found for the requested org_id\".to_string(),\n                ))?;\n\n            let (merchant_id, profile_id) =\n                utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n            (merchant_id, profile_id, user_role.role_id)\n        }\n    };\n\n    let token = utils::user::generate_jwt_auth_token_with_attributes(\n        &state,\n        user_from_token.user_id,\n        merchant_id.clone(),\n        request.org_id.clone(),\n        role_id.clone(),\n        profile_id.clone(),\n        user_from_token.tenant_id,\n    )\n    .await?;\n\n    utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n        &state,\n        &role_id,\n        &merchant_id,\n        &request.org_id,\n    )\n    .await;\n\n    let response = user_api::TokenResponse {\n        token: token.clone(),\n        token_type: common_enums::TokenPurpose::UserInfo,\n    };\n\n    auth::cookies::set_cookie_response(response, token)\n}",
+      "diff_span": {
+        "before": "    }\n\n    let (merchant_id, profile_id) = match role_info.get_entity_type() {\n        EntityType::Tenant => {\n            let merchant_id = state\n                .store\n                .list_merchant_accounts_by_organization_id(&(&state).into(), &request.org_id)\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to get merchant list for org\")?\n                .first()\n                .ok_or(UserErrors::InternalServerError)\n                .attach_printable(\"No merchants found for org id\")?\n                .get_id()\n                .clone();\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\n            (merchant_id, profile_id)\n        }\n        EntityType::Organization | EntityType::Merchant | EntityType::Profile => {\n            let user_role = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id: &user_from_token.user_id,\n                    tenant_id: user_from_token\n                        .tenant_id\n                        .as_ref()\n                        .unwrap_or(&state.tenant.tenant_id),\n                    org_id: Some(&request.org_id),\n                    merchant_id: None,\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::Active),\n                    limit: Some(1),\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n                .pop()\n                .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n                    \"No user role found for the requested org_id\".to_string(),\n                ))?;\n\n            let (merchant_id, profile_id) =\n                utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n            (merchant_id, profile_id)\n        }\n    };\n\n    let token = utils::user::generate_jwt_auth_token_with_attributes(\n        &state,\n        user_from_token.user_id,\n        merchant_id.clone(),\n        request.org_id.clone(),\n        user_from_token.role_id.clone(),\n        profile_id.clone(),\n        user_from_token.tenant_id,\n    )\n    .await?;\n\n    utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n        &state,\n        &user_from_token.role_id,\n        &merchant_id,\n        &request.org_id,",
+        "after": "    }\n\n    let (merchant_id, profile_id, role_id) = match role_info.get_entity_type() {\n        EntityType::Tenant => {\n            let merchant_id = state\n                .store\n                .list_merchant_accounts_by_organization_id(&(&state).into(), &request.org_id)\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to get merchant list for org\")?\n                .pop()\n                .ok_or(UserErrors::InvalidRoleOperation)\n                .attach_printable(\"No merchants found for the org id\")?\n                .get_id()\n                .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\n            (merchant_id, profile_id, user_from_token.role_id)\n        }\n        EntityType::Organization | EntityType::Merchant | EntityType::Profile => {\n            let user_role = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id: &user_from_token.user_id,\n                    tenant_id: user_from_token\n                        .tenant_id\n                        .as_ref()\n                        .unwrap_or(&state.tenant.tenant_id),\n                    org_id: Some(&request.org_id),\n                    merchant_id: None,\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::Active),\n                    limit: Some(1),\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)\n                .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n                .pop()\n                .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n                    \"No user role found for the requested org_id\".to_string(),\n                ))?;\n\n            let (merchant_id, profile_id) =\n                utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n            (merchant_id, profile_id, user_role.role_id)\n        }\n    };\n\n    let token = utils::user::generate_jwt_auth_token_with_attributes(\n        &state,\n        user_from_token.user_id,\n        merchant_id.clone(),\n        request.org_id.clone(),\n        role_id.clone(),\n        profile_id.clone(),\n        user_from_token.tenant_id,\n    )\n    .await?;\n\n    utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n        &state,\n        &role_id,\n        &merchant_id,\n        &request.org_id,"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d"
+    },
+    {
+      "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        .first()\n        .ok_or(UserErrors::InternalServerError)\n        .attach_printable(\"No merchants found for the tenancy\")?\n        .clone();\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 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}",
+      "diff_span": {
+        "before": "        .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 found for the tenancy\")?\n        .clone();\n\n    let new_user = domain::NewUser::try_from((request, existing_merchant))?;",
+        "after": "        .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))?;"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d"
+    },
+    {
+      "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<Vec<user_api::ListOrgsForUserResponse>> {\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\n    let orgs = if matches!(role_info.get_entity_type(), 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::<HashSet<_>>()\n    } else {\n        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::<HashSet<_>>()\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::<Vec<_>>();\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<Vec<user_api::ListOrgsForUserResponse>> {\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::<HashSet<_>>()\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::<HashSet<_>>(),\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::<Vec<_>>();\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": "        .into());\n    }\n\n    let orgs = if matches!(role_info.get_entity_type(), 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::<HashSet<_>>()\n    } else {\n        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::<HashSet<_>>()\n    };\n",
+        "after": "        .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::<HashSet<_>>()\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::<HashSet<_>>(),\n    };\n"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d"
+    },
+    {
+      "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<Secret<String>> {\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<Secret<String>> {\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    }",
+      "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",
+        "after": "        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"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d"
+    },
+    {
+      "id": "crates/router/src/core/user.rs::function::create_org_for_user",
+      "file": "crates/router/src/core/user.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": true,
+      "before_code": "pub async fn create_org_for_user(\n    state: SessionState,\n    req: user_api::UserOrgCreateRequest,\n) -> UserResponse<()> {\n    let db_organization = crate::types::transformers::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": "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}",
+      "diff_span": {
+        "before": "    req: user_api::UserOrgCreateRequest,\n) -> UserResponse<()> {\n    let db_organization = crate::types::transformers::ForeignFrom::foreign_from(req.clone());\n    let org: diesel_models::organization::Organization = state\n        .store",
+        "after": "    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"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d",
+      "before_imports": [
+        "use super::errors::{StorageErrorExt, UserErrors, UserResponse, UserResult};",
+        "use diesel_models::{\n    enums::{TotpStatus, UserRoleVersion, UserStatus},\n    organization::OrganizationBridge,\n    user as storage_user,\n    user_authentication_method::{UserAuthenticationMethodNew, UserAuthenticationMethodUpdate},\n};",
+        "use api_models::{\n    payments::RedirectionResponse,\n    user::{self as user_api, InviteMultipleUserResponse, NameIdUnit},\n};"
+      ],
+      "after_imports": [
+        "use crate::types::transformers::ForeignFrom;",
+        "use super::errors::{StorageErrorExt, UserErrors, UserResponse, UserResult};",
+        "use diesel_models::{\n    enums::{TotpStatus, UserRoleVersion, UserStatus},\n    organization::OrganizationBridge,\n    user as storage_user,\n    user_authentication_method::{UserAuthenticationMethodNew, UserAuthenticationMethodUpdate},\n};",
+        "use api_models::{\n    payments::RedirectionResponse,\n    user::{self as user_api, InviteMultipleUserResponse, NameIdUnit},\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<bool> {\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<Secret<String>> {\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<bool> {\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<Secret<String>> {\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}",
+      "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",
+        "after": "        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"
+      },
+      "commit_sha": "1fc97d88ffd2127c1415792f05307f94f6e6971d"
+    }
+  ]
+}

diffs/pr_6708/2d7abe3/diff.json

@@ -0,0 +1,78 @@
+{
+  "commit_sha": "2d7abe3ba544d2c9657e93ff969a1ec4ade04d1d",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/api_models/src/user.rs",
+    "crates/router/src/types/domain/user/decision_manager.rs",
+    "crates/router/src/utils/user.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/api_models/src/user.rs::struct::UserOrgCreateRequest",
+      "file": "crates/api_models/src/user.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub struct UserOrgCreateRequest {\n    pub organization_name: String,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: Option<String>,\n}",
+      "after_code": "pub struct UserOrgCreateRequest {\n    pub organization_name: String,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: String,\n}",
+      "diff_span": {
+        "before": "    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: Option<String>,\n}",
+        "after": "    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: String,\n}"
+      },
+      "commit_sha": "2d7abe3ba544d2c9657e93ff969a1ec4ade04d1d"
+    },
+    {
+      "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": true,
+      "before_code": "pub fn create_merchant_account_request_for_org(\n    req: user_api::UserOrgCreateRequest,\n    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().ok_or(\n            UserErrors::InvalidRoleOperationWithMessage(\"Merchant name required\".to_string()),\n        )?)?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_id,\n        metadata: None,\n        locker_id: None,\n        return_url: None,\n        merchant_name: None,\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::UserOrgCreateRequest,\n    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\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": ") -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().ok_or(\n            UserErrors::InvalidRoleOperationWithMessage(\"Merchant name required\".to_string()),\n        )?)?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_id,\n        metadata: None,\n        locker_id: None,\n        return_url: None,\n        merchant_name: None,\n        webhook_details: None,\n        publishable_key: None,",
+        "after": ") -> UserResult<api_models::admin::MerchantAccountCreate> {\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,"
+      },
+      "commit_sha": "2d7abe3ba544d2c9657e93ff969a1ec4ade04d1d",
+      "before_imports": [
+        "use router_env::env;"
+      ],
+      "after_imports": [
+        "use router_env::env;",
+        "use masking::{ExposeInterface, Secret};"
+      ]
+    },
+    {
+      "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<Secret<String>> {\n        let (merchant_id, profile_id) =\n            utils::user_role::get_single_merchant_id_and_profile_id(state, user_role).await?;\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            user_role\n                .org_id\n                .clone()\n                .ok_or(report!(UserErrors::InternalServerError))\n                .attach_printable(\"org_id not found\")?,\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<Secret<String>> {\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    }",
+      "diff_span": {
+        "before": "        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        let (merchant_id, profile_id) =\n            utils::user_role::get_single_merchant_id_and_profile_id(state, user_role).await?;\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            user_role\n                .org_id\n                .clone()\n                .ok_or(report!(UserErrors::InternalServerError))\n                .attach_printable(\"org_id not found\")?,\n            profile_id,\n            Some(user_role.tenant_id.clone()),",
+        "after": "        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\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()),"
+      },
+      "commit_sha": "2d7abe3ba544d2c9657e93ff969a1ec4ade04d1d"
+    },
+    {
+      "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<bool> {\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<Secret<String>> {\n        let (merchant_id, profile_id) =\n            utils::user_role::get_single_merchant_id_and_profile_id(state, user_role).await?;\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            user_role\n                .org_id\n                .clone()\n                .ok_or(report!(UserErrors::InternalServerError))\n                .attach_printable(\"org_id not found\")?,\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<bool> {\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<Secret<String>> {\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}",
+      "diff_span": {
+        "before": "        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\n        let (merchant_id, profile_id) =\n            utils::user_role::get_single_merchant_id_and_profile_id(state, user_role).await?;\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            user_role\n                .org_id\n                .clone()\n                .ok_or(report!(UserErrors::InternalServerError))\n                .attach_printable(\"org_id not found\")?,\n            profile_id,\n            Some(user_role.tenant_id.clone()),",
+        "after": "        user_role: &UserRole,\n    ) -> UserResult<Secret<String>> {\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()),"
+      },
+      "commit_sha": "2d7abe3ba544d2c9657e93ff969a1ec4ade04d1d"
+    }
+  ]
+}

diffs/pr_6708/3ebd47e/diff.json

@@ -0,0 +1,78 @@
+{
+  "commit_sha": "3ebd47eb80a37af72d3e292457a8cb1cfedeed66",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/api_models/src/user.rs",
+    "crates/router/src/core/user.rs",
+    "crates/router/src/utils/user.rs",
+    "crates/router/src/utils/user_role.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/api_models/src/user.rs::struct::UserOrgCreateRequest",
+      "file": "crates/api_models/src/user.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub struct UserOrgCreateRequest {\n    pub organization_name: String,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: Option<String>,\n}",
+      "after_code": "pub struct UserOrgCreateRequest {\n    pub organization_name: String,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub company_name: Option<String>,\n}",
+      "diff_span": {
+        "before": "    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: Option<String>,\n}",
+        "after": "    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub company_name: Option<String>,\n}"
+      },
+      "commit_sha": "3ebd47eb80a37af72d3e292457a8cb1cfedeed66"
+    },
+    {
+      "id": "crates/router/src/utils/user_role.rs::function::get_lineage_for_user_id_and_entity_for_accepting_invite",
+      "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_lineage_for_user_id_and_entity_for_accepting_invite(\n    state: &SessionState,\n    user_id: &str,\n    tenant_id: &id_type::TenantId,\n    entity_id: String,\n    entity_type: EntityType,\n) -> UserResult<\n    Option<(\n        id_type::OrganizationId,\n        Option<id_type::MerchantId>,\n        Option<id_type::ProfileId>,\n    )>,\n> {\n    match entity_type {\n        EntityType::Tenant => {\n            return Err(UserErrors::InvalidRoleOperationWithMessage(\n                \"Tenant roles are not allowed for this operation\".to_string(),\n            )\n            .into());\n        }\n        EntityType::Organization => {\n            let Ok(org_id) =\n                id_type::OrganizationId::try_from(std::borrow::Cow::from(entity_id.clone()))\n            else {\n                return Ok(None);\n            };\n\n            let user_roles = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id,\n                    tenant_id,\n                    org_id: Some(&org_id),\n                    merchant_id: None,\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::InvitationSent),\n                    limit: None,\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)?\n                .into_iter()\n                .collect::<HashSet<_>>();\n\n            if user_roles.len() > 1 {\n                return Ok(None);\n            }\n\n            if let Some(user_role) = user_roles.into_iter().next() {\n                let (_entity_id, entity_type) = user_role\n                    .get_entity_id_and_type()\n                    .ok_or(UserErrors::InternalServerError)?;\n\n                if entity_type != EntityType::Organization {\n                    return Ok(None);\n                }\n\n                return Ok(Some((\n                    user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n                    None,\n                    None,\n                )));\n            }\n\n            Ok(None)\n        }\n        EntityType::Merchant => {\n            let Ok(merchant_id) = id_type::MerchantId::wrap(entity_id) else {\n                return Ok(None);\n            };\n\n            let user_roles = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id,\n                    tenant_id,\n                    org_id: None,\n                    merchant_id: Some(&merchant_id),\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::InvitationSent),\n                    limit: None,\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)?\n                .into_iter()\n                .collect::<HashSet<_>>();\n\n            if user_roles.len() > 1 {\n                return Ok(None);\n            }\n\n            if let Some(user_role) = user_roles.into_iter().next() {\n                let (_entity_id, entity_type) = user_role\n                    .get_entity_id_and_type()\n                    .ok_or(UserErrors::InternalServerError)?;\n\n                if entity_type != EntityType::Merchant {\n                    return Ok(None);\n                }\n\n                return Ok(Some((\n                    user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n                    Some(merchant_id),\n                    None,\n                )));\n            }\n\n            Ok(None)\n        }\n        EntityType::Profile => {\n            let Ok(profile_id) = id_type::ProfileId::try_from(std::borrow::Cow::from(entity_id))\n            else {\n                return Ok(None);\n            };\n\n            let user_roles = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id,\n                    tenant_id: &state.tenant.tenant_id,\n                    org_id: None,\n                    merchant_id: None,\n                    profile_id: Some(&profile_id),\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::InvitationSent),\n                    limit: None,\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)?\n                .into_iter()\n                .collect::<HashSet<_>>();\n\n            if user_roles.len() > 1 {\n                return Ok(None);\n            }\n\n            if let Some(user_role) = user_roles.into_iter().next() {\n                let (_entity_id, entity_type) = user_role\n                    .get_entity_id_and_type()\n                    .ok_or(UserErrors::InternalServerError)?;\n\n                if entity_type != EntityType::Profile {\n                    return Ok(None);\n                }\n\n                return Ok(Some((\n                    user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n                    Some(\n                        user_role\n                            .merchant_id\n                            .ok_or(UserErrors::InternalServerError)?,\n                    ),\n                    Some(profile_id),\n                )));\n            }\n\n            Ok(None)\n        }\n    }\n}",
+      "after_code": "pub async fn get_lineage_for_user_id_and_entity_for_accepting_invite(\n    state: &SessionState,\n    user_id: &str,\n    tenant_id: &id_type::TenantId,\n    entity_id: String,\n    entity_type: EntityType,\n) -> UserResult<\n    Option<(\n        id_type::OrganizationId,\n        Option<id_type::MerchantId>,\n        Option<id_type::ProfileId>,\n    )>,\n> {\n    match entity_type {\n        EntityType::Tenant => Err(UserErrors::InvalidRoleOperationWithMessage(\n            \"Tenant roles are not allowed for this operation\".to_string(),\n        )\n        .into()),\n        EntityType::Organization => {\n            let Ok(org_id) =\n                id_type::OrganizationId::try_from(std::borrow::Cow::from(entity_id.clone()))\n            else {\n                return Ok(None);\n            };\n\n            let user_roles = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id,\n                    tenant_id,\n                    org_id: Some(&org_id),\n                    merchant_id: None,\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::InvitationSent),\n                    limit: None,\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)?\n                .into_iter()\n                .collect::<HashSet<_>>();\n\n            if user_roles.len() > 1 {\n                return Ok(None);\n            }\n\n            if let Some(user_role) = user_roles.into_iter().next() {\n                let (_entity_id, entity_type) = user_role\n                    .get_entity_id_and_type()\n                    .ok_or(UserErrors::InternalServerError)?;\n\n                if entity_type != EntityType::Organization {\n                    return Ok(None);\n                }\n\n                return Ok(Some((\n                    user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n                    None,\n                    None,\n                )));\n            }\n\n            Ok(None)\n        }\n        EntityType::Merchant => {\n            let Ok(merchant_id) = id_type::MerchantId::wrap(entity_id) else {\n                return Ok(None);\n            };\n\n            let user_roles = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id,\n                    tenant_id,\n                    org_id: None,\n                    merchant_id: Some(&merchant_id),\n                    profile_id: None,\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::InvitationSent),\n                    limit: None,\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)?\n                .into_iter()\n                .collect::<HashSet<_>>();\n\n            if user_roles.len() > 1 {\n                return Ok(None);\n            }\n\n            if let Some(user_role) = user_roles.into_iter().next() {\n                let (_entity_id, entity_type) = user_role\n                    .get_entity_id_and_type()\n                    .ok_or(UserErrors::InternalServerError)?;\n\n                if entity_type != EntityType::Merchant {\n                    return Ok(None);\n                }\n\n                return Ok(Some((\n                    user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n                    Some(merchant_id),\n                    None,\n                )));\n            }\n\n            Ok(None)\n        }\n        EntityType::Profile => {\n            let Ok(profile_id) = id_type::ProfileId::try_from(std::borrow::Cow::from(entity_id))\n            else {\n                return Ok(None);\n            };\n\n            let user_roles = state\n                .global_store\n                .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n                    user_id,\n                    tenant_id: &state.tenant.tenant_id,\n                    org_id: None,\n                    merchant_id: None,\n                    profile_id: Some(&profile_id),\n                    entity_id: None,\n                    version: None,\n                    status: Some(UserStatus::InvitationSent),\n                    limit: None,\n                })\n                .await\n                .change_context(UserErrors::InternalServerError)?\n                .into_iter()\n                .collect::<HashSet<_>>();\n\n            if user_roles.len() > 1 {\n                return Ok(None);\n            }\n\n            if let Some(user_role) = user_roles.into_iter().next() {\n                let (_entity_id, entity_type) = user_role\n                    .get_entity_id_and_type()\n                    .ok_or(UserErrors::InternalServerError)?;\n\n                if entity_type != EntityType::Profile {\n                    return Ok(None);\n                }\n\n                return Ok(Some((\n                    user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n                    Some(\n                        user_role\n                            .merchant_id\n                            .ok_or(UserErrors::InternalServerError)?,\n                    ),\n                    Some(profile_id),\n                )));\n            }\n\n            Ok(None)\n        }\n    }\n}",
+      "diff_span": {
+        "before": "> {\n    match entity_type {\n        EntityType::Tenant => {\n            return Err(UserErrors::InvalidRoleOperationWithMessage(\n                \"Tenant roles are not allowed for this operation\".to_string(),\n            )\n            .into());\n        }\n        EntityType::Organization => {\n            let Ok(org_id) =",
+        "after": "> {\n    match entity_type {\n        EntityType::Tenant => Err(UserErrors::InvalidRoleOperationWithMessage(\n            \"Tenant roles are not allowed for this operation\".to_string(),\n        )\n        .into()),\n        EntityType::Organization => {\n            let Ok(org_id) ="
+      },
+      "commit_sha": "3ebd47eb80a37af72d3e292457a8cb1cfedeed66"
+    },
+    {
+      "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": true,
+      "before_code": "pub fn create_merchant_account_request_for_org(\n    req: user_api::UserOrgCreateRequest,\n    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().ok_or(\n            UserErrors::InvalidRoleOperationWithMessage(\"Merchant name required\".to_string()),\n        )?)?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_id,\n        metadata: None,\n        locker_id: None,\n        return_url: None,\n        merchant_name: None,\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::UserOrgCreateRequest,\n    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_name = if let Some(company_name) = org.company_name.clone() {\n        MerchantName::try_from(company_name)\n    } else {\n        MerchantName::try_new(\"merchant\".to_string())\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"merchant name validation failed\")\n    }\n    .map(Secret::new)?;\n\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_name,\n        organization_id: Some(org.get_organization_id()),\n        metadata: None,\n        merchant_details: None,\n    })\n}",
+      "diff_span": {
+        "before": "    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().ok_or(\n            UserErrors::InvalidRoleOperationWithMessage(\"Merchant name required\".to_string()),\n        )?)?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_id,\n        metadata: None,\n        locker_id: None,\n        return_url: None,\n        merchant_name: None,\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": "    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_name = if let Some(company_name) = org.company_name.clone() {\n        MerchantName::try_from(company_name)\n    } else {\n        MerchantName::try_new(\"merchant\".to_string())\n            .change_context(UserErrors::InternalServerError)\n            .attach_printable(\"merchant name validation failed\")\n    }\n    .map(Secret::new)?;\n\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_name,\n        organization_id: Some(org.get_organization_id()),\n        metadata: None,\n        merchant_details: None,"
+      },
+      "commit_sha": "3ebd47eb80a37af72d3e292457a8cb1cfedeed66",
+      "before_imports": [
+        "use router_env::env;"
+      ],
+      "after_imports": [
+        "use masking::{ExposeInterface, Secret};"
+      ]
+    },
+    {
+      "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<Vec<user_api::ListOrgsForUserResponse>> {\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\n    let orgs = if matches!(role_info.get_entity_type(), 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            .filter_map(|merchant_account| Some(merchant_account.get_org_id().to_owned()))\n            .collect::<HashSet<_>>()\n    } else {\n        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::<HashSet<_>>()\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::<Vec<_>>();\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<Vec<user_api::ListOrgsForUserResponse>> {\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\n    let orgs = if matches!(role_info.get_entity_type(), 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::<HashSet<_>>()\n    } else {\n        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::<HashSet<_>>()\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::<Vec<_>>();\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": "            .change_context(UserErrors::InternalServerError)?\n            .into_iter()\n            .filter_map(|merchant_account| Some(merchant_account.get_org_id().to_owned()))\n            .collect::<HashSet<_>>()\n    } else {",
+        "after": "            .change_context(UserErrors::InternalServerError)?\n            .into_iter()\n            .map(|merchant_account| merchant_account.get_org_id().to_owned())\n            .collect::<HashSet<_>>()\n    } else {"
+      },
+      "commit_sha": "3ebd47eb80a37af72d3e292457a8cb1cfedeed66"
+    }
+  ]
+}

diffs/pr_6708/40a5e96/diff.json

@@ -0,0 +1,39 @@
+{
+  "commit_sha": "40a5e9661b08db2ff6a015b7b0790929ef719c30",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/router/src/routes/app.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/routes/app.rs::User::function::server",
+      "file": "crates/router/src/routes/app.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub fn server(state: AppState) -> Scope {\n        let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n        route = route\n            .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n            .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n            .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n            // signin/signup with sso using openidconnect\n            .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n            .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n            .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n            .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n            .service(\n                web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n            )\n            .service(\n                web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n            )\n            .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n            .service(\n                web::resource(\"/create_merchant\")\n                    .route(web::post().to(user::user_merchant_account_create)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/permission_info\")\n                    .route(web::get().to(user_role::get_authorization_info)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n            )\n            .service(\n                web::resource(\"/parent/list\")\n                    .route(web::get().to(user_role::get_parent_group_info)),\n            )\n            .service(\n                web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n            )\n            .service(\n                web::resource(\"/data\")\n                    .route(web::get().to(user::get_multiple_dashboard_metadata))\n                    .route(web::post().to(user::set_dashboard_metadata)),\n            );\n\n        route = route\n            .service(web::scope(\"/key\").service(\n                web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n            ));\n\n        route = route.service(\n            web::scope(\"/list\")\n                .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::get().to(user::list_merchants_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n                )\n                .service(\n                    web::resource(\"/invitation\")\n                        .route(web::get().to(user_role::list_invitations_for_user)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/switch\")\n                .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::post().to(user::switch_merchant_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n                ),\n        );\n\n        // Two factor auth routes\n        route = route.service(\n            web::scope(\"/2fa\")\n                // TODO: to be deprecated\n                .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n                .service(\n                    web::resource(\"/v2\")\n                        .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n                )\n                .service(\n                    web::scope(\"/totp\")\n                        .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n                        .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::totp_verify))\n                                .route(web::put().to(user::totp_update)),\n                        ),\n                )\n                .service(\n                    web::scope(\"/recovery_code\")\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::verify_recovery_code)),\n                        )\n                        .service(\n                            web::resource(\"/generate\")\n                                .route(web::get().to(user::generate_recovery_codes)),\n                        ),\n                )\n                .service(\n                    web::resource(\"/terminate\")\n                        .route(web::get().to(user::terminate_two_factor_auth)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/auth\")\n                .service(\n                    web::resource(\"\")\n                        .route(web::post().to(user::create_user_authentication_method))\n                        .route(web::put().to(user::update_user_authentication_method)),\n                )\n                .service(\n                    web::resource(\"/list\")\n                        .route(web::get().to(user::list_user_authentication_methods)),\n                )\n                .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n                .service(\n                    web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n                ),\n        );\n\n        #[cfg(feature = \"email\")]\n        {\n            route = route\n                .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n                .service(\n                    web::resource(\"/connect_account\")\n                        .route(web::post().to(user::user_connect_account)),\n                )\n                .service(\n                    web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n                )\n                .service(\n                    web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n                )\n                .service(\n                    web::resource(\"/signup_with_merchant_id\")\n                        .route(web::post().to(user::user_signup_with_merchant_id)),\n                )\n                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre-auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),\n                                ),\n                        ),\n                )\n                .service(\n                    web::resource(\"/update_role\")\n                        .route(web::post().to(user_role::update_user_role)),\n                )\n                .service(\n                    web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n                ),\n        );\n\n        // Role information\n        route =\n            route.service(\n                web::scope(\"/role\")\n                    .service(\n                        web::resource(\"\")\n                            .route(web::get().to(user_role::get_role_from_token))\n                            .route(web::post().to(user_role::create_role)),\n                    )\n                    .service(web::resource(\"/v2\").route(\n                        web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n                    ))\n                    // TODO: To be deprecated\n                    .service(\n                        web::resource(\"/v2/list\")\n                            .route(web::get().to(user_role::list_roles_with_info)),\n                    )\n                    .service(\n                        web::scope(\"/list\")\n                            .service(\n                                web::resource(\"\")\n                                    .route(web::get().to(user_role::list_roles_with_info)),\n                            )\n                            .service(web::resource(\"/invite\").route(\n                                web::get().to(user_role::list_invitable_roles_at_entity_level),\n                            ))\n                            .service(web::resource(\"/update\").route(\n                                web::get().to(user_role::list_updatable_roles_at_entity_level),\n                            )),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}\")\n                            .route(web::get().to(user_role::get_role))\n                            .route(web::put().to(user_role::update_role)),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}/v2\")\n                            .route(web::get().to(user_role::get_parent_info_for_role)),\n                    ),\n            );\n\n        #[cfg(feature = \"dummy_connector\")]\n        {\n            route = route.service(\n                web::resource(\"/sample_data\")\n                    .route(web::post().to(user::generate_sample_data))\n                    .route(web::delete().to(user::delete_sample_data)),\n            )\n        }\n        route\n    }",
+      "after_code": "pub fn server(state: AppState) -> Scope {\n        let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n        route = route\n            .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n            .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n            .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n            // signin/signup with sso using openidconnect\n            .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n            .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n            .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n            .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n            .service(\n                web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n            )\n            .service(\n                web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n            )\n            .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n            .service(\n                web::resource(\"/create_merchant\")\n                    .route(web::post().to(user::user_merchant_account_create)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/permission_info\")\n                    .route(web::get().to(user_role::get_authorization_info)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n            )\n            .service(\n                web::resource(\"/parent/list\")\n                    .route(web::get().to(user_role::get_parent_group_info)),\n            )\n            .service(\n                web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n            )\n            .service(\n                web::resource(\"/data\")\n                    .route(web::get().to(user::get_multiple_dashboard_metadata))\n                    .route(web::post().to(user::set_dashboard_metadata)),\n            );\n\n        route = route\n            .service(web::scope(\"/key\").service(\n                web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n            ));\n\n        route = route.service(\n            web::scope(\"/list\")\n                .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::get().to(user::list_merchants_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n                )\n                .service(\n                    web::resource(\"/invitation\")\n                        .route(web::get().to(user_role::list_invitations_for_user)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/switch\")\n                .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::post().to(user::switch_merchant_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n                ),\n        );\n\n        // Two factor auth routes\n        route = route.service(\n            web::scope(\"/2fa\")\n                // TODO: to be deprecated\n                .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n                .service(\n                    web::resource(\"/v2\")\n                        .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n                )\n                .service(\n                    web::scope(\"/totp\")\n                        .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n                        .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::totp_verify))\n                                .route(web::put().to(user::totp_update)),\n                        ),\n                )\n                .service(\n                    web::scope(\"/recovery_code\")\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::verify_recovery_code)),\n                        )\n                        .service(\n                            web::resource(\"/generate\")\n                                .route(web::get().to(user::generate_recovery_codes)),\n                        ),\n                )\n                .service(\n                    web::resource(\"/terminate\")\n                        .route(web::get().to(user::terminate_two_factor_auth)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/auth\")\n                .service(\n                    web::resource(\"\")\n                        .route(web::post().to(user::create_user_authentication_method))\n                        .route(web::put().to(user::update_user_authentication_method)),\n                )\n                .service(\n                    web::resource(\"/list\")\n                        .route(web::get().to(user::list_user_authentication_methods)),\n                )\n                .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n                .service(\n                    web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n                ),\n        );\n\n        #[cfg(feature = \"email\")]\n        {\n            route = route\n                .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n                .service(\n                    web::resource(\"/connect_account\")\n                        .route(web::post().to(user::user_connect_account)),\n                )\n                .service(\n                    web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n                )\n                .service(\n                    web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n                )\n                .service(\n                    web::resource(\"/signup_with_merchant_id\")\n                        .route(web::post().to(user::user_signup_with_merchant_id)),\n                )\n                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify_email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre_auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),\n                                ),\n                        ),\n                )\n                .service(\n                    web::resource(\"/update_role\")\n                        .route(web::post().to(user_role::update_user_role)),\n                )\n                .service(\n                    web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n                ),\n        );\n\n        // Role information\n        route =\n            route.service(\n                web::scope(\"/role\")\n                    .service(\n                        web::resource(\"\")\n                            .route(web::get().to(user_role::get_role_from_token))\n                            .route(web::post().to(user_role::create_role)),\n                    )\n                    .service(web::resource(\"/v2\").route(\n                        web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n                    ))\n                    // TODO: To be deprecated\n                    .service(\n                        web::resource(\"/v2/list\")\n                            .route(web::get().to(user_role::list_roles_with_info)),\n                    )\n                    .service(\n                        web::scope(\"/list\")\n                            .service(\n                                web::resource(\"\")\n                                    .route(web::get().to(user_role::list_roles_with_info)),\n                            )\n                            .service(web::resource(\"/invite\").route(\n                                web::get().to(user_role::list_invitable_roles_at_entity_level),\n                            ))\n                            .service(web::resource(\"/update\").route(\n                                web::get().to(user_role::list_updatable_roles_at_entity_level),\n                            )),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}\")\n                            .route(web::get().to(user_role::get_role))\n                            .route(web::put().to(user_role::update_role)),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}/v2\")\n                            .route(web::get().to(user_role::get_parent_info_for_role)),\n                    ),\n            );\n\n        #[cfg(feature = \"dummy_connector\")]\n        {\n            route = route.service(\n                web::resource(\"/sample_data\")\n                    .route(web::post().to(user::generate_sample_data))\n                    .route(web::delete().to(user::delete_sample_data)),\n            )\n        }\n        route\n    }",
+      "diff_span": {
+        "before": "                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre-auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),",
+        "after": "                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify_email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre_auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),"
+      },
+      "commit_sha": "40a5e9661b08db2ff6a015b7b0790929ef719c30"
+    },
+    {
+      "id": "crates/router/src/routes/app.rs::impl::User",
+      "file": "crates/router/src/routes/app.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl User {\n    pub fn server(state: AppState) -> Scope {\n        let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n        route = route\n            .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n            .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n            .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n            // signin/signup with sso using openidconnect\n            .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n            .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n            .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n            .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n            .service(\n                web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n            )\n            .service(\n                web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n            )\n            .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n            .service(\n                web::resource(\"/create_merchant\")\n                    .route(web::post().to(user::user_merchant_account_create)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/permission_info\")\n                    .route(web::get().to(user_role::get_authorization_info)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n            )\n            .service(\n                web::resource(\"/parent/list\")\n                    .route(web::get().to(user_role::get_parent_group_info)),\n            )\n            .service(\n                web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n            )\n            .service(\n                web::resource(\"/data\")\n                    .route(web::get().to(user::get_multiple_dashboard_metadata))\n                    .route(web::post().to(user::set_dashboard_metadata)),\n            );\n\n        route = route\n            .service(web::scope(\"/key\").service(\n                web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n            ));\n\n        route = route.service(\n            web::scope(\"/list\")\n                .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::get().to(user::list_merchants_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n                )\n                .service(\n                    web::resource(\"/invitation\")\n                        .route(web::get().to(user_role::list_invitations_for_user)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/switch\")\n                .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::post().to(user::switch_merchant_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n                ),\n        );\n\n        // Two factor auth routes\n        route = route.service(\n            web::scope(\"/2fa\")\n                // TODO: to be deprecated\n                .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n                .service(\n                    web::resource(\"/v2\")\n                        .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n                )\n                .service(\n                    web::scope(\"/totp\")\n                        .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n                        .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::totp_verify))\n                                .route(web::put().to(user::totp_update)),\n                        ),\n                )\n                .service(\n                    web::scope(\"/recovery_code\")\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::verify_recovery_code)),\n                        )\n                        .service(\n                            web::resource(\"/generate\")\n                                .route(web::get().to(user::generate_recovery_codes)),\n                        ),\n                )\n                .service(\n                    web::resource(\"/terminate\")\n                        .route(web::get().to(user::terminate_two_factor_auth)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/auth\")\n                .service(\n                    web::resource(\"\")\n                        .route(web::post().to(user::create_user_authentication_method))\n                        .route(web::put().to(user::update_user_authentication_method)),\n                )\n                .service(\n                    web::resource(\"/list\")\n                        .route(web::get().to(user::list_user_authentication_methods)),\n                )\n                .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n                .service(\n                    web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n                ),\n        );\n\n        #[cfg(feature = \"email\")]\n        {\n            route = route\n                .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n                .service(\n                    web::resource(\"/connect_account\")\n                        .route(web::post().to(user::user_connect_account)),\n                )\n                .service(\n                    web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n                )\n                .service(\n                    web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n                )\n                .service(\n                    web::resource(\"/signup_with_merchant_id\")\n                        .route(web::post().to(user::user_signup_with_merchant_id)),\n                )\n                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre-auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),\n                                ),\n                        ),\n                )\n                .service(\n                    web::resource(\"/update_role\")\n                        .route(web::post().to(user_role::update_user_role)),\n                )\n                .service(\n                    web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n                ),\n        );\n\n        // Role information\n        route =\n            route.service(\n                web::scope(\"/role\")\n                    .service(\n                        web::resource(\"\")\n                            .route(web::get().to(user_role::get_role_from_token))\n                            .route(web::post().to(user_role::create_role)),\n                    )\n                    .service(web::resource(\"/v2\").route(\n                        web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n                    ))\n                    // TODO: To be deprecated\n                    .service(\n                        web::resource(\"/v2/list\")\n                            .route(web::get().to(user_role::list_roles_with_info)),\n                    )\n                    .service(\n                        web::scope(\"/list\")\n                            .service(\n                                web::resource(\"\")\n                                    .route(web::get().to(user_role::list_roles_with_info)),\n                            )\n                            .service(web::resource(\"/invite\").route(\n                                web::get().to(user_role::list_invitable_roles_at_entity_level),\n                            ))\n                            .service(web::resource(\"/update\").route(\n                                web::get().to(user_role::list_updatable_roles_at_entity_level),\n                            )),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}\")\n                            .route(web::get().to(user_role::get_role))\n                            .route(web::put().to(user_role::update_role)),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}/v2\")\n                            .route(web::get().to(user_role::get_parent_info_for_role)),\n                    ),\n            );\n\n        #[cfg(feature = \"dummy_connector\")]\n        {\n            route = route.service(\n                web::resource(\"/sample_data\")\n                    .route(web::post().to(user::generate_sample_data))\n                    .route(web::delete().to(user::delete_sample_data)),\n            )\n        }\n        route\n    }\n}",
+      "after_code": "impl User {\n    pub fn server(state: AppState) -> Scope {\n        let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n        route = route\n            .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n            .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n            .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n            // signin/signup with sso using openidconnect\n            .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n            .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n            .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n            .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n            .service(\n                web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n            )\n            .service(\n                web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n            )\n            .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n            .service(\n                web::resource(\"/create_merchant\")\n                    .route(web::post().to(user::user_merchant_account_create)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/permission_info\")\n                    .route(web::get().to(user_role::get_authorization_info)),\n            )\n            // TODO: To be deprecated\n            .service(\n                web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n            )\n            .service(\n                web::resource(\"/parent/list\")\n                    .route(web::get().to(user_role::get_parent_group_info)),\n            )\n            .service(\n                web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n            )\n            .service(\n                web::resource(\"/data\")\n                    .route(web::get().to(user::get_multiple_dashboard_metadata))\n                    .route(web::post().to(user::set_dashboard_metadata)),\n            );\n\n        route = route\n            .service(web::scope(\"/key\").service(\n                web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n            ));\n\n        route = route.service(\n            web::scope(\"/list\")\n                .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::get().to(user::list_merchants_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n                )\n                .service(\n                    web::resource(\"/invitation\")\n                        .route(web::get().to(user_role::list_invitations_for_user)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/switch\")\n                .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n                .service(\n                    web::resource(\"/merchant\")\n                        .route(web::post().to(user::switch_merchant_for_user_in_org)),\n                )\n                .service(\n                    web::resource(\"/profile\")\n                        .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n                ),\n        );\n\n        // Two factor auth routes\n        route = route.service(\n            web::scope(\"/2fa\")\n                // TODO: to be deprecated\n                .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n                .service(\n                    web::resource(\"/v2\")\n                        .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n                )\n                .service(\n                    web::scope(\"/totp\")\n                        .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n                        .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::totp_verify))\n                                .route(web::put().to(user::totp_update)),\n                        ),\n                )\n                .service(\n                    web::scope(\"/recovery_code\")\n                        .service(\n                            web::resource(\"/verify\")\n                                .route(web::post().to(user::verify_recovery_code)),\n                        )\n                        .service(\n                            web::resource(\"/generate\")\n                                .route(web::get().to(user::generate_recovery_codes)),\n                        ),\n                )\n                .service(\n                    web::resource(\"/terminate\")\n                        .route(web::get().to(user::terminate_two_factor_auth)),\n                ),\n        );\n\n        route = route.service(\n            web::scope(\"/auth\")\n                .service(\n                    web::resource(\"\")\n                        .route(web::post().to(user::create_user_authentication_method))\n                        .route(web::put().to(user::update_user_authentication_method)),\n                )\n                .service(\n                    web::resource(\"/list\")\n                        .route(web::get().to(user::list_user_authentication_methods)),\n                )\n                .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n                .service(\n                    web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n                ),\n        );\n\n        #[cfg(feature = \"email\")]\n        {\n            route = route\n                .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n                .service(\n                    web::resource(\"/connect_account\")\n                        .route(web::post().to(user::user_connect_account)),\n                )\n                .service(\n                    web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n                )\n                .service(\n                    web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n                )\n                .service(\n                    web::resource(\"/signup_with_merchant_id\")\n                        .route(web::post().to(user::user_signup_with_merchant_id)),\n                )\n                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify_email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre_auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),\n                                ),\n                        ),\n                )\n                .service(\n                    web::resource(\"/update_role\")\n                        .route(web::post().to(user_role::update_user_role)),\n                )\n                .service(\n                    web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n                ),\n        );\n\n        // Role information\n        route =\n            route.service(\n                web::scope(\"/role\")\n                    .service(\n                        web::resource(\"\")\n                            .route(web::get().to(user_role::get_role_from_token))\n                            .route(web::post().to(user_role::create_role)),\n                    )\n                    .service(web::resource(\"/v2\").route(\n                        web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n                    ))\n                    // TODO: To be deprecated\n                    .service(\n                        web::resource(\"/v2/list\")\n                            .route(web::get().to(user_role::list_roles_with_info)),\n                    )\n                    .service(\n                        web::scope(\"/list\")\n                            .service(\n                                web::resource(\"\")\n                                    .route(web::get().to(user_role::list_roles_with_info)),\n                            )\n                            .service(web::resource(\"/invite\").route(\n                                web::get().to(user_role::list_invitable_roles_at_entity_level),\n                            ))\n                            .service(web::resource(\"/update\").route(\n                                web::get().to(user_role::list_updatable_roles_at_entity_level),\n                            )),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}\")\n                            .route(web::get().to(user_role::get_role))\n                            .route(web::put().to(user_role::update_role)),\n                    )\n                    .service(\n                        web::resource(\"/{role_id}/v2\")\n                            .route(web::get().to(user_role::get_parent_info_for_role)),\n                    ),\n            );\n\n        #[cfg(feature = \"dummy_connector\")]\n        {\n            route = route.service(\n                web::resource(\"/sample_data\")\n                    .route(web::post().to(user::generate_sample_data))\n                    .route(web::delete().to(user::delete_sample_data)),\n            )\n        }\n        route\n    }\n}",
+      "diff_span": {
+        "before": "                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre-auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),",
+        "after": "                .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n                .service(\n                    web::resource(\"/v2/verify_email\").route(web::post().to(user::verify_email)),\n                )\n                .service(\n                    web::resource(\"/verify_email_request\")\n                        .route(web::post().to(user::verify_email_request)),\n                )\n                .service(\n                    web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n                )\n                .service(\n                    web::resource(\"/accept_invite_from_email\")\n                        .route(web::post().to(user::accept_invite_from_email)),\n                );\n        }\n        #[cfg(not(feature = \"email\"))]\n        {\n            route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n        }\n\n        // User management\n        route = route.service(\n            web::scope(\"/user\")\n                .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n                // TODO: To be deprecated\n                .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n                .service(\n                    web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                // TODO: To be deprecated\n                .service(\n                    web::resource(\"/v2/list\")\n                        .route(web::get().to(user_role::list_users_in_lineage)),\n                )\n                .service(\n                    web::resource(\"/invite_multiple\")\n                        .route(web::post().to(user::invite_multiple_user)),\n                )\n                .service(\n                    web::scope(\"/invite/accept\")\n                        .service(\n                            web::resource(\"\")\n                                .route(web::post().to(user_role::accept_invitations_v2)),\n                        )\n                        .service(\n                            web::resource(\"/pre_auth\")\n                                .route(web::post().to(user_role::accept_invitations_pre_auth)),\n                        )\n                        .service(\n                            web::scope(\"/v2\")\n                                .service(\n                                    web::resource(\"\")\n                                        .route(web::post().to(user_role::accept_invitations_v2)),\n                                )\n                                .service(\n                                    web::resource(\"/pre_auth\").route(\n                                        web::post().to(user_role::accept_invitations_pre_auth),\n                                    ),"
+      },
+      "commit_sha": "40a5e9661b08db2ff6a015b7b0790929ef719c30"
+    }
+  ]
+}

diffs/pr_6708/834dfce/diff.json

@@ -0,0 +1,24 @@
+{
+  "commit_sha": "834dfce1af66d9a3a9ad47346b4f58885b6067c9",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/router/src/core/user.rs"
+  ],
+  "diffs": [
+    {
+      "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<Vec<user_api::ListOrgsForUserResponse>> {\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::<HashSet<_>>()\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::<HashSet<_>>(),\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::<Vec<_>>();\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<Vec<user_api::ListOrgsForUserResponse>> {\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(\n                    key_manager_state,\n                    consts::user::ORG_LIST_LIMIT_FOR_TENANT,\n                    0,\n                )\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::<HashSet<_>>()\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::<HashSet<_>>(),\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::<Vec<_>>();\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_merchant_and_org_ids(key_manager_state, consts::user::ORG_LIST_LIMIT_FOR_TENANT, 0)\n                .await\n                .change_context(UserErrors::InternalServerError)?",
+        "after": "            state\n                .store\n                .list_merchant_and_org_ids(\n                    key_manager_state,\n                    consts::user::ORG_LIST_LIMIT_FOR_TENANT,\n                    0,\n                )\n                .await\n                .change_context(UserErrors::InternalServerError)?"
+      },
+      "commit_sha": "834dfce1af66d9a3a9ad47346b4f58885b6067c9"
+    }
+  ]
+}

diffs/pr_6708/8a56ce5/diff.json

@@ -0,0 +1,24 @@
+{
+  "commit_sha": "8a56ce5efb4f4b518353726c0dcbe2aa202f86af",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/router/src/core/user.rs"
+  ],
+  "diffs": [
+    {
+      "id": "crates/router/src/core/user.rs::function::create_org_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 create_org_for_user(\n    state: SessionState,\n    req: user_api::UserOrgCreateRequest,\n) -> UserResponse<()> {\n    let db_organization = crate::types::transformers::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": "pub async fn create_org_for_user(\n    state: SessionState,\n    req: user_api::UserOrgCreateRequest,\n) -> UserResponse<()> {\n    let db_organization = crate::types::transformers::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": {
+        "before": "        .change_context(UserErrors::InternalServerError)\n        .attach_printable(\"Error while creating a merchant\")?;\n    \n    Ok(ApplicationResponse::StatusOk)\n}",
+        "after": "        .change_context(UserErrors::InternalServerError)\n        .attach_printable(\"Error while creating a merchant\")?;\n\n    Ok(ApplicationResponse::StatusOk)\n}"
+      },
+      "commit_sha": "8a56ce5efb4f4b518353726c0dcbe2aa202f86af"
+    }
+  ]
+}

diffs/pr_6708/ad79f35/diff.json

@@ -0,0 +1,122 @@
+{
+  "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/api_models/src/user.rs",
+    "crates/router/src/core/user.rs",
+    "crates/router/src/types/domain/user.rs",
+    "crates/router/src/utils/user.rs"
+  ],
+  "diffs": [
+    {
+      "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::UserOrgMerchantCreateRequest,\n    org: organization::Organization,\n) -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.peek().clone())?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n\n    let company_name = domain::UserCompanyName::new(req.merchant_name.peek().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<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().expose())?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n\n    let company_name = domain::UserCompanyName::new(req.merchant_name.expose())?;\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": ") -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.peek().clone())?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n\n    let company_name = domain::UserCompanyName::new(req.merchant_name.peek().clone())?;\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_id,",
+        "after": ") -> UserResult<api_models::admin::MerchantAccountCreate> {\n    let merchant_id = if matches!(env::which(), env::Env::Production) {\n        id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().expose())?)?\n    } else {\n        id_type::MerchantId::new_from_unix_timestamp()\n    };\n\n    let company_name = domain::UserCompanyName::new(req.merchant_name.expose())?;\n    Ok(api_models::admin::MerchantAccountCreate {\n        merchant_id,"
+      },
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "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::CreateTenantUserRequest,\n) -> UserResponse<()> {\n    let key_manager_state = &(&state).into();\n\n    let (merchant_id, org_id) = state\n        .store\n        .list_merchant_and_org_ids(key_manager_state, 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((\n        request,\n        user_api::MerchantAccountIdentifier {\n            merchant_id,\n            org_id,\n        },\n    ))?;\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::CreateTenantUserRequest,\n) -> UserResponse<()> {\n    let key_manager_state = &(&state).into();\n\n    let (merchant_id, org_id) = state\n        .store\n        .list_merchant_and_org_ids(key_manager_state, 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((\n        request,\n        domain::MerchantAccountIdentifier {\n            merchant_id,\n            org_id,\n        },\n    ))?;\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 new_user = domain::NewUser::try_from((\n        request,\n        user_api::MerchantAccountIdentifier {\n            merchant_id,\n            org_id,",
+        "after": "    let new_user = domain::NewUser::try_from((\n        request,\n        domain::MerchantAccountIdentifier {\n            merchant_id,\n            org_id,"
+      },
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::NewUser::function::try_from",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }",
+      "after_code": "fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }",
+      "diff_span": {
+        "before": "        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {",
+        "after": "        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {"
+      },
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::impl::NewUser",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl\n    TryFrom<(\n        user_api::CreateTenantUserRequest,\n        user_api::MerchantAccountIdentifier,\n    )> for NewUser\n{\n    type Error = error_stack::Report<UserErrors>;\n\n    fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }\n}",
+      "after_code": "impl TryFrom<(user_api::CreateTenantUserRequest, MerchantAccountIdentifier)> for NewUser {\n    type Error = error_stack::Report<UserErrors>;\n\n    fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "impl\n    TryFrom<(\n        user_api::CreateTenantUserRequest,\n        user_api::MerchantAccountIdentifier,\n    )> for NewUser\n{\n    type Error = error_stack::Report<UserErrors>;\n\n    fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {",
+        "after": "impl TryFrom<(user_api::CreateTenantUserRequest, MerchantAccountIdentifier)> for NewUser {\n    type Error = error_stack::Report<UserErrors>;\n\n    fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {"
+      },
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::impl::NewUserOrganization",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl\n    From<(\n        user_api::CreateTenantUserRequest,\n        user_api::MerchantAccountIdentifier,\n    )> for NewUserOrganization\n{\n    fn from(\n        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> Self {\n        let new_organization = api_org::OrganizationNew {\n            org_id: merchant_account_identifier.org_id,\n            org_name: None,\n        };\n        let db_organization = ForeignFrom::foreign_from(new_organization);\n        Self(db_organization)\n    }\n}",
+      "after_code": "impl From<(user_api::CreateTenantUserRequest, MerchantAccountIdentifier)> for NewUserOrganization {\n    fn from(\n        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> Self {\n        let new_organization = api_org::OrganizationNew {\n            org_id: merchant_account_identifier.org_id,\n            org_name: None,\n        };\n        let db_organization = ForeignFrom::foreign_from(new_organization);\n        Self(db_organization)\n    }\n}",
+      "diff_span": {
+        "before": "impl\n    From<(\n        user_api::CreateTenantUserRequest,\n        user_api::MerchantAccountIdentifier,\n    )> for NewUserOrganization\n{\n    fn from(\n        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> Self {",
+        "after": "impl From<(user_api::CreateTenantUserRequest, MerchantAccountIdentifier)> for NewUserOrganization {\n    fn from(\n        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> Self {"
+      },
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::NewUserOrganization::function::from",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn from(\n        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> Self {\n        let new_organization = api_org::OrganizationNew {\n            org_id: merchant_account_identifier.org_id,\n            org_name: None,\n        };\n        let db_organization = ForeignFrom::foreign_from(new_organization);\n        Self(db_organization)\n    }",
+      "after_code": "fn from(\n        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> Self {\n        let new_organization = api_org::OrganizationNew {\n            org_id: merchant_account_identifier.org_id,\n            org_name: None,\n        };\n        let db_organization = ForeignFrom::foreign_from(new_organization);\n        Self(db_organization)\n    }",
+      "diff_span": {
+        "before": "        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            user_api::MerchantAccountIdentifier,\n        ),\n    ) -> Self {",
+        "after": "        (_value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> Self {"
+      },
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::struct::MerchantAccountIdentifier",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "struct_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "pub struct MerchantAccountIdentifier {\n    pub merchant_id: id_type::MerchantId,\n    pub org_id: id_type::OrganizationId,\n}",
+      "diff_span": null,
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    },
+    {
+      "id": "crates/api_models/src/user.rs::struct::MerchantAccountIdentifier",
+      "file": "crates/api_models/src/user.rs",
+      "kind": "struct_item",
+      "status": "removed",
+      "before_code": "pub struct MerchantAccountIdentifier {\n    pub merchant_id: id_type::MerchantId,\n    pub org_id: id_type::OrganizationId,\n}",
+      "after_code": null,
+      "diff_span": null,
+      "commit_sha": "ad79f35a3647ffe2dde02c809cc768d3c60c1d54"
+    }
+  ]
+}

diffs/pr_6708/deb2d86/diff.json

@@ -0,0 +1,95 @@
+{
+  "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0",
+  "pr_number": 6708,
+  "rust_files": [
+    "crates/api_models/src/user.rs",
+    "crates/router/src/types/domain/user.rs"
+  ],
+  "diffs": [
+    {
+      "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": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl ForeignFrom<api_models::user::UserOrgMerchantCreateRequest>\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}",
+      "after_code": "impl ForeignFrom<api_models::user::UserOrgMerchantCreateRequest>\n    for diesel_models::organization::OrganizationNew\n{\n    fn foreign_from(item: api_models::user::UserOrgMerchantCreateRequest) -> Self {\n        let org_id = id_type::OrganizationId::default();\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_id, Some(organization_name.expose()));\n        org_new_db.organization_details = organization_details;\n        org_new_db.metadata = metadata;\n        org_new_db\n    }\n}",
+      "diff_span": {
+        "before": "{\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;",
+        "after": "{\n    fn foreign_from(item: api_models::user::UserOrgMerchantCreateRequest) -> Self {\n        let org_id = id_type::OrganizationId::default();\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_id, Some(organization_name.expose()));\n        org_new_db.organization_details = organization_details;\n        org_new_db.metadata = metadata;"
+      },
+      "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::NewUser::function::try_from",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "function_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }",
+      "after_code": "fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::from((value, merchant_account_identifier));\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }",
+      "diff_span": {
+        "before": "            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {",
+        "after": "            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::from((value, merchant_account_identifier));\n\n        Ok(Self {"
+      },
+      "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0"
+    },
+    {
+      "id": "crates/api_models/src/user.rs::struct::UserOrgMerchantCreateRequest",
+      "file": "crates/api_models/src/user.rs",
+      "kind": "struct_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "pub struct UserOrgMerchantCreateRequest {\n    pub organization_name: String,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: Secret<String>,\n}",
+      "after_code": "pub struct UserOrgMerchantCreateRequest {\n    pub organization_name: Secret<String>,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,\n    pub merchant_name: Secret<String>,\n}",
+      "diff_span": {
+        "before": "pub struct UserOrgMerchantCreateRequest {\n    pub organization_name: String,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,",
+        "after": "pub struct UserOrgMerchantCreateRequest {\n    pub organization_name: Secret<String>,\n    pub organization_details: Option<pii::SecretSerdeValue>,\n    pub metadata: Option<pii::SecretSerdeValue>,"
+      },
+      "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::impl::NewUser",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "impl_item",
+      "status": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_code": "impl TryFrom<(user_api::CreateTenantUserRequest, MerchantAccountIdentifier)> for NewUser {\n    type Error = error_stack::Report<UserErrors>;\n\n    fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }\n}",
+      "after_code": "impl TryFrom<(user_api::CreateTenantUserRequest, MerchantAccountIdentifier)> for NewUser {\n    type Error = error_stack::Report<UserErrors>;\n\n    fn try_from(\n        (value, merchant_account_identifier): (\n            user_api::CreateTenantUserRequest,\n            MerchantAccountIdentifier,\n        ),\n    ) -> UserResult<Self> {\n        let user_id = uuid::Uuid::new_v4().to_string();\n        let email = value.email.clone().try_into()?;\n        let name = UserName::new(value.name.clone())?;\n        let password = NewUserPassword {\n            password: UserPassword::new(value.password.clone())?,\n            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::from((value, merchant_account_identifier));\n\n        Ok(Self {\n            user_id,\n            name,\n            email,\n            password: Some(password),\n            new_merchant,\n        })\n    }\n}",
+      "diff_span": {
+        "before": "            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::try_from((value, merchant_account_identifier))?;\n\n        Ok(Self {",
+        "after": "            is_temporary: false,\n        };\n        let new_merchant = NewUserMerchant::from((value, merchant_account_identifier));\n\n        Ok(Self {"
+      },
+      "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0"
+    },
+    {
+      "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": "modified",
+      "code_changed": true,
+      "imports_changed": false,
+      "before_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    }",
+      "after_code": "fn foreign_from(item: api_models::user::UserOrgMerchantCreateRequest) -> Self {\n        let org_id = id_type::OrganizationId::default();\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_id, Some(organization_name.expose()));\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::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;",
+        "after": "fn foreign_from(item: api_models::user::UserOrgMerchantCreateRequest) -> Self {\n        let org_id = id_type::OrganizationId::default();\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_id, Some(organization_name.expose()));\n        org_new_db.organization_details = organization_details;\n        org_new_db.metadata = metadata;"
+      },
+      "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0"
+    },
+    {
+      "id": "crates/router/src/types/domain/user.rs::NewUserMerchant::function::from",
+      "file": "crates/router/src/types/domain/user.rs",
+      "kind": "function_item",
+      "status": "added",
+      "before_code": null,
+      "after_code": "fn from(value: (user_api::CreateTenantUserRequest, MerchantAccountIdentifier)) -> Self {\n        let merchant_id = value.1.merchant_id.clone();\n        let new_organization = NewUserOrganization::from(value);\n        Self {\n            company_name: None,\n            merchant_id,\n            new_organization,\n        }\n    }",
+      "diff_span": null,
+      "commit_sha": "deb2d8637cdc3922ea90690cf8c2f8232582fda0"
+    }
+  ]
+}