From cacce1f383f784630221f184e08f41ef16534d2f Mon Sep 17 00:00:00 2001
From: ko_oler <kooler89@gmail.com>
Date: Wed, 6 Mar 2024 11:32:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
=?UTF-8?q?=D1=8B=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
=?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
logs/zap/entry_encoder_test.go | 8 ++--
logs/zap/example_test.go | 8 ++--
pkg/items/events.go | 56 +++++++++++-----------
pkg/items/middleware/logging_middleware.go | 16 +++----
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/logs/zap/entry_encoder_test.go b/logs/zap/entry_encoder_test.go
index 8e429674..c8365670 100644
--- a/logs/zap/entry_encoder_test.go
+++ b/logs/zap/entry_encoder_test.go
@@ -68,7 +68,7 @@ func TestEntryEncoder_EncodeEntry(t *testing.T) {
func BenchmarkEntryEncoderSimple(b *testing.B) {
fields := []zapcore.Field{
- logzap.Event(items.EventItemCreate),
+ logzap.Event(items.EventCreate),
logzap.Object(items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)),
logzap.Caller("/system"),
logzap.Tags("tag1", "tag2", "tag3"),
@@ -82,7 +82,7 @@ func BenchmarkEntryEncoderSimple(b *testing.B) {
func BenchmarkEntryEncoderUnknownFields(b *testing.B) {
fields := []zapcore.Field{
- logzap.Event(items.EventItemCreate),
+ logzap.Event(items.EventCreate),
logzap.Object(items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)),
logzap.Caller("/system"),
logzap.Tags("tag1", "tag2", "tag3"),
@@ -100,7 +100,7 @@ func BenchmarkEntryEncoderUnknownFields(b *testing.B) {
func BenchmarkEntryEncoderV2Simple(b *testing.B) {
fields := []zapcore.Field{
- logzap.Event(items.EventItemCreate),
+ logzap.Event(items.EventCreate),
logzap.Object(items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)),
logzap.Caller("/system"),
logzap.Tags("tag1", "tag2", "tag3"),
@@ -114,7 +114,7 @@ func BenchmarkEntryEncoderV2Simple(b *testing.B) {
func BenchmarkEntryEncoderV2UnknownFields(b *testing.B) {
fields := []zapcore.Field{
- logzap.Event(items.EventItemCreate),
+ logzap.Event(items.EventCreate),
logzap.Object(items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)),
logzap.Caller("/system"),
logzap.Tags("tag1", "tag2", "tag3"),
diff --git a/logs/zap/example_test.go b/logs/zap/example_test.go
index f6d7c69d..7e27fa30 100644
--- a/logs/zap/example_test.go
+++ b/logs/zap/example_test.go
@@ -29,7 +29,7 @@ func TestExample(t *testing.T) {
Level: logs.Level(zapcore.InfoLevel),
Message: "Item created",
Component: "Items",
- Event: items.EventItemCreate,
+ Event: items.EventCreate,
ObjectID: id.MustObjectId(item),
CallerID: id.MustObjectId(user),
Tags: []string{"tag1", "tag2", "tag3"},
@@ -38,7 +38,7 @@ func TestExample(t *testing.T) {
Level: logs.Level(zapcore.WarnLevel),
Message: "Item updated",
Component: "Items",
- Event: items.EventItemUpdate,
+ Event: items.EventUpdate,
ObjectID: id.MustObjectId(item),
CallerID: id.MustObjectId(user),
Attr: map[string]map[string]any{"title": {"old": "old title", "new": "new title"}},
@@ -75,7 +75,7 @@ func TestExample(t *testing.T) {
// Отправка лога при создании item
logger.Info("Item created",
- logzap.Event(items.EventItemCreate),
+ logzap.Event(items.EventCreate),
logzap.Object(item),
logzap.CallerFromContext(ctx, item.SpaceID),
logzap.Tags("tag1", "tag2", "tag3"),
@@ -83,7 +83,7 @@ func TestExample(t *testing.T) {
// Отправка лога при обновлении item
logger.Warn("Item updated",
- logzap.Event(items.EventItemUpdate),
+ logzap.Event(items.EventUpdate),
logzap.Object(item),
logzap.CallerFromContext(ctx, item.SpaceID),
logzap.Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}),
diff --git a/pkg/items/events.go b/pkg/items/events.go
index fe250663..40e07df2 100644
--- a/pkg/items/events.go
+++ b/pkg/items/events.go
@@ -7,14 +7,14 @@ import (
)
const (
- EventItemCreate = "item.create"
- EventItemUpdate = "item.update"
- EventItemPublish = "item.publish"
- EventItemUnpublish = "item.unpublish"
- EventItemDelete = "item.delete"
- EventItemUndelete = "item.undelete"
- EventItemArchive = "item.archive"
- EventItemUnarchive = "item.unarchive"
+ EventCreate = "item.create"
+ EventUpdate = "item.update"
+ EventPublish = "item.publish"
+ EventUnpublish = "item.unpublish"
+ EventDelete = "item.delete"
+ EventUndelete = "item.undelete"
+ EventArchive = "item.archive"
+ EventUnarchive = "item.unarchive"
DefaultEventSubject = "content.{{.EventType}}.{{.SpaceID}}.{{.EnvID}}.{{.CollectionID}}.{{.ItemID}}"
)
@@ -25,21 +25,21 @@ var (
}
)
-type EventCreate struct {
+type EventCreateInfo struct {
SpaceID string
EnvID string
CollectionID string
ItemID string
}
-func (e EventCreate) ToProto() (proto.Message, error) {
+func (e EventCreateInfo) ToProto() (proto.Message, error) {
return &pb.EventCreate{SpaceId: e.SpaceID, EnvId: e.EnvID, CollectionId: e.CollectionID, ItemId: e.ItemID}, nil
}
-func (e *EventCreate) FromProto(message proto.Message) error {
+func (e *EventCreateInfo) FromProto(message proto.Message) error {
p, ok := message.(*pb.EventCreate)
if !ok {
- return ErrInvalidEventType("*pb.EventCreate", message)
+ return ErrInvalidEventType("*pb.EventCreateInfo", message)
}
e.SpaceID = p.SpaceId
@@ -49,21 +49,21 @@ func (e *EventCreate) FromProto(message proto.Message) error {
return nil
}
-type EventUpdate struct {
+type EventUpdateInfo struct {
SpaceID string
EnvID string
CollectionID string
ItemID string
}
-func (e EventUpdate) ToProto() (proto.Message, error) {
+func (e EventUpdateInfo) ToProto() (proto.Message, error) {
return &pb.EventUpdate{SpaceId: e.SpaceID, EnvId: e.EnvID, CollectionId: e.CollectionID, ItemId: e.ItemID}, nil
}
-func (e *EventUpdate) FromProto(message proto.Message) error {
+func (e *EventUpdateInfo) FromProto(message proto.Message) error {
p, ok := message.(*pb.EventUpdate)
if !ok {
- return ErrInvalidEventType("*pb.EventUpdate", message)
+ return ErrInvalidEventType("*pb.EventUpdateInfo", message)
}
e.SpaceID = p.SpaceId
@@ -73,21 +73,21 @@ func (e *EventUpdate) FromProto(message proto.Message) error {
return nil
}
-type EventPublish struct {
+type EventPublishInfo struct {
SpaceID string
EnvID string
CollectionID string
ItemID string
}
-func (e EventPublish) ToProto() (proto.Message, error) {
+func (e EventPublishInfo) ToProto() (proto.Message, error) {
return &pb.EventPublish{SpaceId: e.SpaceID, EnvId: e.EnvID, CollectionId: e.CollectionID, ItemId: e.ItemID}, nil
}
-func (e *EventPublish) FromProto(message proto.Message) error {
+func (e *EventPublishInfo) FromProto(message proto.Message) error {
p, ok := message.(*pb.EventPublish)
if !ok {
- return ErrInvalidEventType("*pb.EventPublish", message)
+ return ErrInvalidEventType("*pb.EventPublishInfo", message)
}
e.SpaceID = p.SpaceId
e.EnvID = p.EnvId
@@ -96,21 +96,21 @@ func (e *EventPublish) FromProto(message proto.Message) error {
return nil
}
-type EventUnpublish struct {
+type EventUnpublishInfo struct {
SpaceID string
EnvID string
CollectionID string
ItemID string
}
-func (e EventUnpublish) ToProto() (proto.Message, error) {
+func (e EventUnpublishInfo) ToProto() (proto.Message, error) {
return &pb.EventUnpublish{SpaceId: e.SpaceID, EnvId: e.EnvID, CollectionId: e.CollectionID, ItemId: e.ItemID}, nil
}
-func (e *EventUnpublish) FromProto(message proto.Message) error {
+func (e *EventUnpublishInfo) FromProto(message proto.Message) error {
p, ok := message.(*pb.EventUnpublish)
if !ok {
- return ErrInvalidEventType("*pb.EventUnpublish", message)
+ return ErrInvalidEventType("*pb.EventUnpublishInfo", message)
}
e.SpaceID = p.SpaceId
e.EnvID = p.EnvId
@@ -119,21 +119,21 @@ func (e *EventUnpublish) FromProto(message proto.Message) error {
return nil
}
-type EventDelete struct {
+type EventDeleteInfo struct {
SpaceID string
EnvID string
CollectionID string
ItemID string
}
-func (e EventDelete) ToProto() (proto.Message, error) {
+func (e EventDeleteInfo) ToProto() (proto.Message, error) {
return &pb.EventDelete{SpaceId: e.SpaceID, EnvId: e.EnvID, CollectionId: e.CollectionID, ItemId: e.ItemID}, nil
}
-func (e *EventDelete) FromProto(message proto.Message) error {
+func (e *EventDeleteInfo) FromProto(message proto.Message) error {
p, ok := message.(*pb.EventDelete)
if !ok {
- return ErrInvalidEventType("*pb.EventDelete", message)
+ return ErrInvalidEventType("*pb.EventDeleteInfo", message)
}
e.SpaceID = p.SpaceId
e.EnvID = p.EnvId
diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go
index d2188d6a..c8271c58 100644
--- a/pkg/items/middleware/logging_middleware.go
+++ b/pkg/items/middleware/logging_middleware.go
@@ -59,7 +59,7 @@ func (m *loggingMiddleware) Archive(ctx context.Context, item *items.Item, optio
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemArchive),
+ logzap.Event(items.EventArchive),
logzap.Object(item),
)
@@ -80,7 +80,7 @@ func (m *loggingMiddleware) Create(ctx context.Context, item *items.Item, opts .
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemCreate),
+ logzap.Event(items.EventCreate),
)
created, err = m.next.Create(ctx, item, opts...)
@@ -100,7 +100,7 @@ func (m *loggingMiddleware) Delete(ctx context.Context, item *items.Item, option
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemDelete),
+ logzap.Event(items.EventDelete),
logzap.Object(item),
)
@@ -243,7 +243,7 @@ func (m *loggingMiddleware) Publish(ctx context.Context, item *items.Item, optio
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemPublish),
+ logzap.Event(items.EventPublish),
logzap.Object(item),
)
@@ -264,7 +264,7 @@ func (m *loggingMiddleware) Unarchive(ctx context.Context, item *items.Item, opt
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemUnarchive),
+ logzap.Event(items.EventUnarchive),
logzap.Object(item),
)
@@ -285,7 +285,7 @@ func (m *loggingMiddleware) Undelete(ctx context.Context, item *items.Item, opti
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemUndelete),
+ logzap.Event(items.EventUndelete),
logzap.Object(item),
)
@@ -306,7 +306,7 @@ func (m *loggingMiddleware) Unpublish(ctx context.Context, item *items.Item, opt
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemUnpublish),
+ logzap.Event(items.EventUnpublish),
logzap.Object(item),
)
@@ -327,7 +327,7 @@ func (m *loggingMiddleware) Update(ctx context.Context, item *items.Item, option
}
logger := m.logger.With(
logzap.CallerFromContext(ctx, spaceID),
- logzap.Event(items.EventItemUpdate),
+ logzap.Event(items.EventUpdate),
logzap.Object(item),
)
--
GitLab