darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-22 08:21:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2394 from alphagov/fix-remove-user-from-service-folder-integrity-error

Browse Source 
Change dao_remove_user_from_service query to avoid IntegrityError
This commit is contained in:
Alexey Bezhan
2019-03-14 10:54:03 +00:00
committed by GitHub
parent aee7dfefb6 6dc93ffd08
commit 2825c3d384
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/dao/services_dao.py
View File

@@ -228,11 +228,7 @@ def dao_remove_user_from_service(service, user):
permission_dao.remove_user_service_permissions(user, service) permission_dao.remove_user_service_permissions(user, service)
service_user = dao_get_service_user(user.id, service.id) service_user = dao_get_service_user(user.id, service.id)
service_user.folders = [] db.session.delete(service_user)
service.users.remove(user)
db.session.add_all([service, service_user])
except Exception as e: except Exception as e:
db.session.rollback() db.session.rollback()
raise e raise e