fix: add `avatar_url` to user object in audit log response (#3939)

This commit is contained in:
Colin Adler 2022-09-07 14:22:04 -05:00 committed by GitHub
parent 87379f413f
commit 762063ed8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions

View File

@ -143,6 +143,7 @@ func convertAuditLog(dblog database.GetAuditLogsOffsetRow) codersdk.AuditLog {
CreatedAt: dblog.UserCreatedAt.Time,
Status: codersdk.UserStatus(dblog.UserStatus),
Roles: []codersdk.Role{},
AvatarURL: dblog.UserAvatarUrl.String,
}
for _, roleName := range dblog.UserRoles {

View File

@ -74,6 +74,7 @@ func InitRequest[T Auditable](w http.ResponseWriter, p *RequestParams) (*Request
})
if err != nil {
p.Log.Error(ctx, "export audit log", slog.Error(err))
return
}
}
}

View File

@ -308,7 +308,8 @@ SELECT
users.email AS user_email,
users.created_at AS user_created_at,
users.status AS user_status,
users.rbac_roles AS user_roles
users.rbac_roles AS user_roles,
users.avatar_url AS user_avatar_url
FROM
audit_logs
LEFT JOIN
@ -347,6 +348,7 @@ type GetAuditLogsOffsetRow struct {
UserCreatedAt sql.NullTime `db:"user_created_at" json:"user_created_at"`
UserStatus UserStatus `db:"user_status" json:"user_status"`
UserRoles []string `db:"user_roles" json:"user_roles"`
UserAvatarUrl sql.NullString `db:"user_avatar_url" json:"user_avatar_url"`
}
// GetAuditLogsBefore retrieves `row_limit` number of audit logs before the provided
@ -381,6 +383,7 @@ func (q *sqlQuerier) GetAuditLogsOffset(ctx context.Context, arg GetAuditLogsOff
&i.UserCreatedAt,
&i.UserStatus,
pq.Array(&i.UserRoles),
&i.UserAvatarUrl,
); err != nil {
return nil, err
}

View File

@ -7,7 +7,8 @@ SELECT
users.email AS user_email,
users.created_at AS user_created_at,
users.status AS user_status,
users.rbac_roles AS user_roles
users.rbac_roles AS user_roles,
users.avatar_url AS user_avatar_url
FROM
audit_logs
LEFT JOIN