Skip to content
Snippets Groups Projects
Commit 48b9c853 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'feature/PRXS-951-2057-EventsName' into 'master' 

Изменено название и значение констант событий в logging_middleware

See merge request perxis/perxis-go!178
parents 84467571 cacce1f3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
logs/zap/entry_encoder_test.go
+ 4
− 4
View file @ 48b9c853
......@@ -68,7 +68,7 @@ func TestEntryEncoder_EncodeEntry(t *testing.T) {
func BenchmarkEntryEncoderSimple(b *testing.B) {
fields := []zapcore.Field{
logzap.Event(items.EventCreateItem),
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.EventCreateItem),
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.EventCreateItem),
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.EventCreateItem),
logzap.Event(items.EventCreate),
logzap.Object(items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)),
logzap.Caller("/system"),
logzap.Tags("tag1", "tag2", "tag3"),
......
logs/zap/example_test.go
+ 4
− 4
View file @ 48b9c853
......@@ -29,7 +29,7 @@ func TestExample(t *testing.T) {
Level: logs.Level(zapcore.InfoLevel),
Message: "Item created",
Component: "Items",
Event: items.EventCreateItem,
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.EventUpdateItem,
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.EventCreateItem),
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.EventUpdateItem),
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"}}),
......
pkg/items/events.go
+ 28
− 28
View file @ 48b9c853
......@@ -7,14 +7,14 @@ import (
)
const (
EventCreateItem = "create_item"
EventUpdateItem = "update_item"
EventPublishItem = "publish_item"
EventUnpublishItem = "unpublish_item"
EventDeleteItem = "delete_item"
EventUndeleteItem = "item_undelete"
EventArchiveItem = "item_archive"
EventUnarchiveItem = "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
......
pkg/items/middleware/logging_middleware.go
+ 8
− 8
View file @ 48b9c853
......@@ -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.EventArchiveItem),
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.EventCreateItem),
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.EventDeleteItem),
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.EventPublishItem),
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.EventUnarchiveItem),
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.EventUndeleteItem),
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.EventUnpublishItem),
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.EventUpdateItem),
logzap.Event(items.EventUpdate),
logzap.Object(item),
)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment