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

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

View File

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