Merge branch 'main' into pm-details-doc

api-reference-v2/openapi_spec.json

@@ -14671,6 +14671,7 @@
           "id",
           "status",
           "amount",
+          "customer_id",
           "connector",
           "client_secret",
           "created",
@@ -14692,6 +14693,13 @@
           "amount": {
             "$ref": "#/components/schemas/ConfirmIntentAmountDetailsResponse"
           },
+          "customer_id": {
+            "type": "string",
+            "description": "The identifier for the customer",
+            "example": "12345_cus_01926c58bc6e77c09e809964e72af8c8",
+            "maxLength": 64,
+            "minLength": 32
+          },
           "connector": {
             "type": "string",
             "description": "The connector used for the payment",
@@ -16416,6 +16424,7 @@
           "id",
           "status",
           "amount",
+          "customer_id",
           "client_secret",
           "created"
         ],
@@ -16433,6 +16442,13 @@
           "amount": {
             "$ref": "#/components/schemas/ConfirmIntentAmountDetailsResponse"
           },
+          "customer_id": {
+            "type": "string",
+            "description": "The identifier for the customer",
+            "example": "12345_cus_01926c58bc6e77c09e809964e72af8c8",
+            "maxLength": 64,
+            "minLength": 32
+          },
           "connector": {
             "type": "string",
             "description": "The connector used for the payment",

crates/api_models/src/events/customer.rs

@@ -1,6 +1,8 @@
 use common_utils::events::{ApiEventMetric, ApiEventsType};
 
-use crate::customers::{CustomerDeleteResponse, CustomerRequest, CustomerResponse};
+use crate::customers::{
+    CustomerDeleteResponse, CustomerRequest, CustomerResponse, CustomerUpdateRequestInternal,
+};
 
 #[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "customer_v2")))]
 impl ApiEventMetric for CustomerDeleteResponse {
@@ -55,7 +57,7 @@ impl ApiEventMetric for CustomerResponse {
 }
 
 #[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "customer_v2")))]
-impl ApiEventMetric for crate::customers::CustomerUpdateRequestInternal {
+impl ApiEventMetric for CustomerUpdateRequestInternal {
     fn get_api_event_type(&self) -> Option<ApiEventsType> {
         Some(ApiEventsType::Customer {
             customer_id: self.customer_id.clone(),
@@ -64,7 +66,7 @@ impl ApiEventMetric for crate::customers::CustomerUpdateRequestInternal {
 }
 
 #[cfg(all(feature = "v2", feature = "customer_v2"))]
-impl ApiEventMetric for crate::customers::CustomerUpdateRequestInternal {
+impl ApiEventMetric for CustomerUpdateRequestInternal {
     fn get_api_event_type(&self) -> Option<ApiEventsType> {
         Some(ApiEventsType::Customer {
             customer_id: Some(self.id.clone()),

crates/api_models/src/payments.rs

@@ -4803,6 +4803,15 @@ pub struct PaymentsConfirmIntentResponse {
     /// Amount related information for this payment and attempt
     pub amount: ConfirmIntentAmountDetailsResponse,
 
+    /// The identifier for the customer
+    #[schema(
+        min_length = 32,
+        max_length = 64,
+        example = "12345_cus_01926c58bc6e77c09e809964e72af8c8",
+        value_type = String
+    )]
+    pub customer_id: Option<id_type::GlobalCustomerId>,
+
     /// The connector used for the payment
     #[schema(example = "stripe")]
     pub connector: String,
@@ -4872,6 +4881,15 @@ pub struct PaymentsRetrieveResponse {
     /// Amount related information for this payment and attempt
     pub amount: ConfirmIntentAmountDetailsResponse,
 
+    /// The identifier for the customer
+    #[schema(
+        min_length = 32,
+        max_length = 64,
+        example = "12345_cus_01926c58bc6e77c09e809964e72af8c8",
+        value_type = String
+    )]
+    pub customer_id: Option<id_type::GlobalCustomerId>,
+
     /// The connector used for the payment
     #[schema(example = "stripe")]
     pub connector: Option<String>,

crates/diesel_models/src/dynamic_routing_stats.rs

@@ -19,6 +19,7 @@ pub struct DynamicRoutingStatsNew {
     pub payment_status: common_enums::AttemptStatus,
     pub conclusive_classification: common_enums::SuccessBasedRoutingConclusiveState,
     pub created_at: time::PrimitiveDateTime,
+    pub payment_method_type: Option<common_enums::PaymentMethodType>,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq, Queryable, Selectable, Insertable)]
@@ -38,4 +39,5 @@ pub struct DynamicRoutingStats {
     pub payment_status: common_enums::AttemptStatus,
     pub conclusive_classification: common_enums::SuccessBasedRoutingConclusiveState,
     pub created_at: time::PrimitiveDateTime,
+    pub payment_method_type: Option<common_enums::PaymentMethodType>,
 }

crates/diesel_models/src/schema.rs

@@ -417,6 +417,8 @@ diesel::table! {
         payment_status -> AttemptStatus,
         conclusive_classification -> SuccessBasedRoutingConclusiveState,
         created_at -> Timestamp,
+        #[max_length = 64]
+        payment_method_type -> Nullable<Varchar>,
     }
 }
 

crates/diesel_models/src/schema_v2.rs

@@ -429,6 +429,8 @@ diesel::table! {
         payment_status -> AttemptStatus,
         conclusive_classification -> SuccessBasedRoutingConclusiveState,
         created_at -> Timestamp,
+        #[max_length = 64]
+        payment_method_type -> Nullable<Varchar>,
     }
 }
 

crates/router/src/core/customers.rs

@@ -568,7 +568,7 @@ pub async fn delete_customer(
 ) -> errors::CustomerResponse<customers::CustomerDeleteResponse> {
     let db = &*state.store;
     let key_manager_state = &(&state).into();
-    id.fetch_domain_model_and_update_and_generate_delete_customer_response(
+    id.redact_customer_details_and_generate_response(
         db,
         &key_store,
         &merchant_account,
@@ -585,7 +585,7 @@ pub async fn delete_customer(
 ))]
 #[async_trait::async_trait]
 impl CustomerDeleteBridge for id_type::GlobalCustomerId {
-    async fn fetch_domain_model_and_update_and_generate_delete_customer_response<'a>(
+    async fn redact_customer_details_and_generate_response<'a>(
         &'a self,
         db: &'a dyn StorageInterface,
         key_store: &'a domain::MerchantKeyStore,
@@ -717,7 +717,7 @@ impl CustomerDeleteBridge for id_type::GlobalCustomerId {
 
 #[async_trait::async_trait]
 trait CustomerDeleteBridge {
-    async fn fetch_domain_model_and_update_and_generate_delete_customer_response<'a>(
+    async fn redact_customer_details_and_generate_response<'a>(
         &'a self,
         db: &'a dyn StorageInterface,
         key_store: &'a domain::MerchantKeyStore,
@@ -742,7 +742,7 @@ pub async fn delete_customer(
     let db = &*state.store;
     let key_manager_state = &(&state).into();
     customer_id
-        .fetch_domain_model_and_update_and_generate_delete_customer_response(
+        .redact_customer_details_and_generate_response(
             db,
             &key_store,
             &merchant_account,
@@ -759,7 +759,7 @@ pub async fn delete_customer(
 ))]
 #[async_trait::async_trait]
 impl CustomerDeleteBridge for id_type::CustomerId {
-    async fn fetch_domain_model_and_update_and_generate_delete_customer_response<'a>(
+    async fn redact_customer_details_and_generate_response<'a>(
         &'a self,
         db: &'a dyn StorageInterface,
         key_store: &'a domain::MerchantKeyStore,

crates/router/src/core/payments/transformers.rs

@@ -1238,6 +1238,7 @@ where
             id: payment_intent.id.clone(),
             status: payment_intent.status,
             amount,
+            customer_id: payment_intent.customer_id.clone(),
             connector,
             client_secret: payment_intent.client_secret.clone(),
             created: payment_intent.created_at,
@@ -1311,6 +1312,7 @@ where
             id: payment_intent.id.clone(),
             status: payment_intent.status,
             amount,
+            customer_id: payment_intent.customer_id.clone(),
             connector,
             billing: payment_address
                 .get_payment_billing()

crates/router/src/core/routing/helpers.rs

@@ -761,6 +761,7 @@ pub async fn push_metrics_with_update_window_for_success_based_routing(
             amount: payment_attempt.get_total_amount(),
             success_based_routing_connector: first_success_based_connector.to_string(),
             payment_connector: payment_connector.to_string(),
+            payment_method_type: payment_attempt.payment_method_type,
             currency: payment_attempt.currency,
             payment_method: payment_attempt.payment_method,
             capture_method: payment_attempt.capture_method,

cypress-tests/cypress.config.js

@@ -1,5 +1,5 @@
 import { defineConfig } from "cypress";
-import "cypress-mochawesome-reporter/plugin.js";
+import mochawesome from "cypress-mochawesome-reporter/plugin.js";
 
 let globalState;
 
@@ -10,7 +10,9 @@ const reportName = process.env.REPORT_NAME || `${connectorId}_report`;
 
 export default defineConfig({
   e2e: {
-    setupNodeEvents(on) {
+    setupNodeEvents(on, config) {
+      mochawesome(on);
+
       on("task", {
         setGlobalState: (val) => {
           return (globalState = val || {});
@@ -26,6 +28,8 @@ export default defineConfig({
           return null;
         },
       });
+
+      return config;
     },
     experimentalRunAllSpecs: true,
 
@@ -43,6 +47,5 @@ export default defineConfig({
   chromeWebSecurity: false,
   defaultCommandTimeout: 10000,
   pageLoadTimeout: 20000,
-
   screenshotsFolder: screenshotsFolderName,
 });

cypress-tests/package.json

@@ -19,15 +19,15 @@
   "author": "Hyperswitch",
   "license": "ISC",
   "devDependencies": {
-    "@eslint/js": "^9.16.0",
-    "cypress": "^13.16.0",
+    "@eslint/js": "^9.17.0",
+    "cypress": "^13.17.0",
     "cypress-mochawesome-reporter": "^3.8.2",
-    "eslint": "^9.16.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-cypress": "^4.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.13.0",
+    "globals": "^15.14.0",
     "jsqr": "^1.4.0",
-    "prettier": "^3.4.1"
+    "prettier": "^3.4.2"
   }
 }

migrations/2024-12-16-111228_add_new_col_payment_method_type_in_dynamic_routing_stats/down.sql

@@ -0,0 +1,3 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE dynamic_routing_stats
+DROP COLUMN IF EXISTS payment_method_type;

migrations/2024-12-16-111228_add_new_col_payment_method_type_in_dynamic_routing_stats/up.sql

@@ -0,0 +1,3 @@
+-- Your SQL goes here
+ALTER TABLE dynamic_routing_stats
+ADD COLUMN IF NOT EXISTS payment_method_type VARCHAR(64);