refactor(api_models): follow naming convention for wallets & paylater payment method data enums (#1338)

Co-authored-by: Sanchith Hegde <22217505+SanchithHegde@users.noreply.github.com>
This commit is contained in:
Arjun Karthik
2023-06-15 14:07:31 +05:30
committed by GitHub
parent a8f2494a87
commit 6c0d136cee
4 changed files with 14 additions and 14 deletions

View File

@ -504,8 +504,8 @@ pub enum PayLaterData {
#[schema(value_type = String)] #[schema(value_type = String)]
billing_name: Secret<String>, billing_name: Secret<String>,
}, },
PayBright {}, PayBrightRedirect {},
Walley {}, WalleyRedirect {},
} }
#[derive(serde::Deserialize, serde::Serialize, Debug, Clone, ToSchema, Eq, PartialEq)] #[derive(serde::Deserialize, serde::Serialize, Debug, Clone, ToSchema, Eq, PartialEq)]
@ -809,16 +809,16 @@ pub struct BankDebitBilling {
#[serde(rename_all = "snake_case")] #[serde(rename_all = "snake_case")]
pub enum WalletData { pub enum WalletData {
/// The wallet data for Ali Pay redirect /// The wallet data for Ali Pay redirect
AliPay(AliPayRedirection), AliPayRedirect(AliPayRedirection),
/// The wallet data for Apple pay /// The wallet data for Apple pay
ApplePay(ApplePayWalletData), ApplePay(ApplePayWalletData),
/// Wallet data for apple pay redirect flow /// Wallet data for apple pay redirect flow
ApplePayRedirect(Box<ApplePayRedirectData>), ApplePayRedirect(Box<ApplePayRedirectData>),
/// The wallet data for Google pay /// The wallet data for Google pay
GooglePay(GooglePayWalletData), GooglePay(GooglePayWalletData),
MbWay(Box<MbWayRedirection>), MbWayRedirect(Box<MbWayRedirection>),
/// The wallet data for MobilePay redirect /// The wallet data for MobilePay redirect
MobilePay(Box<MobilePayRedirection>), MobilePayRedirect(Box<MobilePayRedirection>),
/// This is for paypal redirection /// This is for paypal redirection
PaypalRedirect(PaypalRedirection), PaypalRedirect(PaypalRedirection),
/// The wallet data for Paypal /// The wallet data for Paypal

View File

@ -158,14 +158,14 @@ impl TryFrom<&types::PaymentsAuthorizeRouterData> for AciPaymentsRequest {
})), })),
api::PaymentMethodData::PayLater(_) => PaymentDetails::Klarna, api::PaymentMethodData::PayLater(_) => PaymentDetails::Klarna,
api::PaymentMethodData::Wallet(ref wallet_data) => match wallet_data { api::PaymentMethodData::Wallet(ref wallet_data) => match wallet_data {
api_models::payments::WalletData::MbWay(data) => { api_models::payments::WalletData::MbWayRedirect(data) => {
PaymentDetails::Wallet(Box::new(WalletPMData { PaymentDetails::Wallet(Box::new(WalletPMData {
payment_brand: PaymentBrand::Mbway, payment_brand: PaymentBrand::Mbway,
account_id: Some(data.telephone_number.clone()), account_id: Some(data.telephone_number.clone()),
shopper_result_url: item.request.router_return_url.clone(), shopper_result_url: item.request.router_return_url.clone(),
})) }))
} }
api_models::payments::WalletData::AliPay { .. } => { api_models::payments::WalletData::AliPayRedirect { .. } => {
PaymentDetails::Wallet(Box::new(WalletPMData { PaymentDetails::Wallet(Box::new(WalletPMData {
payment_brand: PaymentBrand::AliPay, payment_brand: PaymentBrand::AliPay,
account_id: None, account_id: None,

View File

@ -1121,20 +1121,20 @@ impl<'a> TryFrom<&api::WalletData> for AdyenPaymentMethod<'a> {
}; };
Ok(AdyenPaymentMethod::AdyenPaypal(Box::new(wallet))) Ok(AdyenPaymentMethod::AdyenPaypal(Box::new(wallet)))
} }
api_models::payments::WalletData::AliPay(_) => { api_models::payments::WalletData::AliPayRedirect(_) => {
let alipay_data = AliPayData { let alipay_data = AliPayData {
payment_type: PaymentType::Alipay, payment_type: PaymentType::Alipay,
}; };
Ok(AdyenPaymentMethod::AliPay(Box::new(alipay_data))) Ok(AdyenPaymentMethod::AliPay(Box::new(alipay_data)))
} }
api_models::payments::WalletData::MbWay(data) => { api_models::payments::WalletData::MbWayRedirect(data) => {
let mbway_data = MbwayData { let mbway_data = MbwayData {
payment_type: PaymentType::Mbway, payment_type: PaymentType::Mbway,
telephone_number: data.telephone_number.clone(), telephone_number: data.telephone_number.clone(),
}; };
Ok(AdyenPaymentMethod::Mbway(Box::new(mbway_data))) Ok(AdyenPaymentMethod::Mbway(Box::new(mbway_data)))
} }
api_models::payments::WalletData::MobilePay(_) => { api_models::payments::WalletData::MobilePayRedirect(_) => {
let data = MobilePayData { let data = MobilePayData {
payment_type: PaymentType::MobilePay, payment_type: PaymentType::MobilePay,
}; };
@ -1171,12 +1171,12 @@ impl<'a> TryFrom<&api::PayLaterData> for AdyenPaymentMethod<'a> {
payment_type: PaymentType::Afterpaytouch, payment_type: PaymentType::Afterpaytouch,
}))) })))
} }
api_models::payments::PayLaterData::PayBright { .. } => { api_models::payments::PayLaterData::PayBrightRedirect { .. } => {
Ok(AdyenPaymentMethod::PayBright(Box::new(PayBrightData { Ok(AdyenPaymentMethod::PayBright(Box::new(PayBrightData {
payment_type: PaymentType::PayBright, payment_type: PaymentType::PayBright,
}))) })))
} }
api_models::payments::PayLaterData::Walley { .. } => { api_models::payments::PayLaterData::WalleyRedirect { .. } => {
Ok(AdyenPaymentMethod::Walley(Box::new(WalleyData { Ok(AdyenPaymentMethod::Walley(Box::new(WalleyData {
payment_type: PaymentType::Walley, payment_type: PaymentType::Walley,
}))) })))

View File

@ -1042,7 +1042,7 @@ fn create_stripe_payment_method(
StripePaymentMethodType::Wechatpay, StripePaymentMethodType::Wechatpay,
StripeBillingAddress::default(), StripeBillingAddress::default(),
)), )),
payments::WalletData::AliPay(_) => Ok(( payments::WalletData::AliPayRedirect(_) => Ok((
StripePaymentMethodData::Wallet(StripeWallet::AlipayPayment(AlipayPayment { StripePaymentMethodData::Wallet(StripeWallet::AlipayPayment(AlipayPayment {
payment_method_types: StripePaymentMethodType::Alipay, payment_method_types: StripePaymentMethodType::Alipay,
payment_method_data_type: StripePaymentMethodType::Alipay, payment_method_data_type: StripePaymentMethodType::Alipay,
@ -2513,7 +2513,7 @@ impl
}); });
Ok(Self::Wallet(wallet_info)) Ok(Self::Wallet(wallet_info))
} }
payments::WalletData::AliPay(_) => { payments::WalletData::AliPayRedirect(_) => {
let wallet_info = StripeWallet::AlipayPayment(AlipayPayment { let wallet_info = StripeWallet::AlipayPayment(AlipayPayment {
payment_method_types: StripePaymentMethodType::Alipay, payment_method_types: StripePaymentMethodType::Alipay,
payment_method_data_type: StripePaymentMethodType::Alipay, payment_method_data_type: StripePaymentMethodType::Alipay,