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

Update query to also return events that update the workspace

Browse Source
This commit is contained in:
leigh-mil 2019-01-08 15:00:41 -05:00
parent 466f2565b5
commit a48b814263
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
atst/domain/audit_log.py
View File

@ -1,3 +1,5 @@
from sqlalchemy import or_
from atst.database import db from atst.database import db
from atst.domain.common import Query from atst.domain.common import Query
from atst.domain.authz import Authorization, Permissions from atst.domain.authz import Authorization, Permissions
@ -16,7 +18,12 @@ class AuditEventQuery(Query):
def get_ws_events(cls, workspace_id, pagination_opts): def get_ws_events(cls, workspace_id, pagination_opts):
query = ( query = (
db.session.query(cls.model) db.session.query(cls.model)
.filter(cls.model.workspace_id == workspace_id) .filter(
or_(
cls.model.workspace_id == workspace_id,
cls.model.resource_id == workspace_id,
)
)
.order_by(cls.model.time_created.desc()) .order_by(cls.model.time_created.desc())
) )
return cls.paginate(query, pagination_opts) return cls.paginate(query, pagination_opts)

2
tests/domain/test_audit_log.py
View File

@ -99,4 +99,4 @@ def test_ws_audit_log_only_includes_current_ws_events():
events = AuditLog.get_workspace_events(workspace.owner, workspace) events = AuditLog.get_workspace_events(workspace.owner, workspace)
for event in events: for event in events:
assert event.workspace_id == workspace.id assert event.workspace_id == workspace.id or event.resource_id == workspace.id