From 656bc433cbe09fc51f45525edcabf53d114aead6 Mon Sep 17 00:00:00 2001
From: Alex Petraky <petraky@perx.ru>
Date: Tue, 2 Apr 2024 12:37:48 +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=20Members?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/members/events.go | 7 ++
pkg/members/middleware/logging_middleware.go | 122 +++++++++++++++++++
pkg/members/middleware/middleware.go | 2 +-
3 files changed, 130 insertions(+), 1 deletion(-)
create mode 100644 pkg/members/events.go
create mode 100644 pkg/members/middleware/logging_middleware.go
diff --git a/pkg/members/events.go b/pkg/members/events.go
new file mode 100644
index 00000000..5fef6d77
--- /dev/null
+++ b/pkg/members/events.go
@@ -0,0 +1,7 @@
+package members
+
+const (
+ EventSet = "members.set"
+ EventRemove = "members.remove"
+ EventRemoveAll = "members.remove_all"
+)
diff --git a/pkg/members/middleware/logging_middleware.go b/pkg/members/middleware/logging_middleware.go
new file mode 100644
index 00000000..960530e5
--- /dev/null
+++ b/pkg/members/middleware/logging_middleware.go
@@ -0,0 +1,122 @@
+package middleware
+
+import (
+ "context"
+ "fmt"
+
+ "git.perx.ru/perxis/perxis-go/id"
+ "git.perx.ru/perxis/perxis-go/pkg/members"
+ logzap "git.perx.ru/perxis/perxis-go/zap"
+ "go.uber.org/zap"
+)
+
+type loggingMiddleware struct {
+ logger *zap.Logger
+ next members.Members
+}
+
+func LoggingMiddleware(logger *zap.Logger) Middleware {
+ return func(next members.Members) members.Members {
+ return &loggingMiddleware{
+ next: next,
+ logger: logger.With(logzap.Component("Members")),
+ }
+ }
+}
+
+func (m *loggingMiddleware) Set(ctx context.Context, orgId, userId string, role members.Role) (err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Event(members.EventSet),
+ logzap.Object(id.NewOrganizationId(orgId)),
+ )
+
+ err = m.next.Set(ctx, orgId, userId, role)
+ if err != nil {
+ logger.Error("Failed to set", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), zap.String("UserID", userId), zap.String("Role", fmt.Sprintf("%s", role)))
+ return
+ }
+
+ logger.Info("Member set", logzap.Channels(logzap.Userlog), zap.String("UserID", userId), zap.String("Role", fmt.Sprintf("%s", role)))
+
+ return err
+}
+
+func (m *loggingMiddleware) Get(ctx context.Context, orgId, userId string) (role members.Role, err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Object(id.NewRoleId(orgId, userId)),
+ )
+
+ role, err = m.next.Get(ctx, orgId, userId)
+ if err != nil {
+ logger.Error("Failed to get", zap.Error(err))
+ return
+ }
+
+ return role, err
+}
+
+func (m *loggingMiddleware) Remove(ctx context.Context, orgId, userId string) (err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Event(members.EventRemove),
+ logzap.Object(id.NewOrganizationId(orgId)),
+ )
+
+ err = m.next.Remove(ctx, orgId, userId)
+ if err != nil {
+ logger.Error("Failed to remove", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("Member removed", logzap.Channels(logzap.Userlog))
+
+ return err
+}
+
+func (m *loggingMiddleware) RemoveAll(ctx context.Context, orgId string) (err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ logzap.Event(members.EventRemoveAll),
+ logzap.Object(id.NewOrganizationId(orgId)),
+ )
+
+ err = m.next.RemoveAll(ctx, orgId)
+ if err != nil {
+ logger.Error("Failed to remove all", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+ return
+ }
+
+ logger.Info("All members removed", logzap.Channels(logzap.Userlog))
+
+ return err
+}
+
+func (m *loggingMiddleware) ListMembers(ctx context.Context, orgId string) (members []*members.Member, err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ )
+
+ members, err = m.next.ListMembers(ctx, orgId)
+ if err != nil {
+ logger.Error("Failed to list members", zap.Error(err))
+ return
+ }
+
+ return members, err
+}
+
+func (m *loggingMiddleware) ListOrganizations(ctx context.Context, userId string) (organizations []*members.Member, err error) {
+ logger := m.logger.With(
+ logzap.Caller(ctx),
+ )
+
+ organizations, err = m.next.ListOrganizations(ctx, userId)
+ if err != nil {
+ logger.Error("Failed to list organizations", zap.Error(err))
+ return
+ }
+
+ return organizations, err
+}
diff --git a/pkg/members/middleware/middleware.go b/pkg/members/middleware/middleware.go
index bb491623..04626790 100644
--- a/pkg/members/middleware/middleware.go
+++ b/pkg/members/middleware/middleware.go
@@ -21,7 +21,7 @@ func WithLog(s members.Members, logger *zap.Logger, log_access bool) members.Mem
if log_access {
s = AccessLoggingMiddleware(logger)(s)
}
- s = ErrorLoggingMiddleware(logger)(s)
+ s = LoggingMiddleware(logger)(s)
s = RecoveringMiddleware(logger)(s)
return s
--
GitLab