resolved clippy errors

Author: Akshay S

crates/diesel_models/src/payment_method.rs

@@ -173,13 +173,13 @@ impl PaymentMethodUpdateInternal {
         PaymentMethod {
             metadata: metadata.map_or(source.metadata, |v| Some(v.into())),
             payment_method_data: payment_method_data
-                .map_or(source.payment_method_data, |v| Some(v)),
+                .map_or(source.payment_method_data,Some),
             last_used_at: last_used_at.unwrap_or(source.last_used_at),
             network_transaction_id: network_transaction_id
-                .map_or(source.network_transaction_id, |v| Some(v)),
+                .map_or(source.network_transaction_id, Some),
             status: status.unwrap_or(source.status),
             connector_mandate_details: connector_mandate_details
-                .map_or(source.connector_mandate_details, |v| Some(v)),
+                .map_or(source.connector_mandate_details, Some),
             ..source
         }
     }
@@ -262,21 +262,21 @@ impl From<&PaymentMethodNew> for PaymentMethod {
             issuer_name: payment_method_new.issuer_name.clone(),
             issuer_country: payment_method_new.issuer_country.clone(),
             payer_country: payment_method_new.payer_country.clone(),
-            is_stored: payment_method_new.is_stored.clone(),
+            is_stored: payment_method_new.is_stored,
             swift_code: payment_method_new.swift_code.clone(),
             direct_debit_token: payment_method_new.direct_debit_token.clone(),
-            created_at: payment_method_new.created_at.clone(),
-            last_modified: payment_method_new.last_modified.clone(),
-            payment_method: payment_method_new.payment_method.clone(),
-            payment_method_type: payment_method_new.payment_method_type.clone(),
+            created_at: payment_method_new.created_at,
+            last_modified: payment_method_new.last_modified,
+            payment_method: payment_method_new.payment_method,
+            payment_method_type: payment_method_new.payment_method_type,
             payment_method_issuer: payment_method_new.payment_method_issuer.clone(),
             payment_method_issuer_code: payment_method_new.payment_method_issuer_code.clone(),
             metadata: payment_method_new.metadata.clone(),
             payment_method_data: payment_method_new.payment_method_data.clone(),
-            last_used_at: payment_method_new.last_used_at.clone(),
+            last_used_at: payment_method_new.last_used_at,
             connector_mandate_details: payment_method_new.connector_mandate_details.clone(),
             customer_acceptance: payment_method_new.customer_acceptance.clone(),
-            status: payment_method_new.status.clone(),
+            status: payment_method_new.status,
             network_transaction_id: payment_method_new.network_transaction_id.clone(),
         }
     }

crates/diesel_models/src/query/payment_method.rs

@@ -161,7 +161,7 @@ impl PaymentMethod {
         >(
             conn,
             dsl::payment_method_id.eq(self.payment_method_id.to_owned()),
-            payment_method::PaymentMethodUpdateInternal::from(payment_method),
+            payment_method,
         )
         .await
         {

crates/router/src/core/payment_methods/cards.rs

@@ -89,7 +89,7 @@ pub async fn create_payment_method(
     key_store: &domain::MerchantKeyStore,
     connector_mandate_details: Option<serde_json::Value>,
     network_transaction_id: Option<String>,
-    storage_scheme: enums::MerchantStorageScheme,
+    storage_scheme: MerchantStorageScheme,
 ) -> errors::CustomResult<storage::PaymentMethod, errors::ApiErrorResponse> {
     let customer = db
         .find_customer_by_customer_id_merchant_id(customer_id, merchant_id, key_store)

crates/router/src/core/payments/helpers.rs

@@ -1687,7 +1687,7 @@ pub async fn retrieve_card_with_permanent_token(
     payment_method_id: &str,
     payment_intent: &PaymentIntent,
     card_token_data: Option<&CardToken>,
-    merchant_key_store: &domain::MerchantKeyStore,
+    _merchant_key_store: &domain::MerchantKeyStore,
     storage_scheme: enums::MerchantStorageScheme,
 ) -> RouterResult<api::PaymentMethodData> {
     let customer_id = payment_intent

crates/router/src/db/payment_method.rs

@@ -1,6 +1,6 @@
 use common_utils::fallback_reverse_lookup_not_found;
 use diesel_models::{kv, payment_method::PaymentMethodUpdateInternal};
-use error_stack::{report, IntoReport, ResultExt};
+use error_stack::{report, ResultExt};
 use redis_interface::HsetnxReply;
 use router_env::{instrument, tracing};
 use storage_impl::redis::kv_store::{kv_wrapper, KvOperation, PartitionKey};
@@ -283,13 +283,12 @@ impl PaymentMethodInterface for Store {
                 let key_str = key.to_string();
                 let field = format!("payment_method_id_{}", payment_method.payment_method_id);
 
-                let p_update: diesel_models::PaymentMethodUpdateInternal =
+                let p_update: PaymentMethodUpdateInternal =
                     payment_method_update.into();
                 let updated_payment_method =
                     p_update.clone().apply_changeset(payment_method.clone());
 
                 let redis_value = serde_json::to_string(&updated_payment_method)
-                    .into_report()
                     .change_context(errors::StorageError::SerializationFailed)?;
 
                 let redis_entry = kv::TypedSql {
@@ -382,6 +381,7 @@ impl PaymentMethodInterface for Store {
     async fn find_payment_method(
         &self,
         payment_method_id: &str,
+        _storage_scheme: MerchantStorageScheme
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let conn = connection::pg_connection_read(self).await?;
         storage::PaymentMethod::find_by_payment_method_id(&conn, payment_method_id)
@@ -393,6 +393,7 @@ impl PaymentMethodInterface for Store {
     async fn find_payment_method_by_locker_id(
         &self,
         locker_id: &str,
+        _storage_scheme: MerchantStorageScheme,
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let conn = connection::pg_connection_read(self).await?;
         storage::PaymentMethod::find_by_locker_id(&conn, locker_id)
@@ -422,6 +423,7 @@ impl PaymentMethodInterface for Store {
     async fn insert_payment_method(
         &self,
         payment_method_new: storage::PaymentMethodNew,
+        _storage_scheme: MerchantStorageScheme
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let conn = connection::pg_connection_write(self).await?;
         payment_method_new
@@ -435,6 +437,7 @@ impl PaymentMethodInterface for Store {
         &self,
         payment_method: storage::PaymentMethod,
         payment_method_update: storage::PaymentMethodUpdate,
+        _storage_scheme: MerchantStorageScheme
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let conn = connection::pg_connection_write(self).await?;
         payment_method
@@ -502,7 +505,7 @@ impl PaymentMethodInterface for MockDb {
     async fn find_payment_method(
         &self,
         payment_method_id: &str,
-        storage_scheme: MerchantStorageScheme,
+        _storage_scheme: MerchantStorageScheme,
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let payment_methods = self.payment_methods.lock().await;
         let payment_method = payment_methods
@@ -522,7 +525,7 @@ impl PaymentMethodInterface for MockDb {
     async fn find_payment_method_by_locker_id(
         &self,
         locker_id: &str,
-        storage_scheme: MerchantStorageScheme,
+        _storage_scheme: MerchantStorageScheme,
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let payment_methods = self.payment_methods.lock().await;
         let payment_method = payment_methods
@@ -560,7 +563,7 @@ impl PaymentMethodInterface for MockDb {
     async fn insert_payment_method(
         &self,
         payment_method_new: storage::PaymentMethodNew,
-        storage_scheme: MerchantStorageScheme,
+        _storage_scheme: MerchantStorageScheme,
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let mut payment_methods = self.payment_methods.lock().await;
 
@@ -674,7 +677,7 @@ impl PaymentMethodInterface for MockDb {
         &self,
         payment_method: storage::PaymentMethod,
         payment_method_update: storage::PaymentMethodUpdate,
-        storage_scheme: MerchantStorageScheme,
+        _storage_scheme: MerchantStorageScheme,
     ) -> CustomResult<storage::PaymentMethod, errors::StorageError> {
         let pm_update_res = self
             .payment_methods