Skip to content

Commit

Permalink
Keep groups after user delete
Browse files Browse the repository at this point in the history
  • Loading branch information
DaymasS committed Sep 17, 2024
1 parent 7b060c0 commit d261987
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 13 deletions.
10 changes: 0 additions & 10 deletions auth_backend/routes/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,6 @@ async def delete_user(
# Удаляем AuthMethod
AuthMethod.delete(method.id, session=db.session)
logger.info(f'{method=} for {user.id=} deleted')

for group in user.groups:
if group.is_deleted:
continue
user_group: UserGroup = (
UserGroup.query(session=db.session)
.filter(UserGroup.group_id == group.id, UserGroup.user_id == user_id)
.one()
)
UserGroup.delete(user_group.id, session=db.session)
User.delete(user_id, session=db.session)
db.session.commit()
await AuthPluginMeta.user_updated(None, old_user)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fastapi
fastapi-sqlalchemy
psycopg2-binary
pydantic==2.8.2
pydantic
uvicorn
alembic
SQLAlchemy
Expand Down
2 changes: 0 additions & 2 deletions tests/test_routes/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ def test_delete_user(client: TestClient, dbsession: Session, user_factory):
assert resp.status_code == 200
user = dbsession.query(User).filter(User.id == user1).one_or_none()
assert user.is_deleted
user_group = dbsession.query(UserGroup).filter(UserGroup.group_id == group).one_or_none()
assert user_group.is_deleted
dbsession.delete(email_user)
dbsession.query(GroupScope).filter(GroupScope.group_id == group).delete()
dbsession.query(UserGroup).filter(UserGroup.group_id == group).delete()
Expand Down

0 comments on commit d261987

Please sign in to comment.