VORKOUT-7 #9

Merged
ivan.dev merged 12 commits from VORKOUT-7 into master 2025-06-05 16:29:14 +05:00
6 changed files with 12 additions and 13 deletions
Showing only changes of commit c68286f7cc - Show all commits

View File

@ -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

View File

@ -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):

Нет импорта для Base

Нет импорта для `Base`

Надо наследовать от нашего Base, а не того, который из pydantic

Надо наследовать от нашего [`Base`](https://gitea.heado.ru/Vorkout/connect/src/branch/master/api/api/schemas/base.py#L5), а не того, который из `pydantic`
id: Optional[int] = None
name: str = Field(..., max_length=100)
login: str = Field(..., max_length=100)

View File

@ -5,7 +5,7 @@ from datetime import datetime
from api.db.tables.account import KeyType,KeyStatus
class AccountKeyring(Base):
class AccountKeyring(BaseModel):

Нет импорта Base

Нет импорта `Base`

Тоже самое что и с User схемой

Тоже самое что и с `User` схемой
owner_id: int
key_type: KeyType
key_id: Optional[str] = Field(None, max_length=40)

View File

@ -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):

Не хватает испорта Base

Не хватает испорта `Base`
owner_id: Optional[int] = None
key_type: Optional[KeyType] = None
key_id: Optional[str] = Field(None, max_length=40)

View File

@ -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

View File

@ -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)