From 4eccf1fc545c626e7eba7a4901d4c4957e22418f Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Wed, 3 Apr 2024 09:55:21 +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=20=D0=BE=D1=80?=
=?UTF-8?q?=D0=B3=D0=B0=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/organizations/events.go | 7 ++
.../middleware/logging_middleware.go | 108 ++++++++++++++++++
pkg/organizations/middleware/middleware.go | 2 +-
3 files changed, 116 insertions(+), 1 deletion(-)
create mode 100644 pkg/organizations/events.go
create mode 100644 pkg/organizations/middleware/logging_middleware.go
diff --git a/pkg/organizations/events.go b/pkg/organizations/events.go
new file mode 100644
index 00000000..d477de46
--- /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 00000000..c88108e9
--- /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 906a4c35..83808ec2 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
--
GitLab