refactor(core): Refactor customer pml for v2

juspay · Jun 3, 2024 · b88e259 · b88e259
1 parent 971ef1f
commit b88e259
Show file tree

Hide file tree

Showing 9 changed files with 362 additions and 136 deletions.
diff --git a/crates/api_models/src/payment_methods.rs b/crates/api_models/src/payment_methods.rs
@@ -860,7 +860,7 @@ pub struct CustomerDefaultPaymentMethodResponse {
 pub struct CustomerPaymentMethod {
     /// Token for payment method in temporary card locker which gets refreshed often
     #[schema(example = "7ebf443f-a050-4067-84e5-e6f6d4800aef")]
-    pub payment_token: String,
+    pub payment_token: Option<String>,
     /// The unique identifier of the customer.
     #[schema(example = "pm_iouuy468iyuowqs")]
     pub payment_method_id: String,

diff --git a/crates/router/src/compatibility/stripe/customers/types.rs b/crates/router/src/compatibility/stripe/customers/types.rs
@@ -219,10 +219,11 @@ impl From<api::CustomerPaymentMethodsListResponse> for CustomerPaymentMethodList
     }
 }
 
+// Check this in review
 impl From<api_types::CustomerPaymentMethod> for PaymentMethodData {
     fn from(item: api_types::CustomerPaymentMethod) -> Self {
         Self {
-            id: item.payment_token,
+            id: item.payment_token.unwrap_or("".to_string()),
             object: "payment_method",
             card: item.card.map(From::from),
             created: item.created,

diff --git a/crates/router/src/core/payment_methods.rs b/crates/router/src/core/payment_methods.rs
@@ -224,11 +224,13 @@ pub async fn retrieve_payment_method_with_token(
             .unwrap_or_default()
         }
 
-        storage::PaymentTokenData::WalletToken(_) => storage::PaymentMethodDataWithId {
-            payment_method: None,
-            payment_method_data: None,
-            payment_method_id: None,
-        },
+        storage::PaymentTokenData::WalletToken(_) | storage::PaymentTokenData::Null => {
+            storage::PaymentMethodDataWithId {
+                payment_method: None,
+                payment_method_data: None,
+                payment_method_id: None,
+            }
+        }
     };
     Ok(token)
 }