Working deserialization for return data

config.toml

@@ -1,13 +1,13 @@
 # This is a sample config TOML for Valence
 debug = false
 extern_port = 3030
-cache_url = "redis://cache"
+cache_url = "redis://0.0.0.0"
 cache_port = "6379"
 cache_password = ""
-db_protocol = "mongodb://"
-db_url = "db"
+db_protocol = "mongodb://0.0.0.0"
+db_url = ""
 db_port = "27017"
-db_user = "root"
+db_user = ""
 db_password = ""
 body_limit = 4096
 cache_ttl = 600 # cache lifetime in seconds

docker-compose.yml

@@ -30,24 +30,24 @@ services:
     #   MONGODB_ROOT_USER: root
     # volumes:
     #   - db:/data/db
-  valence:
-    build: .
-    image: valence
-    networks:
-      - app-tier
-    ports:
-      - 3030:3030
-    expose:
-      - 3030
-    restart: always
-    depends_on:
-      - cache
-      - db
-    # links:
-    #   - cache
-    #   - db
-    volumes:
-      - ${PWD}/logs:/app/logs
+  # valence:
+  #   build: .
+  #   image: valence
+  #   networks:
+  #     - app-tier
+  #   ports:
+  #     - 3030:3030
+  #   expose:
+  #     - 3030
+  #   restart: always
+  #   depends_on:
+  #     - cache
+  #     - db
+  #   # links:
+  #   #   - cache
+  #   #   - db
+  #   volumes:
+  #     - ${PWD}/logs:/app/logs
 volumes:
   cache:
     driver: local

src/api/handlers.rs

@@ -45,14 +45,17 @@ pub async fn get_data_handler<
 
     // Check cache first
     let mut cache_lock_result = cache.lock().await;
-    let cache_result: Result<Option<Vec<Value>>, _> = cache_lock_result.get_data(address).await;
+    let cache_result: Result<Option<Vec<String>>, _> = cache_lock_result.get_data::<String>(address).await;
+
+    info!("Cache result: {:?}", cache_result);
 
     match cache_result {
         Ok(value) => {
             match value {
                 Some(value) => {
                     info!("Data retrieved from cache");
-                    return r.into_ok("Data retrieved successfully", json_serialize_embed(value));
+                    let data = value.iter().map(|v| serde_json::from_str(v).unwrap()).collect::<Vec<Value>>();
+                    return r.into_ok("Data retrieved successfully", json_serialize_embed(data));
                 }
                 None => {
                     // Default to checking from DB if cache is empty

src/api/utils.rs

@@ -19,10 +19,25 @@ pub async fn retrieve_from_db<D: KvStoreConnection + Clone + Send + 'static>(
     let r = CallResponse::new("get_data");
     info!("RETRIEVE_FROM_DB requested with address: {:?}", address);
 
-    let db_result: Result<Option<Vec<Value>>, _> = db.lock().await.get_data(&address).await;
+    let db_result: Result<Option<Vec<String>>, _> = db.lock().await.get_data(&address).await;
 
     match db_result {
-        Ok(data) => r.into_ok("Data retrieved successfully", json_serialize_embed(data)),
+        Ok(data) => {
+            match data {
+                Some(value) => {
+                    info!("Data retrieved from DB");
+                    let data = value
+                        .iter()
+                        .map(|v| serde_json::from_str(v).unwrap())
+                        .collect::<Vec<Value>>();
+                    return r.into_ok("Data retrieved successfully", json_serialize_embed(data));
+                }
+                None => {
+                    info!("Data not found in DB");
+                    return r.into_err_internal(ApiErrorType::Generic("Data not found".to_string()));
+                }
+            }
+        } 
         Err(_) => r.into_err_internal(ApiErrorType::Generic(
             "Full Valence chain retrieval failed".to_string(),
         )),

src/main.rs

@@ -28,10 +28,11 @@ async fn main() {
 
     let config = load_config();
     let cache_addr = format!("{}:{}", config.cache_url, config.cache_port);
-    let db_addr = format!(
-        "{}{}:{}@{}:{}",
-        config.db_protocol, config.db_user, config.db_password, config.db_url, config.db_port
-    );
+    // let db_addr = format!(
+    //     "{}{}:{}@{}:{}",
+    //     config.db_protocol, config.db_user, config.db_password, config.db_url, config.db_port
+    // );
+    let db_addr = format!("{}{}:{}", config.db_protocol, config.db_url, config.db_port);
 
     info!("Connecting to Redis at {}", cache_addr);
     info!("Connecting to MongoDB at {}", db_addr);