From 4681de3d4968b7a98ab5c8d4e6f7429b25c4deda Mon Sep 17 00:00:00 2001
From: Bulat Kurbanov <kurbanovbul@gmail.com>
Date: Wed, 9 Aug 2023 04:22:30 +0200
Subject: [PATCH] Fix

---
 src/services/mod.rs |  2 --
 src/views.rs        | 14 +++++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/services/mod.rs b/src/services/mod.rs
index f100fd2..be2f7e3 100644
--- a/src/services/mod.rs
+++ b/src/services/mod.rs
@@ -98,8 +98,6 @@ pub async fn download_from_cache(
                 .await
                 .unwrap();
 
-            tokio::spawn(cache_file(cached_data.object_id, cached_data.object_type, db));
-
             log::error!("{:?}", err);
             return None;
         },
diff --git a/src/views.rs b/src/views.rs
index 6e7c048..f1f5051 100644
--- a/src/views.rs
+++ b/src/views.rs
@@ -27,15 +27,23 @@ async fn download_cached_file(
     Path((object_id, object_type)): Path<(i32, String)>,
     Extension(Ext { db }): Extension<Ext>
 ) -> impl IntoResponse {
-    let cached_file = match get_cached_file_or_cache(object_id, object_type, db.clone()).await {
+    let cached_file = match get_cached_file_or_cache(object_id, object_type.clone(), db.clone()).await {
         Some(cached_file) => cached_file,
         None => return StatusCode::NO_CONTENT.into_response(),
     };
 
-    let data = match download_from_cache(cached_file, db).await {
+    let data = match download_from_cache(cached_file, db.clone()).await {
         Some(v) => v,
         None => {
-            return StatusCode::NO_CONTENT.into_response();
+            let cached_file = match get_cached_file_or_cache(object_id, object_type, db.clone()).await {
+                Some(v) => v,
+                None => return StatusCode::NO_CONTENT.into_response(),
+            };
+
+            match download_from_cache(cached_file, db).await {
+                Some(v) => v,
+                None => return StatusCode::NO_CONTENT.into_response(),
+            }
         }
     };