From e4dbfda46937c51c9c4fcb4b9a0dd5a6f6907c5d Mon Sep 17 00:00:00 2001
From: Bulat Kurbanov <kurbanovbul@gmail.com>
Date: Sun, 5 May 2024 20:59:21 +0200
Subject: [PATCH] Update archive downloading

---
 src/bots/approved_bot/modules/download/mod.rs | 21 ++++++++++++++-----
 .../approved_bot/services/batch_downloader.rs |  2 --
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/bots/approved_bot/modules/download/mod.rs b/src/bots/approved_bot/modules/download/mod.rs
index f221e53..5feb7aa 100644
--- a/src/bots/approved_bot/modules/download/mod.rs
+++ b/src/bots/approved_bot/modules/download/mod.rs
@@ -22,8 +22,7 @@ use crate::{
         approved_bot::{
             modules::download::callback_data::DownloadArchiveQueryData,
             services::{
-                batch_downloader::{create_task, get_task, Task, TaskStatus},
-                batch_downloader::{CreateTaskData, TaskObjectType},
+                batch_downloader::{create_task, get_task, CreateTaskData, Task, TaskObjectType, TaskStatus},
                 book_cache::{
                     download_file, download_file_by_link, get_cached_message, get_download_link,
                     types::{CachedMessage, DownloadFile},
@@ -39,7 +38,7 @@ use crate::{
         },
         BotHandlerInternal,
     },
-    bots_manager::BotCache,
+    bots_manager::BotCache, config,
 };
 
 use self::{
@@ -339,13 +338,19 @@ async fn send_archive_link(
     message: Message,
     task: Task,
 ) -> BotHandlerInternal {
+    let link = format!(
+        "{}/api/download/{}",
+        config::CONFIG.batch_downloader_url.clone(),
+        task.id
+    );
+
     bot.edit_message_text(
         message.chat.id,
         message.id,
         format!(
             "Файл не может быть загружен в чат! \n \
                     Вы можете скачать его <a href=\"{}\">по ссылке</a> (работает 3 часа)",
-            task.result_link.unwrap()
+            link
         ),
     )
     .parse_mode(ParseMode::Html)
@@ -407,9 +412,15 @@ async fn wait_archive(
         return Ok(());
     }
 
+    let link = format!(
+        "{}/api/download/{}",
+        config::CONFIG.batch_downloader_url.clone(),
+        task.id
+    );
+
     let downloaded_data = match download_file_by_link(
         task.clone().result_filename.unwrap(),
-        task.result_internal_link.clone().unwrap(),
+        link,
     )
     .await
     {
diff --git a/src/bots/approved_bot/services/batch_downloader.rs b/src/bots/approved_bot/services/batch_downloader.rs
index 84a4a32..31cb2dd 100644
--- a/src/bots/approved_bot/services/batch_downloader.rs
+++ b/src/bots/approved_bot/services/batch_downloader.rs
@@ -37,8 +37,6 @@ pub struct Task {
     pub status_description: String,
     pub error_message: Option<String>,
     pub result_filename: Option<String>,
-    pub result_link: Option<String>,
-    pub result_internal_link: Option<String>,
     pub content_size: Option<u64>,
 }