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

capture status and no history cases on workspace role model

Browse Source
This commit is contained in:
Montana 2018-11-13 11:21:12 -05:00
parent adad5adfa6
commit e51de11a28
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atst/models/workspace_role.py
View File

@ -45,10 +45,15 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
@property @property
def history(self): def history(self):
previous_state = mixins.AuditableMixin.get_history(self) previous_state = mixins.AuditableMixin.get_history(self)
from_role_id = previous_state["role_id"] auditable_previous_state = {}
from_role = db.session.query(Role).filter(Role.id == from_role_id).one() if "role_id" in previous_state:
to_role = self.role_displayname from_role_id = previous_state["role_id"]
return {"role": [from_role.display_name, to_role]} from_role = db.session.query(Role).filter(Role.id == from_role_id).one()
to_role = self.role_displayname
auditable_previous_state["role"] = [from_role.display_name, to_role]
if "status" in previous_state:
auditable_previous_state["status"]= previous_state["status"].value
return auditable_previous_state
@property @property
def event_details(self): def event_details(self):

1
tests/factories.py
View File

@ -326,6 +326,7 @@ class WorkspaceRoleFactory(Base):
workspace = factory.SubFactory(WorkspaceFactory) workspace = factory.SubFactory(WorkspaceFactory)
role = factory.SubFactory(RoleFactory) role = factory.SubFactory(RoleFactory)
user = factory.SubFactory(UserFactory) user = factory.SubFactory(UserFactory)
status = WorkspaceRoleStatus.PENDING
class EnvironmentRoleFactory(Base): class EnvironmentRoleFactory(Base):