rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 09:07:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: implement NameType for name validation (#6734) (#7717)

Browse Source
This commit is contained in:
Sakil Mostak
2025-04-03 18:49:08 +05:30
committed by GitHub
parent b25f071a60
commit d892ee7af0
72 changed files with 364 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
crates/api_models/src/payment_methods.rs
View File

@ -548,11 +548,11 @@ pub struct CardDetail {
/// Card Holder Name
#[schema(value_type = String,example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>,example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
/// Card Issuing Country
pub card_issuing_country: Option<String>,
@ -608,11 +608,11 @@ pub struct CardDetail {
/// Card Holder Name
#[schema(value_type = String,example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>,example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
/// Card Issuing Country
#[schema(value_type = CountryAlpha2)]
@ -651,11 +651,11 @@ pub struct MigrateCardDetail {
/// Card Holder Name
#[schema(value_type = String,example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>,example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
/// Card Issuing Country
pub card_issuing_country: Option<String>,
@ -688,11 +688,11 @@ pub struct MigrateNetworkTokenData {
/// Card Holder Name
#[schema(value_type = String,example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>,example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
/// Card Issuing Country
pub card_issuing_country: Option<String>,
@ -735,11 +735,11 @@ pub struct CardDetailUpdate {
/// Card Holder Name
#[schema(value_type = String,example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>,example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
}
#[cfg(all(
@ -762,7 +762,10 @@ impl CardDetailUpdate {
.card_holder_name
.clone()
.or(card_data_from_locker.name_on_card),
nick_name: self.nick_name.clone().or(card_data_from_locker.nick_name),
nick_name: self
.nick_name
.clone()
.or(card_data_from_locker.nick_name.map(masking::Secret::new)),
card_issuing_country: None,
card_network: None,
card_issuer: None,
@ -777,11 +780,11 @@ impl CardDetailUpdate {
pub struct CardDetailUpdate {
/// Card Holder Name
#[schema(value_type = String,example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>,example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
}
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
@ -795,7 +798,10 @@ impl CardDetailUpdate {
.card_holder_name
.clone()
.or(card_data_from_locker.name_on_card),
nick_name: self.nick_name.clone().or(card_data_from_locker.nick_name),
nick_name: self
.nick_name
.clone()
.or(card_data_from_locker.nick_name.map(masking::Secret::new)),
card_issuing_country: None,
card_network: None,
card_issuer: None,
@ -973,8 +979,8 @@ pub struct CardDetailsPaymentMethod {
pub issuer_country: Option<String>,
pub expiry_month: Option<masking::Secret<String>>,
pub expiry_year: Option<masking::Secret<String>>,
pub nick_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
pub card_holder_name: Option<masking::Secret<String>>,
pub card_isin: Option<String>,
pub card_issuer: Option<String>,
pub card_network: Option<api_enums::CardNetwork>,
@ -1068,12 +1074,12 @@ pub enum BankAccountAccessCreds {
#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
pub struct Card {
pub card_number: CardNumber,
pub name_on_card: Option<common_utils::types::NameType>,
pub name_on_card: Option<masking::Secret<String>>,
pub card_exp_month: masking::Secret<String>,
pub card_exp_year: masking::Secret<String>,
pub card_brand: Option<String>,
pub card_isin: Option<String>,
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<String>,
}
#[cfg(all(
@ -1099,13 +1105,13 @@ pub struct CardDetailFromLocker {
pub card_token: Option<masking::Secret<String>>,
#[schema(value_type=Option<String>)]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
#[schema(value_type=Option<String>)]
pub card_fingerprint: Option<masking::Secret<String>>,
#[schema(value_type=Option<String>)]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
#[schema(value_type = Option<CardNetwork>)]
pub card_network: Option<api_enums::CardNetwork>,
@ -1133,13 +1139,13 @@ pub struct CardDetailFromLocker {
pub expiry_year: Option<masking::Secret<String>>,
#[schema(value_type=Option<String>)]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
#[schema(value_type=Option<String>)]
pub card_fingerprint: Option<masking::Secret<String>>,
#[schema(value_type=Option<String>)]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
#[schema(value_type = Option<CardNetwork>)]
pub card_network: Option<api_enums::CardNetwork>,
@ -2294,8 +2300,8 @@ pub struct TokenizedCardValue1 {
pub card_number: String,
pub exp_year: String,
pub exp_month: String,
pub name_on_card: Option<common_utils::types::NameType>,
pub nickname: Option<common_utils::types::NameType>,
pub name_on_card: Option<String>,
pub nickname: Option<String>,
pub card_last_four: Option<String>,
pub card_token: Option<String>,
}
@ -2363,14 +2369,14 @@ pub struct TokenizedBankRedirectValue2 {
#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
pub struct PaymentMethodRecord {
pub customer_id: id_type::CustomerId,
pub name: Option<common_utils::types::NameType>,
pub name: Option<masking::Secret<String>>,
pub email: Option<pii::Email>,
pub phone: Option<masking::Secret<String>>,
pub phone_country_code: Option<String>,
pub merchant_id: Option<id_type::MerchantId>,
pub payment_method: Option<api_enums::PaymentMethod>,
pub payment_method_type: Option<api_enums::PaymentMethodType>,
pub nick_name: common_utils::types::NameType,
pub nick_name: masking::Secret<String>,
pub payment_instrument_id: Option<masking::Secret<String>>,
pub card_number_masked: masking::Secret<String>,
pub card_expiry_month: masking::Secret<String>,
@ -2379,8 +2385,8 @@ pub struct PaymentMethodRecord {
pub original_transaction_id: Option<String>,
pub billing_address_zip: masking::Secret<String>,
pub billing_address_state: masking::Secret<String>,
pub billing_address_first_name: common_utils::types::NameType,
pub billing_address_last_name: common_utils::types::NameType,
pub billing_address_first_name: masking::Secret<String>,
pub billing_address_last_name: masking::Secret<String>,
pub billing_address_city: String,
pub billing_address_country: Option<api_enums::CountryAlpha2>,
pub billing_address_line1: masking::Secret<String>,
@ -2650,11 +2656,11 @@ pub struct TokenizeCardRequest {
/// Card Holder Name
#[schema(value_type = Option<String>, example = "John Doe")]
pub card_holder_name: Option<common_utils::types::NameType>,
pub card_holder_name: Option<masking::Secret<String>>,
/// Card Holder's Nick Name
#[schema(value_type = Option<String>, example = "John Doe")]
pub nick_name: Option<common_utils::types::NameType>,
pub nick_name: Option<masking::Secret<String>>,
/// Card Issuing Country
pub card_issuing_country: Option<String>,
@ -2715,7 +2721,10 @@ impl From<&Card> for MigrateCardDetail {
card_exp_month: card.card_exp_month.clone(),
card_exp_year: card.card_exp_year.clone(),
card_holder_name: card.name_on_card.clone(),
nick_name: card.nick_name.clone(),
nick_name: card
.nick_name
.as_ref()
.map(|name| masking::Secret::new(name.clone())),
card_issuing_country: None,
card_network: None,
card_issuer: None,