From c73824ced0cabd2fde06e23e96d40ef4fe8823fa Mon Sep 17 00:00:00 2001
From: Alex Petraky <petraky@perx.ru>
Date: Tue, 2 Apr 2024 12:39:27 +0000
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=BE=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
=?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9?=
=?UTF-8?q?=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=B0=20Roles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/roles/events.go | 7 ++
pkg/roles/middleware/logging_middleware.go | 107 +++++++++++++++++++++
pkg/roles/middleware/middleware.go | 2 +-
3 files changed, 115 insertions(+), 1 deletion(-)
create mode 100644 pkg/roles/events.go
create mode 100644 pkg/roles/middleware/logging_middleware.go
diff --git a/pkg/roles/events.go b/pkg/roles/events.go
new file mode 100644
index 00000000..c12631af
--- /dev/null
+++ b/pkg/roles/events.go
@@ -0,0 +1,7 @@
+package roles
+
+const (
+ EventCreate = "roles.create"
+ EventUpdate = "roles.update"
+ EventDelete = "roles.delete"
+)
diff --git a/pkg/roles/middleware/logging_middleware.go b/pkg/roles/middleware/logging_middleware.go
new file mode 100644
index 00000000..5f564bff
--- /dev/null
+++ b/pkg/roles/middleware/logging_middleware.go
@@ -0,0 +1,107 @@
+package middleware
+
+import (
+ "context"
+
+ "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/pkg/roles"
+ logzap "git.perx.ru/perxis/perxis-go/zap"
+ "go.uber.org/zap"
+)
+
+type loggingMiddleware struct {
+ logger *zap.Logger
+ next roles.Roles
+}
+
+func LoggingMiddleware(logger *zap.Logger) Middleware {
+ return func(next roles.Roles) roles.Roles {
+ return &loggingMiddleware{
+ next: next,
+ logger: logger.With(logzap.Component("Roles")),
+ }
+ }
+}
+
+func (m *loggingMiddleware) Create(ctx context.Context, role *roles.Role) (created *roles.Role, err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Event(roles.EventCreate),
+ logzap.Object(role),
+ )
+
+ created, err = m.next.Create(ctx, role)
+ if err != nil {
+ logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Role created", logzap.Channels(logzap.Userlog))
+
+ return created, err
+}
+
+func (m *loggingMiddleware) Get(ctx context.Context, spaceId, roleId string) (role *roles.Role, err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Object(id.NewRoleId(spaceId, roleId)),
+ )
+
+ role, err = m.next.Get(ctx, spaceId, roleId)
+ if err != nil {
+ logger.Error("Failed to get", zap.Error(err))
+ return
+ }
+
+ return role, err
+}
+
+func (m *loggingMiddleware) List(ctx context.Context, spaceId string) (roles []*roles.Role, err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ )
+
+ roles, err = m.next.List(ctx, spaceId)
+ if err != nil {
+ logger.Error("Failed to list", zap.Error(err))
+ return
+ }
+
+ return roles, err
+}
+
+func (m *loggingMiddleware) Update(ctx context.Context, role *roles.Role) (err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Event(roles.EventUpdate),
+ logzap.Object(role),
+ )
+
+ err = m.next.Update(ctx, role)
+ if err != nil {
+ logger.Error("Failed to update", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Role updated", logzap.Channels(logzap.Userlog))
+
+ return err
+}
+
+func (m *loggingMiddleware) Delete(ctx context.Context, spaceId, roleId string) (err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Event(roles.EventDelete),
+ logzap.Object(id.NewRoleId(spaceId, roleId)),
+ )
+
+ err = m.next.Delete(ctx, spaceId, roleId)
+ if err != nil {
+ logger.Error("Failed to delete", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Role deleted", logzap.Channels(logzap.Userlog))
+
+ return err
+}
diff --git a/pkg/roles/middleware/middleware.go b/pkg/roles/middleware/middleware.go
index aaeb2da8..299199a4 100644
--- a/pkg/roles/middleware/middleware.go
+++ b/pkg/roles/middleware/middleware.go
@@ -21,7 +21,7 @@ func WithLog(s roles.Roles, logger *zap.Logger, log_access bool) roles.Roles {
if log_access {
s = AccessLoggingMiddleware(logger)(s)
}
- s = ErrorLoggingMiddleware(logger)(s)
+ s = LoggingMiddleware(logger)(s)
s = RecoveringMiddleware(logger)(s)
return s
--
GitLab