Added user id to logging

source/EasyWay/Internals/Commands/Commands/CommandExecutorLoggerDecorator.cs

@@ -23,9 +23,18 @@ public async Task<CommandResult> Execute<TModule, TCommand>(TCommand command, Ca
         {
             var logger = _serviceProvider.GetRequiredService<EasyWayLogger<TModule>>();
 
+            var userContext = _serviceProvider.GetRequiredService<IUserContext>();
+
             //TODO begin scope (correlation Id, userId)
 
-            logger.Executing(command);
+            if (userContext.UserId is not null)
+            {
+                logger.ExecutingByUser(command, userContext.UserId);
+            }
+            else
+            {
+                logger.Executing(command);
+            }
 
             try
             {

source/EasyWay/Internals/Commands/CommandsWithResult/CommandWithOperationResultExecutorLoggerDecorator.cs

@@ -24,9 +24,18 @@ public async Task<CommandResult<TOperationResult>> Command<TModule, TCommand, TO
         {
             var logger = _serviceProvider.GetRequiredService<EasyWayLogger<TModule>>();
 
+            var userContext = _serviceProvider.GetRequiredService<IUserContext>();
+
             //TODO begin scope (correlation Id, userId)
 
-            logger.Executing(command);
+            if (userContext.UserId is not null)
+            {
+                logger.ExecutingByUser(command, userContext.UserId);
+            }
+            else
+            {
+                logger.Executing(command);
+            }
 
             try
             {

source/EasyWay/Internals/Loggers/EasyWayLogger.cs

@@ -1,5 +1,4 @@
-using EasyWay.Internals.BusinessRules;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace EasyWay.Internals.Queries.Loggers
 {
@@ -13,6 +12,9 @@
         [LoggerMessage(0, LogLevel.Information, "Executing {@component}", SkipEnabledCheck = true)]
         public partial void Executing(object component);
 
+        [LoggerMessage(0, LogLevel.Information, "Executing {@component} by @userId", SkipEnabledCheck = true)]
+        public partial void ExecutingByUser(object component, string userId);
+
         [LoggerMessage(1, LogLevel.Information, "Successed", SkipEnabledCheck = true)]
         public partial void Successed();
 

source/EasyWay/Internals/Queries/QueryExecutorLoggerDecorator.cs

@@ -25,9 +25,18 @@
         {
             var logger = _serviceProvider.GetRequiredService<EasyWayLogger<TModule>>();
 
+            var userContext = _serviceProvider.GetRequiredService<IUserContext>();
+
             //TODO begin scope (correlation Id, userId)
 
-            logger.Executing(query);
+            if (userContext.UserId is not null)
+            {
+                logger.ExecutingByUser(query, userContext.UserId);
+            }
+            else
+            {
+                logger.Executing(query);
+            }
 
             try
             {
@@ -35,12 +44,12 @@
 
                 switch (result.Error)
                 {
                     case QueryErrorEnum.None: logger.Successed(result.ReadModel); break;
                     case QueryErrorEnum.Validation: logger.Validation(result.ValidationErrors); break;
                     case QueryErrorEnum.OperationCanceled: logger.OperationCanceled(); break;
                     case QueryErrorEnum.NotFound: logger.NotFound(); break;
                     case QueryErrorEnum.Forbidden: logger.Forbidden(); break;
                     default: logger.UnexpectedException(result.Exception); break;
                 }
 
                 return result;