Улучшение админки

library_service/models/dto/__init__.py

@@ -8,7 +8,7 @@ from .user import UserBase, UserCreate, UserList, UserRead, UserUpdate, UserLogi
 from .loan import LoanBase, LoanCreate, LoanList, LoanRead, LoanUpdate
 from .recovery import RecoveryCodesResponse, RecoveryCodesStatus, RecoveryCodeUse
 from .token import Token, TokenData, PartialToken
-from .combined import (
+from .misc import (
     AuthorWithBooks,
     GenreWithBooks,
     BookWithAuthors,
@@ -19,6 +19,8 @@ from .combined import (
     LoanWithBook,
     LoginResponse,
     RegisterResponse,
+    UserCreateByAdmin,
+    UserUpdateByAdmin,
     TOTPSetupResponse,
     TOTPVerifyRequest,
     TOTPDisableRequest,
@@ -67,6 +69,8 @@ __all__ = [
     "TOTPVerifyRequest",
     "TOTPDisableRequest",
     "RecoveryCodeUse",
+    "UserCreateByAdmin",
+    "UserUpdateByAdmin",
     "LoginResponse",
     "RegisterResponse",
     "RecoveryCodesStatus",

library_service/models/dto/misc.py

@@ -1,4 +1,4 @@
-"""Модуль объединёных объектов"""
+"""Модуль разных моделей"""
 
 from datetime import datetime
 from typing import List
@@ -11,8 +11,8 @@ from .book import BookRead
 from .loan import LoanRead
 from ..enums import BookStatus
 
-from .user import UserRead
-from .recovery import RecoveryCodesResponse, RecoveryCodesStatus
+from .user import UserCreate, UserRead, UserUpdate
+from .recovery import RecoveryCodesResponse
 
 
 class AuthorWithBooks(SQLModel):
@@ -80,6 +80,20 @@ class BookStatusUpdate(SQLModel):
     status: str
 
 
+class UserCreateByAdmin(UserCreate):
+    """Создание пользователя администратором"""
+
+    is_active: bool = True
+    roles: list[str] | None = None
+
+
+class UserUpdateByAdmin(UserUpdate):
+    """Обновление пользователя администратором"""
+
+    is_active: bool | None = None
+    roles: list[str] | None = None
+
+
 class LoginResponse(SQLModel):
     """Модель для авторизации пользователя"""