From d261987fbbc2cdda1c772baffbbc26d673964190 Mon Sep 17 00:00:00 2001 From: Timur Enikeev Date: Tue, 17 Sep 2024 14:11:29 -0400 Subject: [PATCH] Keep groups after user delete --- auth_backend/routes/user.py | 10 ---------- requirements.txt | 2 +- tests/test_routes/test_user.py | 2 -- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/auth_backend/routes/user.py b/auth_backend/routes/user.py index 5c2afc84..c9227479 100644 --- a/auth_backend/routes/user.py +++ b/auth_backend/routes/user.py @@ -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) diff --git a/requirements.txt b/requirements.txt index ee60901e..db19b3a6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ fastapi fastapi-sqlalchemy psycopg2-binary -pydantic==2.8.2 +pydantic uvicorn alembic SQLAlchemy diff --git a/tests/test_routes/test_user.py b/tests/test_routes/test_user.py index 3ac74e18..ceea0d8c 100644 --- a/tests/test_routes/test_user.py +++ b/tests/test_routes/test_user.py @@ -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()