Добавлено логирование событий сервиса Members

pkg/members/events.go

+package members
+
+const (
+	EventSet       = "members.set"
+	EventRemove    = "members.remove"
+	EventRemoveAll = "members.remove_all"
+)

pkg/members/middleware/logging_middleware.go

+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
+}

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