From 308754786708e303335bcade7c40f3fda3358b12 Mon Sep 17 00:00:00 2001 From: urec56 Date: Sun, 11 Feb 2024 17:14:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=91=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../29121de940c3_изменения_таблицы_чатов.py | 30 ----------------- .../73241845c54f_изменения_таблицы_чатов.py | 30 ----------------- .../7bb5f34b11d2_изменения_таблицы_чатов.py | 30 ----------------- .../90e16e2ea817_изменения_таблицы_чатов.py | 30 ----------------- .../b978b3b7a449_изменения_таблицы_чатов.py | 32 ------------------- ...и_подтверждения.py => c8e41e92e07e_изменения_таблицы_юзеров.py} | 18 +++++++---- chat_test/app/users/chat/models.py | 2 -- chat_test/app/users/models.py | 9 +++--- chat_test/app/users/router.py | 2 -- 9 files changed, 16 insertions(+), 167 deletions(-) delete mode 100644 chat_test/app/migrations/versions/29121de940c3_изменения_таблицы_чатов.py delete mode 100644 chat_test/app/migrations/versions/73241845c54f_изменения_таблицы_чатов.py delete mode 100644 chat_test/app/migrations/versions/7bb5f34b11d2_изменения_таблицы_чатов.py delete mode 100644 chat_test/app/migrations/versions/90e16e2ea817_изменения_таблицы_чатов.py delete mode 100644 chat_test/app/migrations/versions/b978b3b7a449_изменения_таблицы_чатов.py rename chat_test/app/migrations/versions/{3a44aa43d35d_добавлена_таблица_с_кодами_подтверждения.py => c8e41e92e07e_изменения_таблицы_юзеров.py} (80%) diff --git a/chat_test/app/migrations/versions/29121de940c3_изменения_таблицы_чатов.py b/chat_test/app/migrations/versions/29121de940c3_изменения_таблицы_чатов.py deleted file mode 100644 index 92a6c3c..0000000 --- a/chat_test/app/migrations/versions/29121de940c3_изменения_таблицы_чатов.py +++ /dev/null @@ -1,30 +0,0 @@ -"""Изменения таблицы чатов - -Revision ID: 29121de940c3 -Revises: 90e16e2ea817 -Create Date: 2024-02-11 15:23:25.957366 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '29121de940c3' -down_revision: Union[str, None] = '90e16e2ea817' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - pass - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - pass - # ### end Alembic commands ### diff --git a/chat_test/app/migrations/versions/73241845c54f_изменения_таблицы_чатов.py b/chat_test/app/migrations/versions/73241845c54f_изменения_таблицы_чатов.py deleted file mode 100644 index 8118694..0000000 --- a/chat_test/app/migrations/versions/73241845c54f_изменения_таблицы_чатов.py +++ /dev/null @@ -1,30 +0,0 @@ -"""Изменения таблицы чатов - -Revision ID: 73241845c54f -Revises: 7bb5f34b11d2 -Create Date: 2024-02-11 15:18:55.916912 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '73241845c54f' -down_revision: Union[str, None] = '7bb5f34b11d2' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('chats', sa.Column('visibility', sa.Boolean(), server_default='true', nullable=False)) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('chats', 'visibility') - # ### end Alembic commands ### diff --git a/chat_test/app/migrations/versions/7bb5f34b11d2_изменения_таблицы_чатов.py b/chat_test/app/migrations/versions/7bb5f34b11d2_изменения_таблицы_чатов.py deleted file mode 100644 index 6366686..0000000 --- a/chat_test/app/migrations/versions/7bb5f34b11d2_изменения_таблицы_чатов.py +++ /dev/null @@ -1,30 +0,0 @@ -"""Изменения таблицы чатов - -Revision ID: 7bb5f34b11d2 -Revises: 3a44aa43d35d -Create Date: 2024-02-10 18:49:33.988568 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '7bb5f34b11d2' -down_revision: Union[str, None] = '3a44aa43d35d' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('chats', sa.Column('chat_name', sa.String(), nullable=False)) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_column('chats', 'chat_name') - # ### end Alembic commands ### diff --git a/chat_test/app/migrations/versions/90e16e2ea817_изменения_таблицы_чатов.py b/chat_test/app/migrations/versions/90e16e2ea817_изменения_таблицы_чатов.py deleted file mode 100644 index 1c9666c..0000000 --- a/chat_test/app/migrations/versions/90e16e2ea817_изменения_таблицы_чатов.py +++ /dev/null @@ -1,30 +0,0 @@ -"""Изменения таблицы чатов - -Revision ID: 90e16e2ea817 -Revises: 73241845c54f -Create Date: 2024-02-11 15:22:39.496545 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '90e16e2ea817' -down_revision: Union[str, None] = '73241845c54f' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - pass - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - pass - # ### end Alembic commands ### diff --git a/chat_test/app/migrations/versions/b978b3b7a449_изменения_таблицы_чатов.py b/chat_test/app/migrations/versions/b978b3b7a449_изменения_таблицы_чатов.py deleted file mode 100644 index c995409..0000000 --- a/chat_test/app/migrations/versions/b978b3b7a449_изменения_таблицы_чатов.py +++ /dev/null @@ -1,32 +0,0 @@ -"""Изменения таблицы чатов - -Revision ID: b978b3b7a449 -Revises: 29121de940c3 -Create Date: 2024-02-11 15:37:53.064931 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = 'b978b3b7a449' -down_revision: Union[str, None] = '29121de940c3' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.add_column('chats', sa.Column('created_by', sa.Integer(), nullable=False)) - op.create_foreign_key(None, 'chats', 'users', ['created_by'], ['id']) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'chats', type_='foreignkey') - op.drop_column('chats', 'created_by') - # ### end Alembic commands ### diff --git a/chat_test/app/migrations/versions/3a44aa43d35d_добавлена_таблица_с_кодами_подтверждения.py b/chat_test/app/migrations/versions/c8e41e92e07e_изменения_таблицы_юзеров.py similarity index 80% rename from chat_test/app/migrations/versions/3a44aa43d35d_добавлена_таблица_с_кодами_подтверждения.py rename to chat_test/app/migrations/versions/c8e41e92e07e_изменения_таблицы_юзеров.py index 51cc1ac..8ce67b5 100644 --- a/chat_test/app/migrations/versions/3a44aa43d35d_добавлена_таблица_с_кодами_подтверждения.py +++ b/chat_test/app/migrations/versions/c8e41e92e07e_изменения_таблицы_юзеров.py @@ -1,8 +1,8 @@ -"""Добавлена таблица с кодами подтверждения +"""Изменения таблицы юзеров -Revision ID: 3a44aa43d35d +Revision ID: c8e41e92e07e Revises: -Create Date: 2024-02-10 14:19:16.644002 +Create Date: 2024-02-11 17:13:33.242854 """ from typing import Sequence, Union @@ -12,7 +12,7 @@ import sqlalchemy as sa # revision identifiers, used by Alembic. -revision: str = '3a44aa43d35d' +revision: str = 'c8e41e92e07e' down_revision: Union[str, None] = None branch_labels: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None @@ -25,17 +25,21 @@ def upgrade() -> None: sa.Column('email', sa.String(), nullable=False), sa.Column('username', sa.String(), nullable=False), sa.Column('hashed_password', sa.String(), nullable=False), - sa.Column('role', sa.Integer(), nullable=False), - sa.Column('black_phoenix', sa.Boolean(), nullable=False), - sa.Column('avatar_image', sa.String(), server_default='app/static/images/ты уже пешка BP.png', nullable=True), + sa.Column('role', sa.Integer(), server_default='0', nullable=False), + sa.Column('black_phoenix', sa.Boolean(), server_default='false', nullable=False), + sa.Column('avatar_image', sa.String(), server_default='http://localhost:8000/api/static/images/ты уже пешка BP.png', nullable=True), sa.Column('date_of_birth', sa.Date(), nullable=False), sa.Column('date_of_registration', sa.Date(), server_default=sa.text('now()'), nullable=False), sa.PrimaryKeyConstraint('id') ) op.create_table('chats', sa.Column('id', sa.Integer(), nullable=False), + sa.Column('chat_name', sa.String(), nullable=False), sa.Column('chat_for', sa.Integer(), nullable=True), + sa.Column('visibility', sa.Boolean(), server_default='true', nullable=False), + sa.Column('created_by', sa.Integer(), nullable=False), sa.ForeignKeyConstraint(['chat_for'], ['users.id'], ), + sa.ForeignKeyConstraint(['created_by'], ['users.id'], ), sa.PrimaryKeyConstraint('id') ) op.create_table('usersverificationcodes', diff --git a/chat_test/app/users/chat/models.py b/chat_test/app/users/chat/models.py index d1b22bb..d02813d 100644 --- a/chat_test/app/users/chat/models.py +++ b/chat_test/app/users/chat/models.py @@ -5,8 +5,6 @@ from sqlalchemy import func, ForeignKey, DateTime from sqlalchemy.orm import mapped_column, Mapped, relationship from app.database import Base -# from app.users.models import Users - class Chats(Base): __tablename__ = "chats" diff --git a/chat_test/app/users/models.py b/chat_test/app/users/models.py index b28c9fe..7f702e6 100644 --- a/chat_test/app/users/models.py +++ b/chat_test/app/users/models.py @@ -5,7 +5,7 @@ from sqlalchemy import func, ForeignKey, DateTime from sqlalchemy.orm import mapped_column, Mapped, relationship from app.database import Base -# from app.users.chat.models import Chats + class Users(Base): @@ -15,9 +15,10 @@ class Users(Base): email: Mapped[str] username: Mapped[str] hashed_password: Mapped[str] - role: Mapped[int] - black_phoenix: Mapped[bool] - avatar_image: Mapped[Optional[str]] = mapped_column(server_default='static/images/ты уже пешка BP.png') + role: Mapped[int] = mapped_column(server_default=f'0') + black_phoenix: Mapped[bool] = mapped_column(server_default='false') + avatar_image: Mapped[Optional[str]] = mapped_column( + server_default='http://localhost:8000/api/static/images/ты уже пешка BP.png') date_of_birth: Mapped[date] date_of_registration: Mapped[date] = mapped_column(server_default=func.now()) diff --git a/chat_test/app/users/router.py b/chat_test/app/users/router.py index 8721faf..e40de46 100644 --- a/chat_test/app/users/router.py +++ b/chat_test/app/users/router.py @@ -39,8 +39,6 @@ async def register_user(response: Response, user_data: SUserRegister): hashed_password=hashed_password, username=user_data.username, date_of_birth=user_data.date_of_birth, - role=REGISTRATED_USER, - black_phoenix=False ) result = send_registration_confirmation_email.delay(username=user_data.username, email_to=user_data.email)