fix: model
This commit is contained in:
parent
8965365afc
commit
a31758192d
@ -1,11 +1,12 @@
|
|||||||
import datetime
|
import datetime
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from pydantic import BaseModel, EmailStr, Field
|
from pydantic import EmailStr, Field
|
||||||
from api.db.tables.account import AccountRole,AccountStatus
|
from api.db.tables.account import AccountRole,AccountStatus
|
||||||
|
|
||||||
|
from api.schemas.base import Base
|
||||||
|
|
||||||
class User(BaseModel):
|
class User(Base):
|
||||||
id: Optional[int] = None
|
id: Optional[int] = None
|
||||||
name: str = Field(..., max_length=100)
|
name: str = Field(..., max_length=100)
|
||||||
login: str = Field(..., max_length=100)
|
login: str = Field(..., max_length=100)
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import datetime
|
import datetime
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import Field
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from api.db.tables.account import KeyType,KeyStatus
|
from api.db.tables.account import KeyType,KeyStatus
|
||||||
|
|
||||||
|
from api.schemas.base import Base
|
||||||
|
|
||||||
class AccountKeyring(BaseModel):
|
class AccountKeyring(Base):
|
||||||
owner_id: int
|
owner_id: int
|
||||||
key_type: KeyType
|
key_type: KeyType
|
||||||
key_id: Optional[str] = Field(None, max_length=40)
|
key_id: Optional[str] = Field(None, max_length=40)
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
from typing import Optional, List
|
from typing import Optional, List
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from pydantic import BaseModel, EmailStr, Field, TypeAdapter
|
from pydantic import EmailStr, Field, TypeAdapter
|
||||||
|
|
||||||
from api.db.tables.account import AccountRole,AccountStatus
|
from api.db.tables.account import AccountRole,AccountStatus
|
||||||
|
|
||||||
|
from api.schemas.base import Base
|
||||||
|
|
||||||
|
|
||||||
class UserUpdate(BaseModel):
|
class UserUpdate(Base):
|
||||||
id: Optional[int] = None
|
id: Optional[int] = None
|
||||||
name: Optional[str] = Field(None, max_length=100)
|
name: Optional[str] = Field(None, max_length=100)
|
||||||
login: Optional[str] = Field(None, max_length=100)
|
login: Optional[str] = Field(None, max_length=100)
|
||||||
@ -18,7 +19,7 @@ class UserUpdate(BaseModel):
|
|||||||
created_at: Optional[datetime] = None
|
created_at: Optional[datetime] = None
|
||||||
status: Optional[AccountStatus] = None
|
status: Optional[AccountStatus] = None
|
||||||
|
|
||||||
class AllUser(BaseModel):
|
class AllUser(Base):
|
||||||
id: int
|
id: int
|
||||||
name: str
|
name: str
|
||||||
login: str
|
login: str
|
||||||
@ -29,7 +30,7 @@ class AllUser(BaseModel):
|
|||||||
status: AccountStatus
|
status: AccountStatus
|
||||||
|
|
||||||
|
|
||||||
class AllUserResponse(BaseModel):
|
class AllUserResponse(Base):
|
||||||
users: List[AllUser]
|
users: List[AllUser]
|
||||||
amount_count: int
|
amount_count: int
|
||||||
amount_pages: int
|
amount_pages: int
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import datetime
|
import datetime
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import Field
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from api.db.tables.account import KeyType,KeyStatus
|
from api.db.tables.account import KeyType,KeyStatus
|
||||||
|
|
||||||
|
from api.schemas.base import Base
|
||||||
|
|
||||||
class AccountKeyringUpdate(BaseModel):
|
class AccountKeyringUpdate(Base):
|
||||||
owner_id: Optional[int] = None
|
owner_id: Optional[int] = None
|
||||||
key_type: Optional[KeyType] = None
|
key_type: Optional[KeyType] = None
|
||||||
key_id: Optional[str] = Field(None, max_length=40)
|
key_id: Optional[str] = Field(None, max_length=40)
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
from api.schemas.base import BaseModel
|
from api.schemas.base import Base
|
||||||
|
|
||||||
# Таблица для получения информации из запроса
|
# Таблица для получения информации из запроса
|
||||||
|
|
||||||
|
|
||||||
class Auth(BaseModel):
|
class Auth(Base):
|
||||||
login: str
|
login: str
|
||||||
password: str
|
password: str
|
||||||
|
|
||||||
class Refresh(BaseModel,):
|
class Refresh(Base):
|
||||||
refresh_token: str
|
refresh_token: str
|
||||||
|
|
||||||
class Access(BaseModel):
|
class Access(Base):
|
||||||
access_token: str
|
access_token: str
|
||||||
|
@ -3,7 +3,7 @@ from typing import Dict, Any
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
from api.schemas.base import BaseModel
|
from api.schemas.base import Base
|
||||||
|
|
||||||
|
|
||||||
class State(Enum):
|
class State(Enum):
|
||||||
@ -17,7 +17,7 @@ class Status(Enum):
|
|||||||
DELETED = "Deleted"
|
DELETED = "Deleted"
|
||||||
|
|
||||||
|
|
||||||
class ListEvent(BaseModel):
|
class ListEvent(Base):
|
||||||
id: int
|
id: int
|
||||||
name: str = Field(..., max_length=40)
|
name: str = Field(..., max_length=40)
|
||||||
title: str = Field(..., max_length=64)
|
title: str = Field(..., max_length=64)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from pydantic import Field, conint
|
from pydantic import Field
|
||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
Loading…
Reference in New Issue
Block a user