правки при создании объектов

pkg/clients/middleware/logging_middleware.go

@@ -25,18 +25,17 @@ func LoggingMiddleware(logger *zap.Logger) Middleware {
 
 func (m *loggingMiddleware) Create(ctx context.Context, client *clients.Client) (created *clients.Client, err error) {
 	logger := m.logger.With(
-		logzap.Caller(ctx),
+		logzap.Caller(ctx, logzap.WithSpace(client.SpaceID)),
 		logzap.Event(clients.EventCreate),
-		logzap.Object(client),
 	)
 
 	created, err = m.next.Create(ctx, client)
 	if err != nil {
-		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(client))
 		return
 	}
 
-	logger.Info("Client created", logzap.Channels(logzap.Userlog))
+	logger.Info("Client created", logzap.Channels(logzap.Userlog), logzap.Object(created))
 
 	return created, err
 }

pkg/environments/middleware/logging_middleware.go

@@ -29,16 +29,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, env *environments.Enviro
 	logger := m.logger.With(
 		logzap.Caller(ctx),
 		logzap.Event(environments.EventCreate),
-		logzap.Object(env),
 	)
 
 	created, err = m.next.Create(ctx, env)
 	if err != nil {
-		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(env))
 		return
 	}
 
-	logger.Info("Environment created", logzap.Channels(logzap.Userlog))
+	logger.Info("Environment created", logzap.Channels(logzap.Userlog), logzap.Object(created))
 
 	return created, err
 }

pkg/organizations/middleware/logging_middleware.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"context"
+
 	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/organizations"
 
@@ -28,16 +29,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, org *organizations.Organ
 	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))
+		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(org))
 		return
 	}
 
-	logger.Info("Organization created", logzap.Channels(logzap.Userlog))
+	logger.Info("Organization created", logzap.Channels(logzap.Userlog), logzap.Object(created))
 
 	return created, err
 }

pkg/roles/middleware/logging_middleware.go

@@ -27,16 +27,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, role *roles.Role) (creat
 	logger := m.logger.With(
 		logzap.Caller(ctx),
 		logzap.Event(roles.EventCreate),
-		logzap.Object(role),
 	)
 
 	created, err = m.next.Create(ctx, role)
 	if err != nil {
-		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(role))
 		return
 	}
 
-	logger.Info("Role created", logzap.Channels(logzap.Userlog))
+	logger.Info("Role created", logzap.Channels(logzap.Userlog), logzap.Object(created))
 
 	return created, err
 }

pkg/spaces/middleware/logging_middleware.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"context"
+
 	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
 
@@ -45,16 +46,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, space *spaces.Space) (cr
 	logger := m.logger.With(
 		logzap.Caller(ctx),
 		logzap.Event(spaces.EventCreate),
-		logzap.Object(space),
 	)
 
 	created, err = m.next.Create(ctx, space)
 	if err != nil {
-		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog))
+		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(space))
 		return
 	}
 
-	logger.Info("Space created", logzap.Channels(logzap.Userlog))
+	logger.Info("Space created", logzap.Channels(logzap.Userlog), logzap.Object(created))
 
 	return created, err
 }

pkg/users/middleware/logging_middleware.go

@@ -28,16 +28,15 @@ func (m *loggingMiddleware) Create(ctx context.Context, create *users.User) (use
 	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))
+		logger.Error("Failed to create", zap.Error(err), logzap.Channels(logzap.Userlog, logzap.Syslog), logzap.Object(user))
 		return
 	}
 
-	logger.Info("User created", logzap.Channels(logzap.Userlog))
+	logger.Info("User created", logzap.Channels(logzap.Userlog), logzap.Object(user))
 
 	return user, err
 }