Skip to content

Commit

Permalink
chore: run formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyperswitch-bot
hyperswitch-bot[bot] committed May 8, 2024
1 parent 204db82 commit dc17e4e
Show file tree
Hide file tree
Showing 19 changed files with 273 additions and 110 deletions.
6 changes: 3 additions & 3 deletions crates/diesel_models/src/customers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct CustomerNew {
pub created_at: PrimitiveDateTime,
pub modified_at: PrimitiveDateTime,
pub address_id: Option<String>,
pub updated_by : Option<String>,
pub updated_by: Option<String>,
}

impl From<CustomerNew> for Customer {
Expand All @@ -41,7 +41,7 @@ impl From<CustomerNew> for Customer {
modified_at: customer_new.modified_at,
address_id: customer_new.address_id,
default_payment_method_id: None,
updated_by : customer_new.updated_by
updated_by: customer_new.updated_by,
}
}
}
Expand All @@ -63,7 +63,7 @@ pub struct Customer {
pub modified_at: PrimitiveDateTime,
pub address_id: Option<String>,
pub default_payment_method_id: Option<String>,
pub updated_by : Option<String>,
pub updated_by: Option<String>,
}

#[derive(
Expand Down
5 changes: 4 additions & 1 deletion crates/router/src/configs/defaults.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ impl Default for super::settings::DrainerSettings {
#[cfg(feature = "kv_store")]
impl Default for super::settings::KvConfig {
fn default() -> Self {
Self { ttl: 900 , soft_kill : Some(false)}
Self {
ttl: 900,
soft_kill: Some(false),
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/router/src/core/customers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ pub async fn create_customer(
created_at: common_utils::date_time::now(),
modified_at: common_utils::date_time::now(),
default_payment_method_id: None,
updated_by : None,
updated_by: None,
})
}
.await
Expand Down
2 changes: 1 addition & 1 deletion crates/router/src/core/payments/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ pub async fn create_customer_if_not_exist<'a, F: Clone, R, Ctx>(
connector_customer: None,
address_id: None,
default_payment_method_id: None,
updated_by : None
updated_by: None,
},
)
}
Expand Down
2 changes: 1 addition & 1 deletion crates/router/src/core/payouts/helpers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ pub async fn get_or_create_customer_details(
modified_at: common_utils::date_time::now(),
address_id: None,
default_payment_method_id: None,
updated_by : None,
updated_by: None,
};

Ok(Some(
Expand Down
22 changes: 18 additions & 4 deletions crates/router/src/db/address.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ mod storage {
use error_stack::{report, ResultExt};
use redis_interface::HsetnxReply;
use router_env::{instrument, tracing};
use storage_impl::redis::kv_store::{kv_wrapper, KvOperation, PartitionKey, Op, decide_storage_scheme};
use storage_impl::redis::kv_store::{
decide_storage_scheme, kv_wrapper, KvOperation, Op, PartitionKey,
};

use super::AddressInterface;
use crate::{
Expand Down Expand Up @@ -332,7 +334,9 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::Address>(&self,storage_scheme, Op::Find).await;
let storage_scheme =
decide_storage_scheme::<_, storage_types::Address>(&self, storage_scheme, Op::Find)
.await;
let address = match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -401,7 +405,12 @@ mod storage {
payment_id: &payment_id,
};
let field = format!("add_{}", address.address_id);
let storage_scheme = decide_storage_scheme::<_,storage_types::Address>(&self,storage_scheme, Op::Update(key, &field, Some((&address).updated_by.as_str()))).await;
let storage_scheme = decide_storage_scheme::<_, storage_types::Address>(
&self,
storage_scheme,
Op::Update(key, &field, Some((&address).updated_by.as_str())),
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
address
Expand Down Expand Up @@ -472,7 +481,12 @@ mod storage {
.await
.change_context(errors::StorageError::EncryptionError)?;
let merchant_id = address_new.merchant_id.clone();
let storage_scheme = decide_storage_scheme::<_,storage_types::Address>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_, storage_types::Address>(
&self,
storage_scheme,
Op::Insert,
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down
36 changes: 31 additions & 5 deletions crates/router/src/db/customers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ mod storage {
use futures::future::try_join_all;
use masking::PeekInterface;
use router_env::{instrument, tracing};
use storage_impl::redis::kv_store::{kv_wrapper, KvOperation, PartitionKey, Op, decide_storage_scheme};
use storage_impl::redis::kv_store::{
decide_storage_scheme, kv_wrapper, KvOperation, Op, PartitionKey,
};

use super::CustomerInterface;
use crate::{
Expand Down Expand Up @@ -116,7 +118,12 @@ mod storage {
.await
.map_err(|err| report!(errors::StorageError::from(err)))
};
let storage_scheme = decide_storage_scheme::<_,diesel_models::Customer>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_, diesel_models::Customer>(
&self,
storage_scheme,
Op::Find,
)
.await;
let maybe_customer = match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -189,7 +196,16 @@ mod storage {
customer_id: customer_id.as_str(),
};
let field = format!("cust_{}", customer_id);
let storage_scheme = decide_storage_scheme::<_,diesel_models::Customer>(&self,storage_scheme, Op::Update(key, &field, (&customer).updated_by.as_ref().map(|x| x.as_str()))).await;
let storage_scheme = decide_storage_scheme::<_, diesel_models::Customer>(
&self,
storage_scheme,
Op::Update(
key,
&field,
(&customer).updated_by.as_ref().map(|x| x.as_str()),
),
)
.await;
let updated_object = match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -254,7 +270,12 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,diesel_models::Customer>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_, diesel_models::Customer>(
&self,
storage_scheme,
Op::Find,
)
.await;
let customer = match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -332,7 +353,12 @@ mod storage {
.construct_new()
.await
.change_context(errors::StorageError::EncryptionError)?;
let storage_scheme = decide_storage_scheme::<_,diesel_models::Customer>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_, diesel_models::Customer>(
&self,
storage_scheme,
Op::Insert,
)
.await;
let create_customer = match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down
26 changes: 21 additions & 5 deletions crates/router/src/db/mandate.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ mod storage {
use error_stack::{report, ResultExt};
use redis_interface::HsetnxReply;
use router_env::{instrument, tracing};
use storage_impl::redis::kv_store::{kv_wrapper, KvOperation, PartitionKey, Op, decide_storage_scheme};
use storage_impl::redis::kv_store::{
decide_storage_scheme, kv_wrapper, KvOperation, Op, PartitionKey,
};

use super::MandateInterface;
use crate::{
Expand Down Expand Up @@ -88,7 +90,9 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,diesel_models::Mandate>(&self,storage_scheme, Op::Find).await;
let storage_scheme =
decide_storage_scheme::<_, diesel_models::Mandate>(&self, storage_scheme, Op::Find)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -132,7 +136,9 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,diesel_models::Mandate>(&self,storage_scheme, Op::Find).await;
let storage_scheme =
decide_storage_scheme::<_, diesel_models::Mandate>(&self, storage_scheme, Op::Find)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -192,7 +198,12 @@ mod storage {
mandate_id,
};
let field = format!("mandate_{}", mandate_id);
let storage_scheme = decide_storage_scheme::<_,diesel_models::Mandate>(&self,storage_scheme, Op::Update(key, &field,None)).await;
let storage_scheme = decide_storage_scheme::<_, diesel_models::Mandate>(
&self,
storage_scheme,
Op::Update(key, &field, None),
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
storage_types::Mandate::update_by_merchant_id_mandate_id(
Expand Down Expand Up @@ -279,7 +290,12 @@ mod storage {
storage_scheme: MerchantStorageScheme,
) -> CustomResult<storage_types::Mandate, errors::StorageError> {
let conn = connection::pg_connection_write(self).await?;
let storage_scheme = decide_storage_scheme::<_,diesel_models::Mandate>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_, diesel_models::Mandate>(
&self,
storage_scheme,
Op::Insert,
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => mandate
.insert(&conn)
Expand Down
32 changes: 27 additions & 5 deletions crates/router/src/db/payment_method.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ mod storage {
use error_stack::{report, ResultExt};
use redis_interface::HsetnxReply;
use router_env::{instrument, tracing};
use storage_impl::redis::kv_store::{kv_wrapper, KvOperation, PartitionKey, Op, decide_storage_scheme};
use storage_impl::redis::kv_store::{
decide_storage_scheme, kv_wrapper, KvOperation, Op, PartitionKey,
};

use super::PaymentMethodInterface;
use crate::{
Expand All @@ -97,7 +99,12 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::PaymentMethod>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_, storage_types::PaymentMethod>(
&self,
storage_scheme,
Op::Find,
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -141,7 +148,12 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::PaymentMethod>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_, storage_types::PaymentMethod>(
&self,
storage_scheme,
Op::Find,
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -197,7 +209,12 @@ mod storage {
payment_method_new: storage_types::PaymentMethodNew,
storage_scheme: MerchantStorageScheme,
) -> CustomResult<storage_types::PaymentMethod, errors::StorageError> {
let storage_scheme = decide_storage_scheme::<_,storage_types::PaymentMethod>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_, storage_types::PaymentMethod>(
&self,
storage_scheme,
Op::Insert,
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down Expand Up @@ -286,7 +303,12 @@ mod storage {
customer_id: &customer_id,
};
let field = format!("payment_method_id_{}", payment_method.payment_method_id);
let storage_scheme = decide_storage_scheme::<_,storage_types::PaymentMethod>(&self,storage_scheme, Op::Update(key, &field, None)).await;
let storage_scheme = decide_storage_scheme::<_, storage_types::PaymentMethod>(
&self,
storage_scheme,
Op::Update(key, &field, None),
)
.await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down

0 comments on commit dc17e4e

Please sign in to comment.