permissions 1.1 and hash_password issue solve

This commit is contained in:
2025-10-05 14:43:25 +03:00
parent 6db14b2329
commit f7b39da624
6 changed files with 136 additions and 31 deletions

View File

@@ -0,0 +1,32 @@
"""empty message
Revision ID: 1ee14fd147d8
Revises: f828091b6f7d
Create Date: 2025-10-05 12:59:47.055178
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = '1ee14fd147d8'
down_revision: Union[str, Sequence[str], None] = 'f828091b6f7d'
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('permissions', sa.Column('is_admin', sa.Boolean(), nullable=True))
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('permissions', 'is_admin')
# ### end Alembic commands ###

View File

@@ -0,0 +1,32 @@
"""empty message
Revision ID: f828091b6f7d
Revises: 500009136941
Create Date: 2025-10-05 12:11:47.000416
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = 'f828091b6f7d'
down_revision: Union[str, Sequence[str], None] = '500009136941'
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('permissions', sa.Column('can_view', sa.Boolean(), nullable=True))
# ### end Alembic commands ###
def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('permissions', 'can_view')
# ### end Alembic commands ###

View File

@@ -49,8 +49,10 @@ class Permission(Base):
id = Column(Integer, primary_key=True)
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
can_edit = Column(Boolean, default=False)
can_delete = Column(Boolean, default=False)
can_edit = Column(Boolean, default=True)
can_delete = Column(Boolean, default=True)
can_view = Column(Boolean, default=True)
is_admin = Column(Boolean, default=False)
# обратная связь к User
user = relationship("User", back_populates="permissions")
@@ -79,7 +81,6 @@ async def update_user(user_info, perm_info):
user.description = user_info.description
user.activated = user_info.activated
user.password = hash_password(user_info.password)
perm = user.permissions[0] # если у юзера одна запись - Это связь один-ко-многим: у одного User может быть список из нескольких Permission.
perm.can_edit = perm_info.can_edit
perm.can_delete = perm_info.can_delete