Skip to content

Commit

Permalink
resolved clippy errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Akshay S authored and Akshay S committed May 15, 2024
1 parent beefa58 commit c3752fa
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 49 deletions.
2 changes: 1 addition & 1 deletion crates/diesel_models/src/schema.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ diesel::table! {
address_id -> Nullable<Varchar>,
#[max_length = 64]
default_payment_method_id -> Nullable<Varchar>,
#[max_length = 255]
#[max_length = 64]
updated_by -> Nullable<Varchar>,
}
}
Expand Down
6 changes: 3 additions & 3 deletions crates/router/src/db/address.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ 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 +401,7 @@ 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.clone(), &field, Some((&address).updated_by.as_str()))).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Address>(self,storage_scheme, Op::Update(key.clone(), &field, Some(address.updated_by.as_str()))).await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
address
Expand Down Expand Up @@ -468,7 +468,7 @@ 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
8 changes: 4 additions & 4 deletions crates/router/src/db/customers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ 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 +189,7 @@ 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.clone(), &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.clone(), &field, customer.updated_by.as_deref())).await;
let updated_object = match storage_scheme {
MerchantStorageScheme::PostgresOnly => database_call().await,
MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -250,7 +250,7 @@ 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 @@ -328,7 +328,7 @@ 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;
new_customer.update_storage_scheme(storage_scheme);
let create_customer = match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
Expand Down
8 changes: 4 additions & 4 deletions crates/router/src/db/mandate.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ 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 +132,7 @@ 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 +192,7 @@ 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.clone(), &field,(&mandate).updated_by.as_ref().map(|x| x.as_str()))).await;
let storage_scheme = decide_storage_scheme::<_,diesel_models::Mandate>(self,storage_scheme, Op::Update(key.clone(), &field,mandate.updated_by.as_deref())).await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
storage_types::Mandate::update_by_merchant_id_mandate_id(
Expand Down Expand Up @@ -275,7 +275,7 @@ 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;
mandate.update_storage_scheme(storage_scheme);
match storage_scheme {
MerchantStorageScheme::PostgresOnly => mandate
Expand Down
8 changes: 4 additions & 4 deletions crates/router/src/db/payment_method.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ 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 +141,7 @@ 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 +197,7 @@ mod storage {
mut 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;
payment_method_new.update_storage_scheme(storage_scheme);
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
Expand Down Expand Up @@ -287,7 +287,7 @@ 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.clone(), &field, (&payment_method).updated_by.as_ref().map(|x| x.as_str()))).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::PaymentMethod>(self,storage_scheme, Op::Update(key.clone(), &field, payment_method.updated_by.as_deref())).await;
match storage_scheme {
MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down
14 changes: 7 additions & 7 deletions crates/router/src/db/refund.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Find).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => database_call().await,
enums::MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -342,7 +342,7 @@ mod storage {
new: storage_types::RefundNew,
storage_scheme: enums::MerchantStorageScheme,
) -> CustomResult<storage_types::Refund, errors::StorageError> {
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Insert).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down Expand Up @@ -487,7 +487,7 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Find).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => database_call().await,
enums::MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -536,7 +536,7 @@ mod storage {
payment_id: &payment_id,
};
let field = format!("pa_{}_ref_{}", &this.attempt_id, &this.refund_id);
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Update(key.clone(), &field,Some(&this.updated_by))).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Update(key.clone(), &field,Some(&this.updated_by))).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down Expand Up @@ -592,7 +592,7 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Find).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => database_call().await,
enums::MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -642,7 +642,7 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Find).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => database_call().await,
enums::MerchantStorageScheme::RedisKv => {
Expand Down Expand Up @@ -691,7 +691,7 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,storage_types::Refund>(self,storage_scheme, Op::Find).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => database_call().await,
enums::MerchantStorageScheme::RedisKv => {
Expand Down
4 changes: 2 additions & 2 deletions crates/router/src/db/reverse_lookup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mod storage {
new: ReverseLookupNew,
storage_scheme: enums::MerchantStorageScheme,
) -> CustomResult<ReverseLookup, errors::StorageError> {
let storage_scheme = decide_storage_scheme::<_,ReverseLookup>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_,ReverseLookup>(self,storage_scheme, Op::Insert).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => {
let conn = connection::pg_connection_write(self).await?;
Expand Down Expand Up @@ -151,7 +151,7 @@ mod storage {
.await
.map_err(|error| report!(errors::StorageError::from(error)))
};
let storage_scheme = decide_storage_scheme::<_,ReverseLookup>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,ReverseLookup>(self,storage_scheme, Op::Find).await;
match storage_scheme {
enums::MerchantStorageScheme::PostgresOnly => database_call().await,
enums::MerchantStorageScheme::RedisKv => {
Expand Down
4 changes: 2 additions & 2 deletions crates/storage_impl/src/lookup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl<T: DatabaseStore> ReverseLookupInterface for KVRouterStore<T> {
new: DieselReverseLookupNew,
storage_scheme: storage_enums::MerchantStorageScheme,
) -> CustomResult<DieselReverseLookup, errors::StorageError> {
let storage_scheme = decide_storage_scheme::<_,DieselReverseLookup>(&self,storage_scheme, Op::Insert).await;
let storage_scheme = decide_storage_scheme::<_,DieselReverseLookup>(self,storage_scheme, Op::Insert).await;
match storage_scheme {
storage_enums::MerchantStorageScheme::PostgresOnly => {
self.router_store
Expand Down Expand Up @@ -125,7 +125,7 @@ impl<T: DatabaseStore> ReverseLookupInterface for KVRouterStore<T> {
.get_lookup_by_lookup_id(id, storage_scheme)
.await
};
let storage_scheme = decide_storage_scheme::<_,DieselReverseLookup>(&self,storage_scheme, Op::Find).await;
let storage_scheme = decide_storage_scheme::<_,DieselReverseLookup>(self,storage_scheme, Op::Find).await;
match storage_scheme {
storage_enums::MerchantStorageScheme::PostgresOnly => database_call().await,
storage_enums::MerchantStorageScheme::RedisKv => {
Expand Down

0 comments on commit c3752fa

Please sign in to comment.