From a48b814263f0721d82b50f5c80ff9553b086ac71 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 8 Jan 2019 15:00:41 -0500 Subject: [PATCH] Update query to also return events that update the workspace --- atst/domain/audit_log.py | 9 ++++++++- tests/domain/test_audit_log.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/atst/domain/audit_log.py b/atst/domain/audit_log.py index 41d931fa..00bbba17 100644 --- a/atst/domain/audit_log.py +++ b/atst/domain/audit_log.py @@ -1,3 +1,5 @@ +from sqlalchemy import or_ + from atst.database import db from atst.domain.common import Query from atst.domain.authz import Authorization, Permissions @@ -16,7 +18,12 @@ class AuditEventQuery(Query): def get_ws_events(cls, workspace_id, pagination_opts): query = ( 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()) ) return cls.paginate(query, pagination_opts) diff --git a/tests/domain/test_audit_log.py b/tests/domain/test_audit_log.py index dcda0eab..45d382cd 100644 --- a/tests/domain/test_audit_log.py +++ b/tests/domain/test_audit_log.py @@ -99,4 +99,4 @@ def test_ws_audit_log_only_includes_current_ws_events(): events = AuditLog.get_workspace_events(workspace.owner, workspace) for event in events: - assert event.workspace_id == workspace.id + assert event.workspace_id == workspace.id or event.resource_id == workspace.id