diff --git a/api/api/db/tables/account.py b/api/api/db/tables/account.py index cf8e795..fcf2cc3 100644 --- a/api/api/db/tables/account.py +++ b/api/api/db/tables/account.py @@ -1,7 +1,7 @@ from sqlalchemy import Table, Column, String, Enum as SQLAEnum, JSON, ForeignKey, DateTime, Index from sqlalchemy.sql import func -from enum import Enum, auto +from enum import Enum from api.db.sql_types import UnsignedInt from api.db import metadata diff --git a/api/api/schemas/account/account.py b/api/api/schemas/account/account.py index 7c6269d..1ceb3b0 100644 --- a/api/api/schemas/account/account.py +++ b/api/api/schemas/account/account.py @@ -1,11 +1,11 @@ import datetime from datetime import datetime from typing import Optional -from pydantic import Base,BaseModel, EmailStr, Field +from pydantic import BaseModel, EmailStr, Field from api.db.tables.account import AccountRole,AccountStatus -class User(Base): +class User(BaseModel): id: Optional[int] = None name: str = Field(..., max_length=100) login: str = Field(..., max_length=100) diff --git a/api/api/schemas/account/account_keyring.py b/api/api/schemas/account/account_keyring.py index dff9561..b504797 100644 --- a/api/api/schemas/account/account_keyring.py +++ b/api/api/schemas/account/account_keyring.py @@ -5,7 +5,7 @@ from datetime import datetime from api.db.tables.account import KeyType,KeyStatus -class AccountKeyring(Base): +class AccountKeyring(BaseModel): owner_id: int key_type: KeyType key_id: Optional[str] = Field(None, max_length=40) diff --git a/api/api/schemas/endpoints/account_keyring.py b/api/api/schemas/endpoints/account_keyring.py index 755501a..5e646dc 100644 --- a/api/api/schemas/endpoints/account_keyring.py +++ b/api/api/schemas/endpoints/account_keyring.py @@ -1,11 +1,11 @@ import datetime from typing import Optional -from pydantic import Base, Field +from pydantic import BaseModel, Field from datetime import datetime from api.db.tables.account import KeyType,KeyStatus -class AccountKeyringUpdate(Base): +class AccountKeyringUpdate(BaseModel): owner_id: Optional[int] = None key_type: Optional[KeyType] = None key_id: Optional[str] = Field(None, max_length=40) diff --git a/api/api/schemas/endpoints/auth.py b/api/api/schemas/endpoints/auth.py index ca06793..15e5c3a 100644 --- a/api/api/schemas/endpoints/auth.py +++ b/api/api/schemas/endpoints/auth.py @@ -1,15 +1,14 @@ -from api.schemas.base import Base - +from api.schemas.base import BaseModel # Таблица для получения информации из запроса -class Auth(Base): +class Auth(BaseModel): login: str password: str -class Refresh(Base): +class Refresh(BaseModel,): refresh_token: str -class Access(Base): +class Access(BaseModel): access_token: str diff --git a/api/api/schemas/events/list_events.py b/api/api/schemas/events/list_events.py index 2df94c7..e5144ae 100644 --- a/api/api/schemas/events/list_events.py +++ b/api/api/schemas/events/list_events.py @@ -3,7 +3,7 @@ from typing import Dict, Any from datetime import datetime from enum import Enum -from api.schemas.base import Base +from api.schemas.base import BaseModel class State(Enum): @@ -17,7 +17,7 @@ class Status(Enum): DELETED = "Deleted" -class ListEvent(Base): +class ListEvent(BaseModel): id: int name: str = Field(..., max_length=40) title: str = Field(..., max_length=64)