Изменения БД
This commit is contained in:
parent
3c799bb2ec
commit
3087547867
9 changed files with 16 additions and 167 deletions
|
|
@ -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 ###
|
||||
|
|
@ -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 ###
|
||||
|
|
@ -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 ###
|
||||
|
|
@ -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 ###
|
||||
|
|
@ -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 ###
|
||||
|
|
@ -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',
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue