diff --git a/pkg/users/events.go b/pkg/users/events.go new file mode 100644 index 0000000000000000000000000000000000000000..c262c017afe6146e1b7c91e031d5575c381c3cc6 --- /dev/null +++ b/pkg/users/events.go @@ -0,0 +1,7 @@ +package users + +const ( + EventCreate = "users.create" + EventUpdate = "users.update" + EventDelete = "users.delete" +) diff --git a/pkg/users/middleware/logging_middleware.go b/pkg/users/middleware/logging_middleware.go new file mode 100644 index 0000000000000000000000000000000000000000..5fb8f82aad74e0d3c38d1e2a53c1abbd8809e5ad --- /dev/null +++ b/pkg/users/middleware/logging_middleware.go @@ -0,0 +1,122 @@ +package middleware + +import ( + "context" + + "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/pkg/options" + "git.perx.ru/perxis/perxis-go/pkg/users" + logzap "git.perx.ru/perxis/perxis-go/zap" + "go.uber.org/zap" +) + +type loggingMiddleware struct { + logger *zap.Logger + next users.Users +} + +func LoggingMiddleware(logger *zap.Logger) Middleware { + return func(next users.Users) users.Users { + return &loggingMiddleware{ + next: next, + logger: logger.With(logzap.Component("Users")), + } + } +} + +func (m *loggingMiddleware) Create(ctx context.Context, create *users.User) (user *users.User, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(users.EventCreate), + logzap.Object(user), + ) + + user, err = m.next.Create(ctx, create) + if err != nil { + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("User created", logzap.Channels(logzap.Userlog)) + + return user, err +} + +func (m *loggingMiddleware) Get(ctx context.Context, userId string) (user *users.User, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Object(id.NewUserId(userId)), + ) + + user, err = m.next.Get(ctx, userId) + if err != nil { + logger.Error("Failed to get", zap.Error(err)) + return + } + + return user, err +} + +func (m *loggingMiddleware) Find(ctx context.Context, filter *users.Filter, options *options.FindOptions) (found []*users.User, total int, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + ) + + found, total, err = m.next.Find(ctx, filter, options) + if err != nil { + logger.Error("Failed to find", zap.Error(err)) + return + } + + return found, total, err +} + +func (m *loggingMiddleware) Update(ctx context.Context, update *users.User) (err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(users.EventUpdate), + logzap.Object(update), + ) + + err = m.next.Update(ctx, update) + if err != nil { + logger.Error("Failed to update", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("User updated", logzap.Channels(logzap.Userlog)) + + return err +} + +func (m *loggingMiddleware) Delete(ctx context.Context, userId string) (err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(users.EventDelete), + logzap.Object(id.NewUserId(userId)), + ) + + err = m.next.Delete(ctx, userId) + if err != nil { + logger.Error("Failed to delete", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("User deleted", logzap.Channels(logzap.Userlog)) + + return err +} + +func (m *loggingMiddleware) GetByIdentity(ctx context.Context, identity string) (user *users.User, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Object(id.NewUserId(identity)), + ) + + user, err = m.next.GetByIdentity(ctx, identity) + if err != nil { + logger.Error("Failed to get by identity", zap.Error(err)) + return + } + return user, err +} diff --git a/pkg/users/middleware/middleware.go b/pkg/users/middleware/middleware.go index d94190827de3028c96000df15bf06c719e30cf92..ed64ceeddae0ab089c1746356ece1d85a0c69e83 100644 --- a/pkg/users/middleware/middleware.go +++ b/pkg/users/middleware/middleware.go @@ -21,7 +21,7 @@ func WithLog(s users.Users, logger *zap.Logger, log_access bool) users.Users { if log_access { s = AccessLoggingMiddleware(logger)(s) } - s = ErrorLoggingMiddleware(logger)(s) + s = LoggingMiddleware(logger)(s) s = RecoveringMiddleware(logger)(s) return s