From 870929afd6cfffd1a4bbb7bab2c92382a2dba8df Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 24 Sep 2018 10:51:49 -0400 Subject: [PATCH] Rename resource_name to resource_type --- alembic/versions/875841fac207_add_audit_events_table.py | 2 +- atst/domain/audit_log.py | 6 +++--- atst/models/audit_event.py | 4 ++-- atst/models/mixins/auditable.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alembic/versions/875841fac207_add_audit_events_table.py b/alembic/versions/875841fac207_add_audit_events_table.py index 8341fc68..eecbbd29 100644 --- a/alembic/versions/875841fac207_add_audit_events_table.py +++ b/alembic/versions/875841fac207_add_audit_events_table.py @@ -23,7 +23,7 @@ def upgrade(): sa.Column('time_updated', sa.TIMESTAMP(timezone=True), server_default=sa.text('now()'), nullable=False), sa.Column('id', postgresql.UUID(as_uuid=True), server_default=sa.text('uuid_generate_v4()'), nullable=False), sa.Column('user_id', postgresql.UUID(as_uuid=True), nullable=True), - sa.Column('resource_name', sa.String(), nullable=False), + sa.Column('resource_type', sa.String(), nullable=False), sa.Column('resource_id', postgresql.UUID(as_uuid=True), nullable=False), sa.Column('action', sa.String(), nullable=False), sa.Column('workspace_id', postgresql.UUID(as_uuid=True), nullable=True), diff --git a/atst/domain/audit_log.py b/atst/domain/audit_log.py index 6a656b07..238cff2e 100644 --- a/atst/domain/audit_log.py +++ b/atst/domain/audit_log.py @@ -35,19 +35,19 @@ class AuditLog(object): return AuditEventQuery.get_all() @classmethod - def _resource_name(cls, resource): + def _resource_type(cls, resource): return type(resource).__name__.lower() @classmethod def _log(cls, user=None, workspace_id=None, resource=None, action=None): resource_id = resource.id if resource else None - resource_name = cls._resource_name(resource) if resource else None + resource_type = cls._resource_type(resource) if resource else None audit_event = AuditEventQuery.create( user=user, workspace_id=workspace_id, resource_id=resource_id, - resource_name=resource_name, + resource_type=resource_type, action=action, ) return AuditEventQuery.add_and_commit(audit_event) diff --git a/atst/models/audit_event.py b/atst/models/audit_event.py index 52a88cf6..288704a7 100644 --- a/atst/models/audit_event.py +++ b/atst/models/audit_event.py @@ -17,13 +17,13 @@ class AuditEvent(Base, TimestampsMixin): workspace_id = Column(UUID(as_uuid=True), ForeignKey("workspaces.id"), index=True) workspace = relationship("Workspace", backref="audit_events") - resource_name = Column(String(), nullable=False) + resource_type = Column(String(), nullable=False) resource_id = Column(UUID(as_uuid=True), index=True, nullable=False) action = Column(String(), nullable=False) def __str__(self): full_action = "{} on {} {}".format( - self.action, self.resource_name, self.resource_id + self.action, self.resource_type, self.resource_id ) if self.user and self.workspace: diff --git a/atst/models/mixins/auditable.py b/atst/models/mixins/auditable.py index 0758fa10..285bd17c 100644 --- a/atst/models/mixins/auditable.py +++ b/atst/models/mixins/auditable.py @@ -26,12 +26,12 @@ class AuditableMixin(object): def create_audit_event(connection, resource, action): user_id = getattr_path(g, "current_user.id") workspace_id = resource.auditable_workspace_id() - resource_name = resource.auditable_resource_name() + resource_type = resource.auditable_resource_type() audit_event = AuditEvent( user_id=user_id, workspace_id=workspace_id, - resource_name=resource_name, + resource_type=resource_type, resource_id=resource.id, action=action, ) @@ -58,7 +58,7 @@ class AuditableMixin(object): def audit_update(mapper, connection, target): target.create_audit_event(connection, target, ACTION_UPDATE) - def auditable_resource_name(self): + def auditable_resource_type(self): return camel_to_snake(type(self).__name__) def auditable_workspace_id(self):