From 4d19d8b1d18f49f02e951c5025d35cf5d62cec1b Mon Sep 17 00:00:00 2001
From: Chethan Rao <70657455+Chethan-rao@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:13:46 +0530
Subject: [PATCH] refactor(payments): add support for receiving
 card_holder_name field as an empty string (#3127)

---
 crates/router/src/core/payments/helpers.rs    | 58 +++++--------------
 .../payments/operations/payment_confirm.rs    |  2 -
 .../payments/operations/payment_create.rs     |  2 -
 .../payments/operations/payment_update.rs     |  2 -
 .../Payments - Confirm/event.test.js          | 24 +++-----
 .../Payments - Retrieve/event.test.js         |  8 +--
 .../Payments - Confirm/event.test.js          | 24 +++-----
 .../Payments - Retrieve/event.test.js         |  8 +--
 8 files changed, 37 insertions(+), 91 deletions(-)

diff --git a/crates/router/src/core/payments/helpers.rs b/crates/router/src/core/payments/helpers.rs
index 47d9c0820d..341699c092 100644
--- a/crates/router/src/core/payments/helpers.rs
+++ b/crates/router/src/core/payments/helpers.rs
@@ -946,42 +946,6 @@ pub fn verify_mandate_details(
     )
 }
 
-// This function validates card_holder_name field to be either null or a non-empty string
-pub fn validate_card_holder_name(
-    payment_method_data: Option<api::PaymentMethodData>,
-) -> CustomResult<(), errors::ApiErrorResponse> {
-    if let Some(pmd) = payment_method_data {
-        match pmd {
-            // This validation would occur during payments create
-            api::PaymentMethodData::Card(card) => {
-                if let Some(name) = &card.card_holder_name {
-                    if name.clone().expose().is_empty() {
-                        return Err(errors::ApiErrorResponse::InvalidRequestData {
-                            message: "card_holder_name cannot be empty".to_string(),
-                        })
-                        .into_report();
-                    }
-                }
-            }
-
-            // This validation would occur during payments confirm
-            api::PaymentMethodData::CardToken(card) => {
-                if let Some(name) = card.card_holder_name {
-                    if name.expose().is_empty() {
-                        return Err(errors::ApiErrorResponse::InvalidRequestData {
-                            message: "card_holder_name cannot be empty".to_string(),
-                        })
-                        .into_report();
-                    }
-                }
-            }
-            _ => (),
-        }
-    }
-
-    Ok(())
-}
-
 #[instrument(skip_all)]
 pub fn payment_attempt_status_fsm(
     payment_method_data: &Option<api::PaymentMethodData>,
@@ -1441,13 +1405,15 @@ pub async fn retrieve_payment_method_with_temporary_token(
             let mut is_card_updated = false;
 
             // The card_holder_name from locker retrieved card is considered if it is a non-empty string or else card_holder_name is picked
-            // from payment_method.card_token object
+            // from payment_method_data.card_token object
             let name_on_card = if let Some(name) = card.card_holder_name.clone() {
-                if name.expose().is_empty() {
-                    card_token_data.and_then(|token_data| {
-                        is_card_updated = true;
-                        token_data.card_holder_name.clone()
-                    })
+                if name.clone().expose().is_empty() {
+                    card_token_data
+                        .and_then(|token_data| {
+                            is_card_updated = true;
+                            token_data.card_holder_name.clone()
+                        })
+                        .or(Some(name))
                 } else {
                     card.card_holder_name.clone()
                 }
@@ -1528,10 +1494,12 @@ pub async fn retrieve_card_with_permanent_token(
         .attach_printable("failed to fetch card information from the permanent locker")?;
 
     // The card_holder_name from locker retrieved card is considered if it is a non-empty string or else card_holder_name is picked
-    // from payment_method.card_token object
+    // from payment_method_data.card_token object
     let name_on_card = if let Some(name) = card.name_on_card.clone() {
-        if name.expose().is_empty() {
-            card_token_data.and_then(|token_data| token_data.card_holder_name.clone())
+        if name.clone().expose().is_empty() {
+            card_token_data
+                .and_then(|token_data| token_data.card_holder_name.clone())
+                .or(Some(name))
         } else {
             card.name_on_card
         }
diff --git a/crates/router/src/core/payments/operations/payment_confirm.rs b/crates/router/src/core/payments/operations/payment_confirm.rs
index 8481cd5c83..95556ac1e0 100644
--- a/crates/router/src/core/payments/operations/payment_confirm.rs
+++ b/crates/router/src/core/payments/operations/payment_confirm.rs
@@ -872,8 +872,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve> ValidateRequest<F, api::Paymen
 
         helpers::validate_payment_method_fields_present(request)?;
 
-        helpers::validate_card_holder_name(request.payment_method_data.clone())?;
-
         let mandate_type =
             helpers::validate_mandate(request, payments::is_operation_confirm(self))?;
 
diff --git a/crates/router/src/core/payments/operations/payment_create.rs b/crates/router/src/core/payments/operations/payment_create.rs
index 87a6b69275..97cd59e632 100644
--- a/crates/router/src/core/payments/operations/payment_create.rs
+++ b/crates/router/src/core/payments/operations/payment_create.rs
@@ -561,8 +561,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve> ValidateRequest<F, api::Paymen
         helpers::validate_amount_to_capture_and_capture_method(None, request)?;
         helpers::validate_card_data(request.payment_method_data.clone())?;
 
-        helpers::validate_card_holder_name(request.payment_method_data.clone())?;
-
         helpers::validate_payment_method_fields_present(request)?;
 
         let mandate_type =
diff --git a/crates/router/src/core/payments/operations/payment_update.rs b/crates/router/src/core/payments/operations/payment_update.rs
index 3ae0aae6d1..0440d5bc0e 100644
--- a/crates/router/src/core/payments/operations/payment_update.rs
+++ b/crates/router/src/core/payments/operations/payment_update.rs
@@ -656,8 +656,6 @@ impl<F: Send + Clone, Ctx: PaymentMethodRetrieve> ValidateRequest<F, api::Paymen
 
         helpers::validate_payment_method_fields_present(request)?;
 
-        helpers::validate_card_holder_name(request.payment_method_data.clone())?;
-
         let mandate_type = helpers::validate_mandate(request, false)?;
 
         Ok((
diff --git a/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js b/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js
index e8d6b2216c..9147db9461 100644
--- a/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js	
+++ b/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js	
@@ -1,6 +1,6 @@
-// Validate status 4xx
-pm.test("[POST]::/payments - Status code is 4xx", function () {
-  pm.response.to.be.error;
+// Validate status 2xx
+pm.test("[POST]::/payments - Status code is 2xx", function () {
+  pm.response.to.be.success;
 });
 
 // Validate if response header has matching content-type
@@ -63,20 +63,12 @@ if (jsonData?.client_secret) {
   );
 }
 
-// Response body should have "error"
-pm.test(
-  "[POST]::/payments/:id/confirm - Content check if 'error' exists",
-  function () {
-    pm.expect(typeof jsonData.error !== "undefined").to.be.true;
-  },
-);
-
-// Response body should have value "connector error" for "error type"
-if (jsonData?.error?.type) {
+// Response body should have value "succeeded" for "status"
+if (jsonData?.status) {
   pm.test(
-    "[POST]::/payments/:id/confirm - Content check if value for 'error.type' matches 'invalid_request'",
+    "[POST]::/payments/:id/confirm - Content check if value for 'status' matches 'succeeded'",
     function () {
-      pm.expect(jsonData.error.type).to.eql("invalid_request");
+      pm.expect(jsonData.status).to.eql("succeeded");
     },
   );
-}
+}
\ No newline at end of file
diff --git a/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js b/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js
index 44960e9a6a..3a12047135 100644
--- a/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js	
+++ b/postman/collection-dir/stripe/Flow Testcases/Happy Cases/Scenario2b-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js	
@@ -60,12 +60,12 @@ if (jsonData?.client_secret) {
   );
 }
 
-// Response body should have value "requires_payment_method" for "status"
+// Response body should have value "succeeded" for "status"
 if (jsonData?.status) {
   pm.test(
-    "[POST]::/payments:id - Content check if value for 'status' matches 'requires_payment_method'",
+    "[POST]::/payments:id - Content check if value for 'status' matches 'succeeded'",
     function () {
-      pm.expect(jsonData.status).to.eql("requires_payment_method");
+      pm.expect(jsonData.status).to.eql("succeeded");
     },
   );
-}
+}
\ No newline at end of file
diff --git a/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js b/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js
index e8d6b2216c..9147db9461 100644
--- a/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js	
+++ b/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Confirm/event.test.js	
@@ -1,6 +1,6 @@
-// Validate status 4xx
-pm.test("[POST]::/payments - Status code is 4xx", function () {
-  pm.response.to.be.error;
+// Validate status 2xx
+pm.test("[POST]::/payments - Status code is 2xx", function () {
+  pm.response.to.be.success;
 });
 
 // Validate if response header has matching content-type
@@ -63,20 +63,12 @@ if (jsonData?.client_secret) {
   );
 }
 
-// Response body should have "error"
-pm.test(
-  "[POST]::/payments/:id/confirm - Content check if 'error' exists",
-  function () {
-    pm.expect(typeof jsonData.error !== "undefined").to.be.true;
-  },
-);
-
-// Response body should have value "connector error" for "error type"
-if (jsonData?.error?.type) {
+// Response body should have value "succeeded" for "status"
+if (jsonData?.status) {
   pm.test(
-    "[POST]::/payments/:id/confirm - Content check if value for 'error.type' matches 'invalid_request'",
+    "[POST]::/payments/:id/confirm - Content check if value for 'status' matches 'succeeded'",
     function () {
-      pm.expect(jsonData.error.type).to.eql("invalid_request");
+      pm.expect(jsonData.status).to.eql("succeeded");
     },
   );
-}
+}
\ No newline at end of file
diff --git a/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js b/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js
index 44960e9a6a..3a12047135 100644
--- a/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js	
+++ b/postman/collection-dir/trustpay/Flow Testcases/Happy Cases/Scenario2a-Create payment with confirm false card holder name empty/Payments - Retrieve/event.test.js	
@@ -60,12 +60,12 @@ if (jsonData?.client_secret) {
   );
 }
 
-// Response body should have value "requires_payment_method" for "status"
+// Response body should have value "succeeded" for "status"
 if (jsonData?.status) {
   pm.test(
-    "[POST]::/payments:id - Content check if value for 'status' matches 'requires_payment_method'",
+    "[POST]::/payments:id - Content check if value for 'status' matches 'succeeded'",
     function () {
-      pm.expect(jsonData.status).to.eql("requires_payment_method");
+      pm.expect(jsonData.status).to.eql("succeeded");
     },
   );
-}
+}
\ No newline at end of file