Merge branch 'main' into develop

data.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 # Конфигурация
 USERNAME = "admin"
-PASSWORD = "7WaVlcj8EWzEbbdab9kqRw"
+PASSWORD = "TzUlDpUCHutFa-oGCd1cBw"
 BASE_URL = "http://localhost:8000"
 
 

library_service/models/db/book.py

@@ -1,6 +1,7 @@
 """Модуль DB-моделей книг"""
 from typing import TYPE_CHECKING, List
 
+from sqlalchemy import Column, String
 from sqlmodel import Field, Relationship
 
 from library_service.models.dto.book import BookBase
@@ -15,7 +16,10 @@ if TYPE_CHECKING:
 class Book(BookBase, table=True):
     """Модель книги в базе данных"""
     id: int | None = Field(default=None, primary_key=True, index=True)
-    status: BookStatus = Field(default=BookStatus.ACTIVE)
+    status: BookStatus = Field(
+        default=BookStatus.ACTIVE,
+        sa_column=Column(String, nullable=False, default="active")
+    )
     authors: List["Author"] = Relationship(
         back_populates="books", link_model=AuthorBookLink
     )

library_service/static/books.js

@@ -5,6 +5,11 @@ $(document).ready(() => {
   let pageSize = 20;
   let totalBooks = 0;
 
+  const urlParams = new URLSearchParams(window.location.search);
+  const genreIdsFromUrl = urlParams.getAll("genre_id");
+  const authorIdsFromUrl = urlParams.getAll("author_id");
+  const searchFromUrl = urlParams.get("q");
+
   Promise.all([
     fetch("/api/authors").then((response) => response.json()),
     fetch("/api/genres").then((response) => response.json()),
@@ -18,15 +23,25 @@ $(document).ready(() => {
           .attr("data-name", author.name)
           .text(author.name)
           .appendTo($dropdown);
+        
+        if (authorIdsFromUrl.includes(String(author.id))) {
+          selectedAuthors.set(author.id, author.name);
+        }
       });
 
       const $list = $("#genres-list");
       genresData.genres.forEach((genre) => {
+        const isChecked = genreIdsFromUrl.includes(String(genre.id));
+        
+        if (isChecked) {
+          selectedGenres.set(genre.id, genre.name);
+        }
+
         $("<li>")
           .addClass("mb-1")
           .html(
             `<label class="custom-checkbox flex items-center">
-              <input type="checkbox" data-id="${genre.id}" data-name="${genre.name}" />
+              <input type="checkbox" data-id="${genre.id}" data-name="${genre.name}" ${isChecked ? 'checked' : ''} />
               <span class="checkmark"></span>
               ${genre.name}
             </label>`,
@@ -57,6 +72,29 @@ $(document).ready(() => {
       params.append("genre_ids", id);
     });
 
+    function updateBrowserUrl() {
+      const params = new URLSearchParams();
+      
+      const searchQuery = $("#book-search-input").val().trim();
+      if (searchQuery.length >= 3) {
+        params.append("q", searchQuery);
+      }
+  
+      selectedAuthors.forEach((name, id) => {
+        params.append("author_id", id);
+      });
+  
+      selectedGenres.forEach((name, id) => {
+        params.append("genre_id", id);
+      });
+  
+      const newUrl = params.toString() 
+        ? `${window.location.pathname}?${params.toString()}`
+        : window.location.pathname;
+      
+      window.history.replaceState({}, "", newUrl);
+    }
+
     params.append("page", currentPage);
     params.append("size", pageSize);
 
@@ -64,6 +102,8 @@ $(document).ready(() => {
 
     showLoadingState();
 
+    updateBrowserUrl();
+
     fetch(url)
       .then((response) => {
         if (!response.ok) {

library_service/templates/base.html

@@ -22,7 +22,6 @@
                         <li><a href="/" class="hover:text-gray-200">Главная</a></li>
                         <li><a href="/books" class="hover:text-gray-200">Книги</a></li>
                         <li><a href="/authors" class="hover:text-gray-200">Авторы</a></li>
-                        <li><a href="/about" class="hover:text-gray-200">О нас</a></li>
                         <li><a href="/api" class="hover:text-gray-200">API</a></li>
                     </ul>
                 </nav>