mirror of
https://github.com/juspay/hyperswitch.git
synced 2025-10-29 00:49:42 +08:00
feat(revert): populate payment method details in payments response (#5785)
This commit is contained in:
Sampras Lopes
@ -3,7 +3,7 @@ use std::{
|
||||
fmt,
|
||||
num::NonZeroI64,
|
||||
};
|
||||
pub mod additional_info;
|
||||
|
||||
use cards::CardNumber;
|
||||
use common_utils::{
|
||||
consts::default_payments_list_limit,
|
||||
@ -2026,8 +2026,6 @@ pub enum AdditionalPaymentData {
|
||||
Card(Box<AdditionalCardInfo>),
|
||||
BankRedirect {
|
||||
bank_name: Option<common_enums::BankNames>,
|
||||
#[serde(flatten)]
|
||||
additional_details: Option<additional_info::BankRedirectDetails>,
|
||||
},
|
||||
Wallet {
|
||||
apple_pay: Option<ApplepayPaymentMethod>,
|
||||
@ -2035,18 +2033,18 @@ pub enum AdditionalPaymentData {
|
||||
PayLater {
|
||||
klarna_sdk: Option<KlarnaSdkPaymentMethod>,
|
||||
},
|
||||
BankTransfer(additional_info::BankTransferAdditionalData),
|
||||
Crypto(CryptoData),
|
||||
BankDebit(additional_info::BankDebitAdditionalData),
|
||||
BankTransfer {},
|
||||
Crypto {},
|
||||
BankDebit {},
|
||||
MandatePayment {},
|
||||
Reward {},
|
||||
RealTimePayment(RealTimePaymentData),
|
||||
Upi(additional_info::UpiAdditionalData),
|
||||
GiftCard(additional_info::GiftCardAdditionalData),
|
||||
Voucher(VoucherData),
|
||||
CardRedirect(CardRedirectData),
|
||||
CardToken(additional_info::CardTokenAdditionalData),
|
||||
OpenBanking(OpenBankingData),
|
||||
RealTimePayment {},
|
||||
Upi {},
|
||||
GiftCard {},
|
||||
Voucher {},
|
||||
CardRedirect {},
|
||||
CardToken {},
|
||||
OpenBanking {},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Eq, PartialEq, serde::Deserialize, serde::Serialize)]
|
||||
@ -3013,21 +3011,21 @@ where
|
||||
{
|
||||
match payment_method_data {
|
||||
PaymentMethodDataResponse::Reward {} => serializer.serialize_str("reward"),
|
||||
PaymentMethodDataResponse::BankDebit(_)
|
||||
| PaymentMethodDataResponse::BankRedirect(_)
|
||||
PaymentMethodDataResponse::BankDebit {}
|
||||
| PaymentMethodDataResponse::BankRedirect {}
|
||||
| PaymentMethodDataResponse::Card(_)
|
||||
| PaymentMethodDataResponse::CardRedirect(_)
|
||||
| PaymentMethodDataResponse::CardToken(_)
|
||||
| PaymentMethodDataResponse::Crypto(_)
|
||||
| PaymentMethodDataResponse::CardRedirect {}
|
||||
| PaymentMethodDataResponse::CardToken {}
|
||||
| PaymentMethodDataResponse::Crypto {}
|
||||
| PaymentMethodDataResponse::MandatePayment {}
|
||||
| PaymentMethodDataResponse::GiftCard(_)
|
||||
| PaymentMethodDataResponse::GiftCard {}
|
||||
| PaymentMethodDataResponse::PayLater(_)
|
||||
| PaymentMethodDataResponse::RealTimePayment(_)
|
||||
| PaymentMethodDataResponse::Upi(_)
|
||||
| PaymentMethodDataResponse::RealTimePayment {}
|
||||
| PaymentMethodDataResponse::Upi {}
|
||||
| PaymentMethodDataResponse::Wallet {}
|
||||
| PaymentMethodDataResponse::BankTransfer(_)
|
||||
| PaymentMethodDataResponse::OpenBanking(_)
|
||||
| PaymentMethodDataResponse::Voucher(_) => {
|
||||
| PaymentMethodDataResponse::BankTransfer {}
|
||||
| PaymentMethodDataResponse::OpenBanking {}
|
||||
| PaymentMethodDataResponse::Voucher {} => {
|
||||
payment_method_data_response.serialize(serializer)
|
||||
}
|
||||
}
|
||||
@ -3043,28 +3041,23 @@ where
|
||||
#[derive(Debug, Clone, Eq, PartialEq, serde::Serialize, serde::Deserialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum PaymentMethodDataResponse {
|
||||
#[serde(rename = "card")]
|
||||
Card(Box<CardResponse>),
|
||||
#[schema(value_type = BankTransferAdditionalData)]
|
||||
BankTransfer(additional_info::BankTransferAdditionalData),
|
||||
BankTransfer {},
|
||||
Wallet {},
|
||||
PayLater(Box<PaylaterResponse>),
|
||||
#[schema(value_type = BankRedirectAdditionalData)]
|
||||
BankRedirect(additional_info::BankRedirectAdditionalData),
|
||||
Crypto(CryptoData),
|
||||
#[schema(value_type = BankDebitAdditionalData)]
|
||||
BankDebit(additional_info::BankDebitAdditionalData),
|
||||
BankRedirect {},
|
||||
Crypto {},
|
||||
BankDebit {},
|
||||
MandatePayment {},
|
||||
Reward {},
|
||||
RealTimePayment(RealTimePaymentData),
|
||||
#[schema(value_type = UpiAdditionalData)]
|
||||
Upi(additional_info::UpiAdditionalData),
|
||||
Voucher(VoucherData),
|
||||
#[schema(value_type = GiftCardAdditionalData)]
|
||||
GiftCard(additional_info::GiftCardAdditionalData),
|
||||
CardRedirect(CardRedirectData),
|
||||
#[schema(value_type = CardTokenAdditionalData)]
|
||||
CardToken(additional_info::CardTokenAdditionalData),
|
||||
OpenBanking(OpenBankingData),
|
||||
RealTimePayment {},
|
||||
Upi {},
|
||||
Voucher {},
|
||||
GiftCard {},
|
||||
CardRedirect {},
|
||||
CardToken {},
|
||||
OpenBanking {},
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize, ToSchema)]
|
||||
@ -4306,27 +4299,19 @@ impl From<AdditionalPaymentData> for PaymentMethodDataResponse {
|
||||
None => Self::PayLater(Box::new(PaylaterResponse { klarna_sdk: None })),
|
||||
},
|
||||
AdditionalPaymentData::Wallet { .. } => Self::Wallet {},
|
||||
AdditionalPaymentData::BankRedirect {
|
||||
bank_name,
|
||||
additional_details,
|
||||
} => Self::BankRedirect(additional_info::BankRedirectAdditionalData {
|
||||
bank_name,
|
||||
additional_details,
|
||||
}),
|
||||
AdditionalPaymentData::Crypto(crypto) => Self::Crypto(crypto),
|
||||
AdditionalPaymentData::BankDebit(bank_debit) => Self::BankDebit(bank_debit),
|
||||
AdditionalPaymentData::BankRedirect { .. } => Self::BankRedirect {},
|
||||
AdditionalPaymentData::Crypto {} => Self::Crypto {},
|
||||
AdditionalPaymentData::BankDebit {} => Self::BankDebit {},
|
||||
AdditionalPaymentData::MandatePayment {} => Self::MandatePayment {},
|
||||
AdditionalPaymentData::Reward {} => Self::Reward {},
|
||||
AdditionalPaymentData::RealTimePayment(realtime_payment) => {
|
||||
Self::RealTimePayment(realtime_payment)
|
||||
}
|
||||
AdditionalPaymentData::Upi(upi) => Self::Upi(upi),
|
||||
AdditionalPaymentData::BankTransfer(bank_transfer) => Self::BankTransfer(bank_transfer),
|
||||
AdditionalPaymentData::Voucher(voucher) => Self::Voucher(voucher),
|
||||
AdditionalPaymentData::GiftCard(gift_card) => Self::GiftCard(gift_card),
|
||||
AdditionalPaymentData::CardRedirect(card_redirect) => Self::CardRedirect(card_redirect),
|
||||
AdditionalPaymentData::CardToken(card_token) => Self::CardToken(card_token),
|
||||
AdditionalPaymentData::OpenBanking(open_banking) => Self::OpenBanking(open_banking),
|
||||
AdditionalPaymentData::RealTimePayment {} => Self::RealTimePayment {},
|
||||
AdditionalPaymentData::Upi {} => Self::Upi {},
|
||||
AdditionalPaymentData::BankTransfer {} => Self::BankTransfer {},
|
||||
AdditionalPaymentData::Voucher {} => Self::Voucher {},
|
||||
AdditionalPaymentData::GiftCard {} => Self::GiftCard {},
|
||||
AdditionalPaymentData::CardRedirect {} => Self::CardRedirect {},
|
||||
AdditionalPaymentData::CardToken {} => Self::CardToken {},
|
||||
AdditionalPaymentData::OpenBanking {} => Self::OpenBanking {},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,220 +0,0 @@
|
||||
use common_utils::pii::{self};
|
||||
use masking::{
|
||||
masked_string::{MaskedBankAccount, MaskedIban, MaskedRoutingNumber, MaskedSortCode},
|
||||
Secret,
|
||||
};
|
||||
use utoipa::ToSchema;
|
||||
|
||||
use crate::enums as api_enums;
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum BankDebitAdditionalData {
|
||||
Ach(Box<AchBankDebitAdditionalData>),
|
||||
Bacs(Box<BacsBankDebitAdditionalData>),
|
||||
Becs(Box<BecsBankDebitAdditionalData>),
|
||||
Sepa(Box<SepaBankDebitAdditionalData>),
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct AchBankDebitAdditionalData {
|
||||
/// Partially masked account number for ach bank debit payment
|
||||
#[schema(value_type = String, example = "0001****3456")]
|
||||
pub account_number: Secret<MaskedBankAccount>,
|
||||
|
||||
/// Partially masked routing number for ach bank debit payment
|
||||
#[schema(value_type = String, example = "110***000")]
|
||||
pub routing_number: Secret<MaskedRoutingNumber>,
|
||||
|
||||
/// Bank account's owner name
|
||||
#[schema(value_type = Option<String>, example = "John Doe")]
|
||||
pub bank_account_holder_name: Option<Secret<String>>,
|
||||
|
||||
/// Name of the bank
|
||||
#[schema(value_type = Option<BankNames>, example = "ach")]
|
||||
pub bank_name: Option<common_enums::BankNames>,
|
||||
|
||||
/// Bank account type
|
||||
#[schema(value_type = Option<BankType>, example = "checking")]
|
||||
pub bank_type: Option<common_enums::BankType>,
|
||||
|
||||
/// Bank holder entity type
|
||||
#[schema(value_type = Option<BankHolderType>, example = "personal")]
|
||||
pub bank_holder_type: Option<common_enums::BankHolderType>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct BacsBankDebitAdditionalData {
|
||||
/// Partially masked account number for Bacs payment method
|
||||
#[schema(value_type = String, example = "0001****3456")]
|
||||
pub account_number: Secret<MaskedBankAccount>,
|
||||
|
||||
/// Partially masked sort code for Bacs payment method
|
||||
#[schema(value_type = String, example = "108800")]
|
||||
pub sort_code: Secret<MaskedSortCode>,
|
||||
|
||||
/// Bank account's owner name
|
||||
#[schema(value_type = Option<String>, example = "John Doe")]
|
||||
pub bank_account_holder_name: Option<Secret<String>>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct BecsBankDebitAdditionalData {
|
||||
/// Partially masked account number for Becs payment method
|
||||
#[schema(value_type = String, example = "0001****3456")]
|
||||
pub account_number: Secret<MaskedBankAccount>,
|
||||
|
||||
/// Bank-State-Branch (bsb) number
|
||||
#[schema(value_type = String, example = "000000")]
|
||||
pub bsb_number: Secret<String>,
|
||||
|
||||
/// Bank account's owner name
|
||||
#[schema(value_type = Option<String>, example = "John Doe")]
|
||||
pub bank_account_holder_name: Option<Secret<String>>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct SepaBankDebitAdditionalData {
|
||||
/// Partially masked international bank account number (iban) for SEPA
|
||||
#[schema(value_type = String, example = "DE8937******013000")]
|
||||
pub iban: Secret<MaskedIban>,
|
||||
|
||||
/// Bank account's owner name
|
||||
#[schema(value_type = Option<String>, example = "John Doe")]
|
||||
pub bank_account_holder_name: Option<Secret<String>>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case", tag = "type")]
|
||||
pub struct BankRedirectAdditionalData {
|
||||
/// Name of the bank
|
||||
#[schema(value_type = Option<BankNames>)]
|
||||
pub bank_name: Option<common_enums::BankNames>,
|
||||
#[serde(flatten)]
|
||||
pub additional_details: Option<BankRedirectDetails>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub enum BankRedirectDetails {
|
||||
BancontactCard(Box<BancontactBankRedirectAdditionalData>),
|
||||
Blik(Box<BlikBankRedirectAdditionalData>),
|
||||
Giropay(Box<GiropayBankRedirectAdditionalData>),
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct BancontactBankRedirectAdditionalData {
|
||||
/// Last 4 digits of the card number
|
||||
#[schema(value_type = Option<String>, example = "4242")]
|
||||
pub last4: Option<String>,
|
||||
|
||||
/// The card's expiry month
|
||||
#[schema(value_type = Option<String>, example = "12")]
|
||||
pub card_exp_month: Option<Secret<String>>,
|
||||
|
||||
/// The card's expiry year
|
||||
#[schema(value_type = Option<String>, example = "24")]
|
||||
pub card_exp_year: Option<Secret<String>>,
|
||||
|
||||
/// The card holder's name
|
||||
#[schema(value_type = Option<String>, example = "John Test")]
|
||||
pub card_holder_name: Option<Secret<String>>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct BlikBankRedirectAdditionalData {
|
||||
#[schema(value_type = Option<String>, example = "3GD9MO")]
|
||||
pub blik_code: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct GiropayBankRedirectAdditionalData {
|
||||
#[schema(value_type = Option<String>)]
|
||||
/// Masked bank account bic code
|
||||
pub bic: Option<Secret<MaskedSortCode>>,
|
||||
|
||||
/// Partially masked international bank account number (iban) for SEPA
|
||||
#[schema(value_type = Option<String>)]
|
||||
pub iban: Option<Secret<MaskedIban>>,
|
||||
|
||||
/// Country for bank payment
|
||||
#[schema(value_type = Option<CountryAlpha2>, example = "US")]
|
||||
pub country: Option<api_enums::CountryAlpha2>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum BankTransferAdditionalData {
|
||||
Ach {},
|
||||
Sepa {},
|
||||
Bacs {},
|
||||
Multibanco {},
|
||||
Permata {},
|
||||
Bca {},
|
||||
BniVa {},
|
||||
BriVa {},
|
||||
CimbVa {},
|
||||
DanamonVa {},
|
||||
MandiriVa {},
|
||||
Pix(Box<PixBankTransferAdditionalData>),
|
||||
Pse {},
|
||||
LocalBankTransfer(Box<LocalBankTransferAdditionalData>),
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct PixBankTransferAdditionalData {
|
||||
/// Partially masked unique key for pix transfer
|
||||
#[schema(value_type = Option<String>, example = "a1f4102e ****** 6fa48899c1d1")]
|
||||
pub pix_key: Option<Secret<MaskedBankAccount>>,
|
||||
|
||||
/// Partially masked CPF - CPF is a Brazilian tax identification number
|
||||
#[schema(value_type = Option<String>, example = "**** 124689")]
|
||||
pub cpf: Option<Secret<MaskedBankAccount>>,
|
||||
|
||||
/// Partially masked CNPJ - CNPJ is a Brazilian company tax identification number
|
||||
#[schema(value_type = Option<String>, example = "**** 417312")]
|
||||
pub cnpj: Option<Secret<MaskedBankAccount>>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct LocalBankTransferAdditionalData {
|
||||
/// Partially masked bank code
|
||||
#[schema(value_type = Option<String>, example = "**** OA2312")]
|
||||
pub bank_code: Option<Secret<MaskedBankAccount>>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum GiftCardAdditionalData {
|
||||
Givex(Box<GivexGiftCardAdditionalData>),
|
||||
PaySafeCard {},
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct GivexGiftCardAdditionalData {
|
||||
/// Last 4 digits of the gift card number
|
||||
#[schema(value_type = String, example = "4242")]
|
||||
pub last4: Secret<String>,
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Clone, Debug, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
pub struct CardTokenAdditionalData {
|
||||
/// The card holder's name
|
||||
#[schema(value_type = String, example = "John Test")]
|
||||
pub card_holder_name: Option<Secret<String>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Eq, PartialEq, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum UpiAdditionalData {
|
||||
UpiCollect(Box<UpiCollectAdditionalData>),
|
||||
#[schema(value_type = UpiIntentData)]
|
||||
UpiIntent(Box<super::UpiIntentData>),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Eq, PartialEq, serde::Deserialize, serde::Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub struct UpiCollectAdditionalData {
|
||||
/// Masked VPA ID
|
||||
#[schema(value_type = Option<String>)]
|
||||
pub vpa_id: Option<Secret<String, pii::UpiVpaMaskingStrategy>>,
|
||||
}
|
||||
Reference in New Issue
Block a user