diff --git a/pkg/organizations/events.go b/pkg/organizations/events.go new file mode 100644 index 0000000000000000000000000000000000000000..d477de46fe0e9ca360d6d61a080a01c9a6e13163 --- /dev/null +++ b/pkg/organizations/events.go @@ -0,0 +1,7 @@ +package organizations + +const ( + EventCreate = "organizations.create" + EventDelete = "organizations.delete" + EventUpdate = "organizations.update" +) diff --git a/pkg/organizations/middleware/logging_middleware.go b/pkg/organizations/middleware/logging_middleware.go new file mode 100644 index 0000000000000000000000000000000000000000..c88108e93a98466a1f5ddf84b645b93f31caedf9 --- /dev/null +++ b/pkg/organizations/middleware/logging_middleware.go @@ -0,0 +1,108 @@ +package middleware + +import ( + "context" + "git.perx.ru/perxis/perxis-go/id" + "git.perx.ru/perxis/perxis-go/pkg/organizations" + + "git.perx.ru/perxis/perxis-go/pkg/options" + logzap "git.perx.ru/perxis/perxis-go/zap" + "go.uber.org/zap" +) + +type loggingMiddleware struct { + logger *zap.Logger + next organizations.Organizations +} + +func LoggingMiddleware(logger *zap.Logger) Middleware { + return func(next organizations.Organizations) organizations.Organizations { + return &loggingMiddleware{ + next: next, + logger: logger.With(logzap.Component("Organizations")), + } + } +} + +func (m *loggingMiddleware) Create(ctx context.Context, org *organizations.Organization) (created *organizations.Organization, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(organizations.EventCreate), + logzap.Object(org), + ) + + created, err = m.next.Create(ctx, org) + if err != nil { + logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("Organization created", logzap.Channels(logzap.Userlog)) + + return created, err +} + +func (m *loggingMiddleware) Delete(ctx context.Context, orgId string) (err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(organizations.EventDelete), + logzap.Object(id.NewOrganizationId(orgId)), + ) + + err = m.next.Delete(ctx, orgId) + if err != nil { + logger.Error("Failed to delete", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("Organization deleted", logzap.Channels(logzap.Userlog)) + + return err +} + +func (m *loggingMiddleware) Find(ctx context.Context, filter *organizations.Filter, opts *options.FindOptions) (orgs []*organizations.Organization, total int, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + ) + + orgs, total, err = m.next.Find(ctx, filter, opts) + if err != nil { + logger.Error("Failed to find", zap.Error(err)) + return + } + + return orgs, total, err +} + +func (m *loggingMiddleware) Get(ctx context.Context, orgId string) (org *organizations.Organization, err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Object(id.NewOrganizationId(orgId)), + ) + + org, err = m.next.Get(ctx, orgId) + if err != nil { + logger.Error("Failed to get", zap.Error(err)) + return + } + + return org, err +} + +func (m *loggingMiddleware) Update(ctx context.Context, org *organizations.Organization) (err error) { + logger := m.logger.With( + logzap.Caller(ctx), + logzap.Event(organizations.EventUpdate), + logzap.Object(org), + ) + + err = m.next.Update(ctx, org) + if err != nil { + logger.Error("Failed to update", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog)) + return + } + + logger.Info("Organization updated", logzap.Channels(logzap.Userlog)) + + return err +} diff --git a/pkg/organizations/middleware/middleware.go b/pkg/organizations/middleware/middleware.go index 906a4c356b434fa2926a3e970bf0f32d0c0fa936..83808ec26d317f68a07b7b49c772911be1381fcb 100644 --- a/pkg/organizations/middleware/middleware.go +++ b/pkg/organizations/middleware/middleware.go @@ -21,7 +21,7 @@ func WithLog(s organizations.Organizations, logger *zap.Logger, log_access bool) if log_access { s = AccessLoggingMiddleware(logger)(s) } - s = ErrorLoggingMiddleware(logger)(s) + s = LoggingMiddleware(logger)(s) s = RecoveringMiddleware(logger)(s) return s