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

Add application_id column to AuditEvent

Browse Source 
Use application_id and portfolio_id if the resource is a portfolio in AuditableMixin
Clean up some residual references to workspace
This commit is contained in:
leigh-mil
2019-05-15 18:14:26 -04:00
parent 42900a20a6
commit b3ecd1658c
5 changed files with 83 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
atst/domain/audit_log.py
View File

@@ -14,15 +14,10 @@ class AuditEventQuery(Query):
return cls.paginate(query, pagination_opts)
@classmethod
def get_ws_events(cls, portfolio_id, pagination_opts):
def get_portfolio_events(cls, portfolio_id, pagination_opts):
query = (
db.session.query(cls.model)
.filter(
or_(
cls.model.portfolio_id == portfolio_id,
cls.model.resource_id == portfolio_id,
)
)
.filter(cls.model.portfolio_id == portfolio_id)
.order_by(cls.model.time_created.desc())
)
return cls.paginate(query, pagination_opts)
@@ -39,7 +34,8 @@ class AuditLog(object):
@classmethod
def get_portfolio_events(cls, portfolio, pagination_opts=None):
return AuditEventQuery.get_ws_events(portfolio.id, pagination_opts)
return AuditEventQuery.get_portfolio_events(portfolio.id, pagination_opts)
@classmethod
def get_by_resource(cls, resource_id):