fix(router): fix compilation errors in configs and reverse lookups modules

Author: SanchithHegde

crates/router/src/db/configs.rs

@@ -1,6 +1,6 @@
 use common_utils::ext_traits::AsyncExt;
 use diesel_models::configs::ConfigUpdateInternal;
-use error_stack::ResultExt;
+use error_stack::{report, ResultExt};
 use router_env::{instrument, tracing};
 use storage_impl::redis::{
     cache::{CacheKind, CONFIG_CACHE},
@@ -65,7 +65,10 @@ impl ConfigInterface for Store {
         config: storage::ConfigNew,
     ) -> CustomResult<storage::Config, errors::StorageError> {
         let conn = connection::pg_connection_write(self).await?;
-        config.insert(&conn).await.map_err(Into::into)
+        config
+            .insert(&conn)
+            .await
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 
     #[instrument(skip_all)]
@@ -77,7 +80,7 @@ impl ConfigInterface for Store {
         let conn = connection::pg_connection_write(self).await?;
         storage::Config::update_by_key(&conn, key, config_update)
             .await
-            .map_err(Into::into)
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 
     //update in DB and remove in redis and cache
@@ -101,7 +104,7 @@ impl ConfigInterface for Store {
         let conn = connection::pg_connection_write(self).await?;
         storage::Config::find_by_key(&conn, key)
             .await
-            .map_err(Into::into)
+            .map_err(|error| report!(errors::StorageError::from(error)))
     }
 
     //check in cache, then redis then finally DB, and on the way back populate redis and cache
@@ -114,7 +117,7 @@ impl ConfigInterface for Store {
             let conn = connection::pg_connection_write(self).await?;
             storage::Config::find_by_key(&conn, key)
                 .await
-                .map_err(Into::into)
+                .map_err(|error| report!(errors::StorageError::from(error)))
         };
         cache::get_or_populate_in_memory(self, key, find_config_by_key_from_db, &CONFIG_CACHE).await
     }
@@ -130,7 +133,7 @@ impl ConfigInterface for Store {
             let conn = connection::pg_connection_write(self).await?;
             match storage::Config::find_by_key(&conn, key)
                 .await
-                .map_err(Into::<errors::StorageError>::into)
+                .map_err(|error| report!(errors::StorageError::from(error)))
             {
                 Ok(a) => Ok(a),
                 Err(err) => {
@@ -144,7 +147,7 @@ impl ConfigInterface for Store {
                                 }
                                 .insert(&conn)
                                 .await
-                                .map_err(Into::into)
+                                .map_err(|error| report!(errors::StorageError::from(error)))
                             })
                             .await
                     } else {
@@ -165,7 +168,7 @@ impl ConfigInterface for Store {
         let conn = connection::pg_connection_write(self).await?;
         let deleted = storage::Config::delete_by_key(&conn, key)
             .await
-            .map_err(Into::into)?;
+            .map_err(|error| report!(errors::StorageError::from(error)))?;
 
         self.get_redis_conn()
             .map_err(Into::<errors::StorageError>::into)?
@@ -187,10 +190,7 @@ impl ConfigInterface for MockDb {
         let mut configs = self.configs.lock().await;
 
         let config_new = storage::Config {
-            id: configs
-                .len()
-                .try_into()
-                .change_context(errors::StorageError::MockDbError)?,
+            id: i32::try_from(configs.len()).change_context(errors::StorageError::MockDbError)?,
             key: config.key,
             config: config.config,
         };

crates/router/src/db/reverse_lookup.rs

@@ -23,7 +23,7 @@ pub trait ReverseLookupInterface {
 
 #[cfg(not(feature = "kv_store"))]
 mod storage {
-    use error_stack::ResultExt;
+    use error_stack::report;
     use router_env::{instrument, tracing};
 
     use super::{ReverseLookupInterface, Store};
@@ -45,7 +45,9 @@ mod storage {
             _storage_scheme: enums::MerchantStorageScheme,
         ) -> CustomResult<ReverseLookup, errors::StorageError> {
             let conn = connection::pg_connection_write(self).await?;
-            new.insert(&conn).await.map_err(Into::into)
+            new.insert(&conn)
+                .await
+                .map_err(|error| report!(errors::StorageError::from(error)))
         }
 
         #[instrument(skip_all)]
@@ -57,14 +59,14 @@ mod storage {
             let conn = connection::pg_connection_read(self).await?;
             ReverseLookup::find_by_lookup_id(id, &conn)
                 .await
-                .map_err(Into::into)
+                .map_err(|error| report!(errors::StorageError::from(error)))
         }
     }
 }
 
 #[cfg(feature = "kv_store")]
 mod storage {
-    use error_stack::ResultExt;
+    use error_stack::{report, ResultExt};
     use redis_interface::SetnxReply;
     use router_env::{instrument, tracing};
     use storage_impl::redis::kv_store::{kv_wrapper, KvOperation};
@@ -92,7 +94,9 @@ mod storage {
             match storage_scheme {
                 enums::MerchantStorageScheme::PostgresOnly => {
                     let conn = connection::pg_connection_write(self).await?;
-                    new.insert(&conn).await.map_err(Into::into)
+                    new.insert(&conn)
+                        .await
+                        .map_err(|error| report!(errors::StorageError::from(error)))
                 }
                 enums::MerchantStorageScheme::RedisKv => {
                     let created_rev_lookup = ReverseLookup {
@@ -121,7 +125,8 @@ mod storage {
                         Ok(SetnxReply::KeyNotSet) => Err(errors::StorageError::DuplicateValue {
                             entity: "reverse_lookup",
                             key: Some(created_rev_lookup.lookup_id.clone()),
-                        }),
+                        }
+                        .into()),
                         Err(er) => Err(er).change_context(errors::StorageError::KVError),
                     }
                 }
@@ -138,7 +143,7 @@ mod storage {
                 let conn = connection::pg_connection_read(self).await?;
                 ReverseLookup::find_by_lookup_id(id, &conn)
                     .await
-                    .map_err(Into::into)
+                    .map_err(|error| report!(errors::StorageError::from(error)))
             };
 
             match storage_scheme {