Merge pull request #485 from dod-ccpo/sample-data-fix

Sample data fix
This commit is contained in:
dandds 2018-12-10 12:12:49 -05:00 committed by GitHub
commit 6509c5a249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions

View File

@ -97,7 +97,10 @@ class WorkspaceRoles(object):
new_workspace_role.role = role
except NoResultFound:
new_workspace_role = WorkspaceRole(
user=user, role_id=role.id, workspace_id=workspace_id
user=user,
role_id=role.id,
workspace_id=workspace_id,
status=WorkspaceRoleStatus.PENDING,
)
user.workspace_roles.append(new_workspace_role)

View File

@ -101,11 +101,6 @@ def remove_sample_data(all_users=False):
.filter(AuditEvent.request_id.in_([r.id for r in requests]))
.all()
)
request_audit = (
db.session.query(AuditEvent)
.filter(AuditEvent.request_id.in_([r.id for r in requests]))
.all()
)
events = [ev for r in requests for ev in r.status_events]
revisions = [rev for r in requests for rev in r.revisions]
workspaces = [r.workspace for r in requests if r.workspace]
@ -115,6 +110,7 @@ def remove_sample_data(all_users=False):
.all()
)
workspace_roles = [role for workspace in workspaces for role in workspace.roles]
invites = [invite for role in workspace_roles for invite in role.invitations]
projects = [p for workspace in workspaces for p in workspace.projects]
environments = (
db.session.query(Environment)
@ -127,6 +123,7 @@ def remove_sample_data(all_users=False):
roles,
environments,
projects,
invites,
workspace_roles,
ws_audit,
events,

View File

@ -112,6 +112,7 @@ def seed_db():
)
for workspace_role in WORKSPACE_USERS:
ws_role = Workspaces.create_member(user, workspace, workspace_role)
db.session.refresh(ws_role)
WorkspaceRoles.enable(ws_role)
for workspace_role in WORKSPACE_INVITED_USERS: