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

enhance(core): replace string with enum for country (#735)

Browse Source
This commit is contained in:
Narayan Bhat
2023-03-30 21:45:38 +05:30
committed by GitHub
parent 442bed0f6b
commit e18bfb2ae1
45 changed files with 734 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/api_models/src/admin.rs
View File

@ -381,8 +381,8 @@ pub enum AcceptedCurrencies {
rename_all = "snake_case"
)]
pub enum AcceptedCountries {
EnableOnly(Vec<String>),
DisableOnly(Vec<String>),
EnableOnly(Vec<api_enums::CountryCode>),
DisableOnly(Vec<api_enums::CountryCode>),
AllAccepted,
}
@ -428,7 +428,7 @@ pub struct MerchantConnectorDetailsWrap {
},
"metadata": {
"user_defined_field_1": "sample_1",
"user_defined_field_2": "sample_2",
"user_defined_field_2": "sample_2",
},
}"#)]
pub encoded_data: Option<Secret<String>>,

1
crates/api_models/src/enums.rs
View File

@ -1,3 +1,4 @@
pub use common_enums::*;
use utoipa::ToSchema;
#[derive(

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

@ -283,8 +283,8 @@ pub struct PaymentMethodListRequest {
pub client_secret: Option<String>,
/// The two-letter ISO currency code
#[schema(example = json!(["US", "UK", "IN"]))]
pub accepted_countries: Option<Vec<String>>,
#[schema(value_type = Option<Vec<Country>>, example = json!(["US", "UK", "IN"]))]
pub accepted_countries: Option<Vec<api_enums::CountryCode>>,
/// The three-letter ISO currency code
#[schema(value_type = Option<Vec<Currency>>,example = json!(["USD", "EUR"]))]

17
crates/api_models/src/payments.rs
View File

@ -413,7 +413,8 @@ pub enum PayLaterData {
#[schema(value_type = String)]
billing_email: Secret<String, pii::Email>,
// The billing country code
billing_country: String,
#[schema(value_type = Country)]
billing_country: api_enums::CountryCode,
},
/// For Klarna Sdk as PayLater Option
KlarnaSdk {
@ -506,8 +507,8 @@ pub enum BankRedirectData {
},
Sofort {
/// The country for bank payment
#[schema(example = "US")]
country: String,
#[schema(value_type = Country, example = "US")]
country: api_enums::CountryCode,
/// The preferred language
#[schema(example = "en")]
@ -675,8 +676,8 @@ pub struct AddressDetails {
pub city: Option<String>,
/// The two-letter ISO country code for the address
#[schema(max_length = 2, min_length = 2, example = "US")]
pub country: Option<String>,
#[schema(value_type = Option<Country>, max_length = 2, min_length = 2, example = "US")]
pub country: Option<api_enums::CountryCode>,
/// The first line of the address
#[schema(value_type = Option<String>, max_length = 200, example = "123, King Street")]
@ -1242,7 +1243,8 @@ pub struct GpayAllowedPaymentMethods {
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, ToSchema)]
pub struct GpayTransactionInfo {
/// The country code
pub country_code: String,
#[schema(value_type = Country)]
pub country_code: api_enums::CountryCode,
/// The currency code
pub currency_code: String,
/// The total price status (ex: 'FINAL')
@ -1348,7 +1350,8 @@ pub struct ApplePaySessionResponse {
#[derive(Debug, Clone, serde::Serialize, ToSchema, serde::Deserialize)]
pub struct ApplePayPaymentRequest {
/// The code for country
pub country_code: String,
#[schema(value_type = Country)]
pub country_code: api_enums::CountryCode,
/// The code for currency
pub currency_code: String,
/// Represents the total for the payment.