Доабвлеие страниц на фронтэнде

library_service/routers/auth.py

@@ -44,13 +44,11 @@ def register(user_data: UserCreate, session: Session = Depends(get_session)):
             status_code=status.HTTP_400_BAD_REQUEST, detail="Email already registered"
         )
 
-    # Создание пользователя
     db_user = User(
         **user_data.model_dump(exclude={"password"}),
         hashed_password=get_password_hash(user_data.password)
     )
 
-    # Назначение роли по умолчанию
     default_role = session.exec(select(Role).where(Role.name == "user")).first()
     if default_role:
         db_user.roles.append(default_role)
@@ -154,3 +152,85 @@ def read_users(
         UserRead(**user.model_dump(), roles=[role.name for role in user.roles])
         for user in users
     ]
+
+
+@router.post(
+    "/users/{user_id}/roles/{role_name}",
+    response_model=UserRead,
+    summary="Назначить роль пользователю",
+    description="Добавить указанную роль пользователю",
+)
+def add_role_to_user(
+    user_id: int,
+    role_name: str,
+    admin: RequireAdmin,
+    session: Session = Depends(get_session),
+):
+    """Эндпоинт добавления роли пользователю"""
+    user = session.get(User, user_id)
+    if not user:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="User not found",
+        )
+
+    role = session.exec(select(Role).where(Role.name == role_name)).first()
+    if not role:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Role '{role_name}' not found",
+        )
+
+    if role in user.roles:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="User already has this role",
+        )
+
+    user.roles.append(role)
+    session.add(user)
+    session.commit()
+    session.refresh(user)
+
+    return UserRead(**user.model_dump(), roles=[r.name for r in user.roles])
+
+
+@router.delete(
+    "/users/{user_id}/roles/{role_name}",
+    response_model=UserRead,
+    summary="Удалить роль у пользователя",
+    description="Убрать указанную роль у пользователя",
+)
+def remove_role_from_user(
+    user_id: int,
+    role_name: str,
+    admin: RequireAdmin,
+    session: Session = Depends(get_session),
+):
+    """Эндпоинт удаления роли у пользователя"""
+    user = session.get(User, user_id)
+    if not user:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="User not found",
+        )
+
+    role = session.exec(select(Role).where(Role.name == role_name)).first()
+    if not role:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Role '{role_name}' not found",
+        )
+
+    if role not in user.roles:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="User does not have this role",
+        )
+
+    user.roles.remove(role)
+    session.add(user)
+    session.commit()
+    session.refresh(user)
+
+    return UserRead(**user.model_dump(), roles=[r.name for r in user.roles])

library_service/routers/books.py

@@ -6,7 +6,7 @@ from sqlmodel import Session, select, col, func
 
 from library_service.auth import RequireAuth
 from library_service.settings import get_session
-from library_service.models.db import Author, AuthorBookLink, Book, GenreBookLink
+from library_service.models.db import Author, AuthorBookLink, Book, GenreBookLink, Genre
 from library_service.models.dto import AuthorRead, BookCreate, BookList, BookRead, BookUpdate, GenreRead
 from library_service.models.dto.combined import (
     BookWithAuthorsAndGenres,

library_service/routers/genres.py

@@ -10,7 +10,6 @@ from library_service.settings import get_session
 router = APIRouter(prefix="/genres", tags=["genres"])
 
 
-# Создание жанра
 @router.post(
     "/",
     response_model=GenreRead,
@@ -30,7 +29,6 @@ def create_genre(
     return GenreRead(**db_genre.model_dump())
 
 
-# Чтение жанров
 @router.get(
     "/",
     response_model=GenreList,
@@ -45,7 +43,6 @@ def read_genres(session: Session = Depends(get_session)):
     )
 
 
-# Чтение жанра с его книгами
 @router.get(
     "/{genre_id}",
     response_model=GenreWithBooks,
@@ -73,7 +70,6 @@ def get_genre(
     return GenreWithBooks(**genre_data)
 
 
-# Обновление жанра
 @router.put(
     "/{genre_id}",
     response_model=GenreRead,
@@ -100,7 +96,6 @@ def update_genre(
     return GenreRead(**db_genre.model_dump())
 
 
-# Удаление жанра
 @router.delete(
     "/{genre_id}",
     response_model=GenreRead,

library_service/routers/misc.py

@@ -31,21 +31,39 @@ def get_info(app) -> Dict:
 
 
 @router.get("/", include_in_schema=False)
-async def root(request: Request, app=Depends(lambda: get_app())):
+async def root(request: Request):
     """Эндпоинт главной страницы"""
-    return templates.TemplateResponse(request, "index.html", get_info(app))
+    return templates.TemplateResponse(request, "index.html")
+
+
+@router.get("/authors", include_in_schema=False)
+async def authors(request: Request):
+    """Эндпоинт страницы выбора автора"""
+    return templates.TemplateResponse(request, "authors.html")
+
+
+@router.get("/author/{author_id}", include_in_schema=False)
+async def author(request: Request, author_id: int):
+    """Эндпоинт страницы автора"""
+    return templates.TemplateResponse(request, "author.html")
 
 
 @router.get("/books", include_in_schema=False)
-async def books(request: Request, app=Depends(lambda: get_app())):
+async def books(request: Request):
     """Эндпоинт страницы выбора книг"""
-    return templates.TemplateResponse(request, "books.html", get_info(app))
+    return templates.TemplateResponse(request, "books.html")
+
+
+@router.get("/book/{book_id}", include_in_schema=False)
+async def book(request: Request, book_id: int):
+    """Эндпоинт страницы книги"""
+    return templates.TemplateResponse(request, "book.html")
 
 
 @router.get("/auth", include_in_schema=False)
-async def auth(request: Request, app=Depends(lambda: get_app())):
+async def auth(request: Request):
     """Эндпоинт страницы авторизации"""
-    return templates.TemplateResponse(request, "auth.html", get_info(app))
+    return templates.TemplateResponse(request, "auth.html")