rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-11-03 05:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(payment_methods_v2): rename payment_method and payment_method_type fields and use concrete type for payment_method_data (#6555)

Browse Source
This commit is contained in:
Sanchith Hegde
2024-11-19 20:33:30 +05:30
committed by GitHub
parent e730a2ee5a
commit 11e92413b2
31 changed files with 1172 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
crates/hyperswitch_domain_models/src/payment_methods.rs
View File

@ -1,10 +1,9 @@
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
use common_utils::crypto::Encryptable;
use common_utils::{
crypto::OptionalEncryptableValue,
// date_time,
// encryption::Encryption,
errors::{CustomResult, ValidationError},
pii,
type_name,
pii, type_name,
types::keymanager,
};
use diesel_models::enums as storage_enums;
@ -12,6 +11,8 @@ use error_stack::ResultExt;
use masking::{PeekInterface, Secret};
use time::PrimitiveDateTime;
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
use crate::type_encryption::EncryptedJsonType;
use crate::type_encryption::{crypto_operation, AsyncLift, CryptoOperation};
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
@ -77,9 +78,11 @@ pub struct PaymentMethod {
pub merchant_id: common_utils::id_type::MerchantId,
pub created_at: PrimitiveDateTime,
pub last_modified: PrimitiveDateTime,
pub payment_method: Option<storage_enums::PaymentMethod>,
pub payment_method_type: Option<storage_enums::PaymentMethodType>,
pub payment_method_data: OptionalEncryptableValue,
pub payment_method_type: Option<storage_enums::PaymentMethod>,
pub payment_method_subtype: Option<storage_enums::PaymentMethodType>,
pub payment_method_data: Option<
Encryptable<Secret<EncryptedJsonType<api_models::payment_methods::PaymentMethodsData>>>,
>,
pub locker_id: Option<VaultId>,
pub last_used_at: PrimitiveDateTime,
pub connector_mandate_details: Option<diesel_models::PaymentsMandateReference>,
@ -110,6 +113,32 @@ impl PaymentMethod {
pub fn get_id(&self) -> &common_utils::id_type::GlobalPaymentMethodId {
&self.id
}
#[cfg(all(
any(feature = "v1", feature = "v2"),
not(feature = "payment_methods_v2")
))]
pub fn get_payment_method_type(&self) -> Option<storage_enums::PaymentMethod> {
self.payment_method
}
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
pub fn get_payment_method_type(&self) -> Option<storage_enums::PaymentMethod> {
self.payment_method_type
}
#[cfg(all(
any(feature = "v1", feature = "v2"),
not(feature = "payment_methods_v2")
))]
pub fn get_payment_method_subtype(&self) -> Option<storage_enums::PaymentMethodType> {
self.payment_method_type
}
#[cfg(all(feature = "v2", feature = "payment_methods_v2"))]
pub fn get_payment_method_subtype(&self) -> Option<storage_enums::PaymentMethodType> {
self.payment_method_subtype
}
}
#[cfg(all(
@ -311,8 +340,8 @@ impl super::behaviour::Conversion for PaymentMethod {
id: self.id,
created_at: self.created_at,
last_modified: self.last_modified,
payment_method: self.payment_method,
payment_method_type: self.payment_method_type,
payment_method_type_v2: self.payment_method_type,
payment_method_subtype: self.payment_method_subtype,
payment_method_data: self.payment_method_data.map(|val| val.into()),
locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),
last_used_at: self.last_used_at,
@ -351,8 +380,8 @@ impl super::behaviour::Conversion for PaymentMethod {
id: item.id,
created_at: item.created_at,
last_modified: item.last_modified,
payment_method: item.payment_method,
payment_method_type: item.payment_method_type,
payment_method_type: item.payment_method_type_v2,
payment_method_subtype: item.payment_method_subtype,
payment_method_data: item
.payment_method_data
.async_lift(|inner| async {
@ -422,8 +451,8 @@ impl super::behaviour::Conversion for PaymentMethod {
id: self.id,
created_at: self.created_at,
last_modified: self.last_modified,
payment_method: self.payment_method,
payment_method_type: self.payment_method_type,
payment_method_type_v2: self.payment_method_type,
payment_method_subtype: self.payment_method_subtype,
payment_method_data: self.payment_method_data.map(|val| val.into()),
locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),
last_used_at: self.last_used_at,