fix search

Author: khoshov

Makefile

@@ -142,3 +142,23 @@ tags:
 
 assign:
 	$(PYTHON) manage.py assign_tags_to_books
+
+# ======================
+# ELASTICSEARCH
+# ======================
+.PHONY: elastic-create elastic-delete elastic-populate elastic-rebuild elastic-status
+
+elastic-create: ## Create Elasticsearch indices
+	$(PYTHON) manage.py search_index --create
+
+elastic-delete: ## Delete Elasticsearch indices
+	$(PYTHON) manage.py search_index --delete --force
+
+elastic-populate: ## Populate Elasticsearch indices
+	$(PYTHON) manage.py search_index --populate
+
+elastic-rebuild: elastic-delete elastic-create elastic-populate ## Rebuild Elasticsearch indices (delete, create, populate)
+	@echo "Elasticsearch indices rebuilt successfully"
+
+elastic-status: ## Show Elasticsearch indices status
+	$(PYTHON) manage.py search_index --status

apps/books/api/v1/book_elastic_views.py

@@ -34,12 +34,12 @@ class BookDocumentView(DocumentViewSet):
 
     # Поля для полнотекстового поиска
     search_fields = {
-        "title": {"boost": 4, "analyzer": "standard"},
-        "description": {"boost": 2, "analyzer": "standard"},
-        "author.first_name": {"boost": 3, "analyzer": "standard"},
-        "author.last_name": {"boost": 3, "analyzer": "standard"},
-        "publisher.name": {"boost": 1, "analyzer": "standard"},
-        "tags.name": {"boost": 1, "analyzer": "standard"},
+        "title": {"boost": 4, "fuzziness": 1, "prefix_length": 0},
+        "description": {"boost": 2, "fuzziness": 1, "prefix_length": 0},
+        "author.first_name": {"boost": 3, "fuzziness": 1, "prefix_length": 0},
+        "author.last_name": {"boost": 3, "fuzziness": 1, "prefix_length": 0},
+        "publisher.name": {"boost": 1, "fuzziness": 1, "prefix_length": 0},
+        "tags.name": {"boost": 1, "fuzziness": 1, "prefix_length": 0},
     }
 
     # Поля для точной фильтрации

frontend/src/components/BooksList.tsx

@@ -12,12 +12,14 @@ interface BooksListProps {
   onBookClick: (book: Book) => void;
   enableLazyLoading?: boolean;
   enableInfiniteScroll?: boolean;
+  searchQuery?: string;
 }
 
-export default function BooksList({ 
-  onBookClick, 
-  enableLazyLoading = true, 
-  enableInfiniteScroll = true 
+export default function BooksList({
+  onBookClick,
+  enableLazyLoading = true,
+  enableInfiniteScroll = true,
+  searchQuery = ''
 }: BooksListProps) {
   const [books, setBooks] = useState<Book[]>([]);
   const [authors, setAuthors] = useState<Author[]>([]);
@@ -54,7 +56,10 @@ export default function BooksList({
       if (filters.publisher) params.publisher = filters.publisher;
       if (filters.ordering) params.ordering = filters.ordering;
 
-      const response = await booksApi.getBooks(params);
+      // Use search API if there's a non-empty search query, otherwise use regular books API
+      const response = searchQuery && searchQuery.trim()
+        ? await booksApi.searchBooks({ ...params, search: searchQuery.trim() })
+        : await booksApi.getBooks(params);
 
       if (isLoadMore) {
         setBooks(prev => [...prev, ...response.results]);
@@ -95,7 +100,7 @@ export default function BooksList({
 
   useEffect(() => {
     loadBooks();
-  }, [filters.author, filters.category, filters.publisher, filters.ordering]);
+  }, [filters.author, filters.category, filters.publisher, filters.ordering, searchQuery]);
 
   const handleAuthorChange = (author: string) => {
     const authorValue = author === 'all' ? '' : author;

frontend/src/components/Layout.tsx

@@ -12,10 +12,11 @@ import {
 interface LayoutProps {
   children: React.ReactNode;
   onSearch?: (query: string) => void;
+  searchQuery?: string;
+  onSearchQueryChange?: (query: string) => void;
 }
 
-export default function Layout({ children, onSearch }: LayoutProps) {
-  const [searchQuery, setSearchQuery] = useState('');
+export default function Layout({ children, onSearch, searchQuery = '', onSearchQueryChange }: LayoutProps) {
   const [isDark, setIsDark] = useState(false);
 
   const handleSearch = (e: React.FormEvent) => {
@@ -45,7 +46,7 @@ export default function Layout({ children, onSearch }: LayoutProps) {
                   type="text"
                   placeholder="Поиск книг..."
                   value={searchQuery}
-                  onChange={(e) => setSearchQuery(e.target.value)}
+                  onChange={(e) => onSearchQueryChange?.(e.target.value)}
                   className="w-64"
                 />
                 <Button type="submit" size="sm">

frontend/src/lib/api.ts

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import type { Author, Book, Publisher, Tag, PaginatedResponse } from '@/types';
 
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8000/api/v1';
+const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8001/api/v1';
 
 const api = axios.create({
   baseURL: API_BASE_URL,
@@ -22,6 +22,18 @@ export const booksApi = {
     return response.data;
   },
 
+  searchBooks: async (params?: {
+    search?: string;
+    author?: string;
+    tag?: string;
+    publisher?: string;
+    ordering?: string;
+    page?: number;
+  }): Promise<PaginatedResponse<Book>> => {
+    const response = await api.get('/search/', { params });
+    return response.data;
+  },
+
   getBook: async (id: number): Promise<Book> => {
     const response = await api.get(`/books/${id}/`);
     return response.data;

frontend/src/pages/HomePage.tsx

@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import Layout from '@/components/Layout';
 import BooksList from '@/components/BooksList';
@@ -6,18 +7,22 @@ import type { Book } from '@/types';
 
 export default function HomePage() {
   const navigate = useNavigate();
-  
+  const [searchQuery, setSearchQuery] = useState('');
+
   const handleBookClick = (book: Book) => {
     navigate(`/book/${book.id}`);
   };
 
   const handleSearch = (query: string) => {
-    // This will be handled by the BooksList component
-    console.log('Search query:', query);
+    setSearchQuery(query);
+  };
+
+  const handleSearchQueryChange = (query: string) => {
+    setSearchQuery(query);
   };
 
   return (
-    <Layout onSearch={handleSearch}>
+    <Layout onSearch={handleSearch} searchQuery={searchQuery} onSearchQueryChange={handleSearchQueryChange}>
       {/* Hero Section */}
       <div className="bg-gradient-to-r from-primary/10 to-primary/20 rounded-lg p-8 mb-8 text-center">
         <h1 className="text-4xl md:text-5xl font-bold mb-4">Книги по Python</h1>
@@ -37,7 +42,7 @@ export default function HomePage() {
       </div>
 
       {/* Books List */}
-      <BooksList onBookClick={handleBookClick} />
+      <BooksList onBookClick={handleBookClick} searchQuery={searchQuery} />
     </Layout>
   );
 }

frontend/vite.config.ts

@@ -6,7 +6,7 @@ import * as path from 'path'
 export default defineConfig({
   plugins: [react()],
   server: {
-    port: 8006,
+    port: 5173,
     strictPort: true,
   },
   resolve: {