From 5dc946cec0c739b4431bc26232cc219f471ff43c Mon Sep 17 00:00:00 2001
From: Bulat Kurbanov <kurbanovbul@gmail.com>
Date: Tue, 6 Jun 2023 15:23:09 +0200
Subject: [PATCH] Fix

---
 src/bots/approved_bot/modules/book.rs                | 12 ++++++------
 src/bots/approved_bot/modules/search.rs              |  8 ++++----
 src/bots/approved_bot/modules/update_history.rs      |  8 ++++----
 src/bots/approved_bot/services/book_library/types.rs |  4 +++-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/bots/approved_bot/modules/book.rs b/src/bots/approved_bot/modules/book.rs
index 593118a..50cd394 100644
--- a/src/bots/approved_bot/modules/book.rs
+++ b/src/bots/approved_bot/modules/book.rs
@@ -160,12 +160,12 @@ where
         }
     };
 
-    if items_page.total_pages == 0 {
+    if items_page.pages == 0 {
         bot.send_message(chat_id, "Книги не найдены!").send().await?;
         return Ok(());
     };
 
-    let total_pages = items_page.total_pages;
+    let total_pages = items_page.pages;
     let footer = format!("\n\nСтраница 1/{total_pages}");
 
     let formated_items = items_page.format_items(4096 - footer.len());
@@ -238,13 +238,13 @@ where
         }
     };
 
-    if items_page.total_pages == 0 {
+    if items_page.pages == 0 {
         bot.send_message(chat_id, "Книги не найдены!").send().await?;
         return Ok(());
     };
 
-    if page > items_page.total_pages {
-        items_page = match books_getter(id, items_page.total_pages, allowed_langs.clone()).await {
+    if page > items_page.pages {
+        items_page = match books_getter(id, items_page.pages, allowed_langs.clone()).await {
             Ok(v) => v,
             Err(err) => {
                 bot
@@ -257,7 +257,7 @@ where
         };
     }
 
-    let total_pages = items_page.total_pages;
+    let total_pages = items_page.pages;
     let footer = format!("\n\nСтраница {page}/{total_pages}");
 
     let formated_items = items_page.format_items(4096 - footer.len());
diff --git a/src/bots/approved_bot/modules/search.rs b/src/bots/approved_bot/modules/search.rs
index 379a77d..139db11 100644
--- a/src/bots/approved_bot/modules/search.rs
+++ b/src/bots/approved_bot/modules/search.rs
@@ -156,7 +156,7 @@ where
         }
     };
 
-    if items_page.total_pages == 0 {
+    if items_page.pages == 0 {
         let message_text = match search_data {
             SearchCallbackData::Book { .. } => "Книги не найдены!",
             SearchCallbackData::Authors { .. } => "Авторы не найдены!",
@@ -168,10 +168,10 @@ where
         return Ok(());
     };
 
-    if page > items_page.total_pages {
+    if page > items_page.pages {
         items_page = match items_getter(
             query.clone(),
-            items_page.total_pages,
+            items_page.pages,
             allowed_langs.clone(),
         )
         .await
@@ -188,7 +188,7 @@ where
         };
     }
 
-    let total_pages = items_page.total_pages;
+    let total_pages = items_page.pages;
     let footer = format!("\n\nСтраница {page}/{total_pages}");
 
     let formated_items = items_page.format_items(4096 - footer.len());
diff --git a/src/bots/approved_bot/modules/update_history.rs b/src/bots/approved_bot/modules/update_history.rs
index 0a8f1e7..233b9af 100644
--- a/src/bots/approved_bot/modules/update_history.rs
+++ b/src/bots/approved_bot/modules/update_history.rs
@@ -157,7 +157,7 @@ async fn update_log_pagination_handler(
     )
     .await?;
 
-    if items_page.total_pages == 0 {
+    if items_page.pages == 0 {
         bot
             .send_message(message.chat.id, "Нет новых книг за этот период.")
             .send()
@@ -165,16 +165,16 @@ async fn update_log_pagination_handler(
         return Ok(());
     }
 
-    if update_callback_data.page > items_page.total_pages {
+    if update_callback_data.page > items_page.pages {
         items_page = get_uploaded_books(
-            items_page.total_pages,
+            items_page.pages,
             update_callback_data.from.format("%Y-%m-%d").to_string(),
             update_callback_data.to.format("%Y-%m-%d").to_string(),
         ).await?;
     }
 
     let page = update_callback_data.page;
-    let total_pages = items_page.total_pages;
+    let total_pages = items_page.pages;
     let footer = format!("\n\nСтраница {page}/{total_pages}");
 
     let formated_items = items_page.format_items(4096 - footer.len());
diff --git a/src/bots/approved_bot/services/book_library/types.rs b/src/bots/approved_bot/services/book_library/types.rs
index a0ae97d..248b68e 100644
--- a/src/bots/approved_bot/services/book_library/types.rs
+++ b/src/bots/approved_bot/services/book_library/types.rs
@@ -75,9 +75,11 @@ pub struct Genre {
 pub struct Page<T> {
     pub items: Vec<T>,
     pub total: u32,
+
     pub page: u32,
+
     pub size: u32,
-    pub total_pages: u32,
+    pub pages: u32,
 }
 
 impl<T> Page<T>