From 10fdda3ec18ba971b43b6b84932cea5d517649f6 Mon Sep 17 00:00:00 2001 From: "MH.Dmitrii" Date: Sat, 7 Mar 2026 00:31:15 +0300 Subject: [PATCH] test fix --- .gitignore | 1 - docker/docker-compose.yaml | 2 +- docker/start.sh | 1 - run.py | 2 +- .../alembic/alembic/versions/4ffe643b7d40_.py | 32 +++++++++++++ .../alembic/alembic/versions/65b22fdefbe0_.py | 38 +++++++++++++++ .../alembic/alembic/versions/8925c8439e5d_.py | 32 +++++++++++++ .../alembic/alembic/versions/965a4fb49fae_.py | 32 +++++++++++++ .../alembic/alembic/versions/c842fa3d57cd_.py | 47 +++++++++++++++++++ 9 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 server/backend/database/alembic/alembic/versions/4ffe643b7d40_.py create mode 100644 server/backend/database/alembic/alembic/versions/65b22fdefbe0_.py create mode 100644 server/backend/database/alembic/alembic/versions/8925c8439e5d_.py create mode 100644 server/backend/database/alembic/alembic/versions/965a4fb49fae_.py create mode 100644 server/backend/database/alembic/alembic/versions/c842fa3d57cd_.py diff --git a/.gitignore b/.gitignore index 1b4d44e..e012d5e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,4 @@ hint.py *.env #db *.db -versions/ data/ \ No newline at end of file diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index e5193c4..abbda17 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -3,7 +3,7 @@ services: image: back:latest container_name: wedding-site volumes: - #- wedding_volume:/home/backend + - wedding_volume:/home/backend/server/backend/database/db - /var/run/docker.sock:/var/run/docker.sock ports: - "${PORT}:${PORT}" diff --git a/docker/start.sh b/docker/start.sh index 6e371e1..514d37c 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -1,4 +1,3 @@ #!/bin/sh -alembic -c server/backend/database/alembic/alembic.ini revision --autogenerate alembic -c server/backend/database/alembic/alembic.ini upgrade head exec python run.py --user_name admin \ No newline at end of file diff --git a/run.py b/run.py index f0c9763..df026d8 100644 --- a/run.py +++ b/run.py @@ -35,7 +35,7 @@ async def arguments(args): "surname": args.user_name, "admin": True } - users = await list_users() + users = await list_users() or [] label = any(u.admin for u in users) if not label: await create_user(UserCreate(**admin_user)) diff --git a/server/backend/database/alembic/alembic/versions/4ffe643b7d40_.py b/server/backend/database/alembic/alembic/versions/4ffe643b7d40_.py new file mode 100644 index 0000000..0fa73d8 --- /dev/null +++ b/server/backend/database/alembic/alembic/versions/4ffe643b7d40_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 4ffe643b7d40 +Revises: 965a4fb49fae +Create Date: 2026-03-07 00:21:36.656185 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '4ffe643b7d40' +down_revision: Union[str, Sequence[str], None] = '965a4fb49fae' +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! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/server/backend/database/alembic/alembic/versions/65b22fdefbe0_.py b/server/backend/database/alembic/alembic/versions/65b22fdefbe0_.py new file mode 100644 index 0000000..2ecd01a --- /dev/null +++ b/server/backend/database/alembic/alembic/versions/65b22fdefbe0_.py @@ -0,0 +1,38 @@ +"""empty message + +Revision ID: 65b22fdefbe0 +Revises: 8925c8439e5d +Create Date: 2026-02-23 14:28:12.782781 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '65b22fdefbe0' +down_revision: Union[str, Sequence[str], None] = '8925c8439e5d' +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('food', sa.Boolean(), nullable=True)) + op.add_column('users', sa.Column('alco', sa.Boolean(), nullable=True)) + op.add_column('users', sa.Column('types_of_alco', sa.String(), nullable=True)) + op.drop_column('users', 'checkbox1') + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('checkbox1', sa.BOOLEAN(), nullable=True)) + op.drop_column('users', 'types_of_alco') + op.drop_column('users', 'alco') + op.drop_column('users', 'food') + # ### end Alembic commands ### diff --git a/server/backend/database/alembic/alembic/versions/8925c8439e5d_.py b/server/backend/database/alembic/alembic/versions/8925c8439e5d_.py new file mode 100644 index 0000000..944de68 --- /dev/null +++ b/server/backend/database/alembic/alembic/versions/8925c8439e5d_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 8925c8439e5d +Revises: c842fa3d57cd +Create Date: 2026-02-23 13:59:55.999845 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '8925c8439e5d' +down_revision: Union[str, Sequence[str], None] = 'c842fa3d57cd' +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('checkbox1', sa.Boolean(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'checkbox1') + # ### end Alembic commands ### diff --git a/server/backend/database/alembic/alembic/versions/965a4fb49fae_.py b/server/backend/database/alembic/alembic/versions/965a4fb49fae_.py new file mode 100644 index 0000000..1133801 --- /dev/null +++ b/server/backend/database/alembic/alembic/versions/965a4fb49fae_.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 965a4fb49fae +Revises: 65b22fdefbe0 +Create Date: 2026-02-28 13:42:28.964508 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '965a4fb49fae' +down_revision: Union[str, Sequence[str], None] = '65b22fdefbe0' +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! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/server/backend/database/alembic/alembic/versions/c842fa3d57cd_.py b/server/backend/database/alembic/alembic/versions/c842fa3d57cd_.py new file mode 100644 index 0000000..442bacb --- /dev/null +++ b/server/backend/database/alembic/alembic/versions/c842fa3d57cd_.py @@ -0,0 +1,47 @@ +"""empty message + +Revision ID: c842fa3d57cd +Revises: +Create Date: 2026-02-04 19:37:17.628815 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'c842fa3d57cd' +down_revision: Union[str, Sequence[str], None] = None +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.create_table('users', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('code', sa.String(), nullable=True), + sa.Column('name', sa.String(), nullable=True), + sa.Column('surname', sa.String(), nullable=True), + sa.Column('text_field', sa.String(), nullable=True), + sa.Column('activated', sa.Boolean(), nullable=True), + sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True), + sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True), + sa.Column('last_login', sa.DateTime(timezone=True), nullable=True), + sa.Column('admin', sa.Boolean(), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('code') + ) + op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_users_id'), table_name='users') + op.drop_table('users') + # ### end Alembic commands ###