Merge pull request #13 from AIBlockOfficial/bugfix_get_data_id

Fix for get_data with ID

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "valence"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/api/handlers.rs

@@ -48,15 +48,15 @@ pub async fn get_data_handler<
 
     // Check cache first
     let mut cache_lock_result = cache.lock().await;
-    let cache_result: Result<Option<HashMap<String, String>>, _> = cache_lock_result
-        .get_data::<String>(address, value_id.as_deref())
-        .await;
+    let cache_result: Result<Option<HashMap<String, String>>, _> =
+        cache_lock_result.get_data::<String>(address, None).await;
 
     match cache_result {
         Ok(value) => {
             match value {
                 Some(value) => {
-                    info!("Data retrieved from cache");
+                    info!("Data retrieved from cache: {:?}", value);
+
                     if let Some(id) = value_id {
                         if !value.contains_key(&id) {
                             return r.into_err_internal(ApiErrorType::ValueIdNotFound);

src/main.rs

@@ -46,8 +46,8 @@ async fn main() {
 
     info!("Cuckoo filter initialized successfully");
 
-    let routes = get_data(db_conn.clone(), cache_conn.clone(), cuckoo_filter.clone())
-        .or(get_data_with_id(
+    let routes = get_data_with_id(db_conn.clone(), cache_conn.clone(), cuckoo_filter.clone())
+        .or(get_data(
             db_conn.clone(),
             cache_conn.clone(),
             cuckoo_filter.clone(),

src/tests/interfaces.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, hash::Hash};
+use std::collections::HashMap;
 
 use crate::db::handler::{CacheHandler, KvStoreConnection};
 use async_trait::async_trait;