This commit is contained in:
2026-03-14 00:11:21 +03:00
parent b2139ed440
commit 468bdf817a
70 changed files with 337 additions and 47 deletions

View File

@@ -0,0 +1,32 @@
"""empty message
Revision ID: 15b87c1584bf
Revises: 2e39b25a3b28
Create Date: 2026-03-13 22:53:40.498042
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = '15b87c1584bf'
down_revision: Union[str, Sequence[str], None] = 'dd476c0dcf61'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('users', 'food')
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('users', sa.Column('food', sa.BOOLEAN(), nullable=True))
# ### end Alembic commands ###

View File

@@ -0,0 +1,32 @@
"""empty message
Revision ID: 1fa13c2c4df4
Revises: 15b87c1584bf
Create Date: 2026-03-13 22:56:36.115487
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = '1fa13c2c4df4'
down_revision: Union[str, Sequence[str], None] = '15b87c1584bf'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('users', sa.Column('type_of_food', sa.String(), nullable=True))
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('users', 'type_of_food')
# ### end Alembic commands ###

View File

@@ -0,0 +1,32 @@
"""empty message
Revision ID: 55f24e794643
Revises: 1fa13c2c4df4
Create Date: 2026-03-13 23:03:47.236864
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = '55f24e794643'
down_revision: Union[str, Sequence[str], None] = '1fa13c2c4df4'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('users', sa.Column('middlename', sa.String(), nullable=True))
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('users', 'middlename')
# ### end Alembic commands ###

View File

@@ -0,0 +1,32 @@
"""empty message
Revision ID: dd476c0dcf61
Revises: 1e2bd98e74a5
Create Date: 2026-03-13 22:38:32.065614
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = 'dd476c0dcf61'
down_revision: Union[str, Sequence[str], None] = '1e2bd98e74a5'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('users', 'alco')
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('users', sa.Column('alco', sa.BOOLEAN(), nullable=True))
# ### end Alembic commands ###

View File

@@ -23,11 +23,11 @@ class User(Base):
code = Column(String, unique=True, nullable=True)
name = Column(String, nullable=True)
middlename=Column(String, nullable=True)
surname = Column(String, nullable=True)
text_field = Column(String, nullable=True)
food = Column(Boolean)
alco = Column(Boolean)
types_of_alco = Column(String, default="Nothing")
type_of_food = Column(String, nullable=True)
types_of_alco = Column(String, default="Nothing", nullable=True)
activated = Column(Boolean)
created_at = Column(DateTime(timezone=True), server_default=func.now())

View File

@@ -2,6 +2,7 @@ from pydantic import BaseModel, Field, field_validator
from pydantic_settings import BaseSettings, SettingsConfigDict
from pydantic.types import StringConstraints
from typing_extensions import Annotated
from typing import Optional
import re
NameStr = Annotated[
@@ -23,16 +24,18 @@ class UserOut(BaseModel):
name: NameStr = Field(..., description="Name of the guest")
surname: NameStr = Field(..., description="Surname of the guest")
class UserUpdate(UserAccess):
name: NameStr = Field(..., description="Name of the guest")
surname: NameStr = Field(..., description="Surname of the guest")
text_field: str = Field("", max_length=500, description="what the guest wants")
activated: bool = Field(False, description="activation of the guest")
food: bool = Field(False, description="Options meat or fish")
alco: bool = Field(False, description="if the guest will drink alco or not")
types_of_alco: str = Field("", description="types of alco")
class UserUpdate(BaseModel):
code: Optional[str] = Field(None, min_length=6, max_length=6, description="Code of the guest")
name: Optional[NameStr] = Field(None, description="Name of the guest")
middlename: Optional[NameStr] = Field(None, description="Middlename of the guest")
surname: Optional[NameStr] = Field(None, description="Surname of the guest")
text_field: Optional[str] = Field(None, max_length=500, description="what the guest wants")
activated: Optional[bool] = Field(None, description="activation of the guest")
type_of_food: Optional[str] = Field(None, description="meat or fish")
types_of_alco: Optional[str] = Field(None, description="types of alco")
class UserCreate(UserUpdate):
code: str = Field(..., min_length=6, max_length=6, description="Code of the guest")
admin:bool = Field(False, description="Admin privilegies")
class Settings(BaseSettings):
DIR:str