pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes in TaskOrders.add_officer

Browse Source
This commit is contained in:
dandds 2019-01-08 15:38:40 -05:00
parent 95e7adfcf3
commit ccd75bcaca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atst/domain/task_orders.py
View File

@ -110,25 +110,25 @@ class TaskOrders(object):
( (
member member
for member in workspace.members for member in workspace.members
if member.user.dod_id is officer_data["dod_id"] if member.user.dod_id == officer_data["dod_id"]
), ),
None, None,
) )
if existing_member: if existing_member:
user = existing_member.user workspace_user = existing_member.user
else: else:
member = Workspaces.create_member( member = Workspaces.create_member(
user, workspace, {**officer_data, "workspace_role": "officer"} user, workspace, {**officer_data, "workspace_role": "officer"}
) )
user = member.user workspace_user = member.user
setattr(task_order, officer_type, user) setattr(task_order, officer_type, workspace_user)
db.session.add(task_order) db.session.add(task_order)
db.session.commit() db.session.commit()
return user return workspace_user
else: else:
raise TaskOrderError( raise TaskOrderError(
"{} is not an officer role on task orders".format(officer_type) "{} is not an officer role on task orders".format(officer_type)