darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-09 17:09:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

notify-api-332 rename organisation

Browse Source
This commit is contained in:
Kenneth Kehl
2023-07-10 11:06:29 -07:00
parent 8be3864d7a
commit 4940d5e93b
42 changed files with 1301 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/dao/users_dao.py
View File

@@ -136,12 +136,12 @@ def get_user_and_accounts(user_id):
return User.query.filter(
User.id == user_id
).options(
# eagerly load the user's services and organisations, and also the service's org and vice versa
# eagerly load the user's services and organizations, and also the service's org and vice versa
# (so we can see if the user knows about it)
joinedload('services'),
joinedload('organisations'),
joinedload('organisations.services'),
joinedload('services.organisation'),
joinedload('organizations'),
joinedload('organizations.services'),
joinedload('services.organization'),
).one()
@@ -157,7 +157,7 @@ def dao_archive_user(user):
for service_user in service_users:
db.session.delete(service_user)
user.organisations = []
user.organizations = []
user.auth_type = EMAIL_AUTH_TYPE
user.email_address = get_archived_db_column_value(user.email_address)