darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove users relationship in organisations

Browse Source
This commit is contained in:
Rebecca Law
2018-02-23 13:36:42 +00:00
parent 7c44171a40
commit 446e76f1f3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/dao/organisation_dao.py
View File

@@ -54,7 +54,7 @@ def dao_get_invited_organisation_user(user_id):
def dao_get_users_for_organisation(organisation_id):
return User.query.filter(
User.user_to_organisation.any(id=organisation_id),
User.organisations.any(id=organisation_id),
User.state == 'active'
).order_by(User.created_at).all()
@@ -63,6 +63,6 @@ def dao_get_users_for_organisation(organisation_id):
def dao_add_user_to_organisation(organisation_id, user_id):
organisation = dao_get_organisation_by_id(organisation_id)
user = User.query.filter_by(id=user_id).one()
organisation.users.append(user)
user.organisations.append(organisation)
db.session.add(organisation)
return user