diff --git a/src/BuildingBlocks/Logging/Extensions.cs b/src/BuildingBlocks/Logging/Extensions.cs index 806be39..b24ba8e 100644 --- a/src/BuildingBlocks/Logging/Extensions.cs +++ b/src/BuildingBlocks/Logging/Extensions.cs @@ -17,10 +17,6 @@ public static class Extensions { public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder builder) { - Log.Logger = new LoggerConfiguration() - .WriteTo.Console() - .CreateBootstrapLogger(); - builder.Host.UseSerilog((context, loggerConfiguration) => { var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); @@ -32,11 +28,11 @@ public static class Extensions : LogEventLevel.Information; loggerConfiguration - .WriteTo.Console() .WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri(loggOptions.ElasticUri)) { AutoRegisterTemplate = true, - IndexFormat = $"{appOptions.Name}-{environment?.ToLower().Replace(".", "-")}-{DateTime.UtcNow:yyyy-MM}" + IndexFormat = + $"{appOptions.Name}-{environment?.ToLower().Replace(".", "-")}-{DateTime.UtcNow:yyyy-MM}" }) .WriteTo.SpectreConsole(loggOptions.LogTemplate, logLevel) .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Error) diff --git a/src/Services/Booking/src/Booking.Api/Program.cs b/src/Services/Booking/src/Booking.Api/Program.cs index 53e03e0..44e272b 100644 --- a/src/Services/Booking/src/Booking.Api/Program.cs +++ b/src/Services/Booking/src/Booking.Api/Program.cs @@ -2,10 +2,7 @@ using Booking; using Booking.Configuration; using Booking.Data; using Booking.Extensions; -using BuildingBlocks.Core; -using BuildingBlocks.EFCore; using BuildingBlocks.EventStoreDB; -using BuildingBlocks.EventStoreDB.Projections; using BuildingBlocks.HealthCheck; using BuildingBlocks.IdsGenerator; using BuildingBlocks.Jwt; @@ -37,7 +34,7 @@ builder.Services.AddPersistMessage(configuration); builder.Services.AddMongoDbContext(configuration); builder.AddCustomSerilog(); -builder.Services.AddCore(); +builder.Services.AddCore(configuration); builder.Services.AddJwt(); builder.Services.AddControllers(); builder.Services.AddHttpContextAccessor(); diff --git a/src/Services/Flight/src/Flight.Api/Program.cs b/src/Services/Flight/src/Flight.Api/Program.cs index 975b85e..fdf339f 100644 --- a/src/Services/Flight/src/Flight.Api/Program.cs +++ b/src/Services/Flight/src/Flight.Api/Program.cs @@ -40,7 +40,7 @@ builder.Services.AddMongoDbContext(configuration); builder.Services.AddPersistMessage(configuration); builder.AddCustomSerilog(); -builder.Services.AddCore(); +builder.Services.AddCore(configuration); builder.Services.AddJwt(); builder.Services.AddControllers(); builder.Services.AddCustomSwagger(configuration, typeof(FlightRoot).Assembly); diff --git a/src/Services/Flight/src/Flight/FlightConsumer.cs b/src/Services/Flight/src/Flight/FlightConsumer.cs deleted file mode 100644 index 8d6db0f..0000000 --- a/src/Services/Flight/src/Flight/FlightConsumer.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Threading.Tasks; -using BuildingBlocks.Contracts.EventBus.Messages; -using MassTransit; - -namespace Flight; - -public class FlightConsumer : IConsumer -{ - public Task Consume(ConsumeContext context) - { - Console.WriteLine("This consumer is for test"); - return Task.CompletedTask; - } -} diff --git a/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs b/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs new file mode 100644 index 0000000..20f997b --- /dev/null +++ b/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs @@ -0,0 +1,28 @@ +using System.Threading.Tasks; +using BuildingBlocks.Contracts.EventBus.Messages; +using BuildingBlocks.Web; +using Humanizer; +using MassTransit; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace Flight.Identity.Consumers.RegisterNewUser; + +public class RegisterNewUserConsumerHandler : IConsumer +{ + private readonly AppOptions _options; + private readonly ILogger _logger; + + public RegisterNewUserConsumerHandler(IOptions options, + ILogger logger) + { + _options = options.Value; + _logger = logger; + } + + public Task Consume(ConsumeContext context) + { + _logger.LogInformation($"this is a test consumer for {nameof(UserCreated).Underscore()} in {_options.Name}"); + return Task.CompletedTask; + } +} diff --git a/src/Services/Identity/src/Identity.Api/Program.cs b/src/Services/Identity/src/Identity.Api/Program.cs index 2e98509..3e14a20 100644 --- a/src/Services/Identity/src/Identity.Api/Program.cs +++ b/src/Services/Identity/src/Identity.Api/Program.cs @@ -31,7 +31,7 @@ Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name)); builder.Services.AddPersistMessage(configuration); builder.Services.AddCustomDbContext(configuration); builder.Services.AddScoped(); -builder.Services.AddCore(); +builder.Services.AddCore(configuration); builder.AddCustomSerilog(); builder.Services.AddControllers(); builder.Services.AddCustomSwagger(configuration, typeof(IdentityRoot).Assembly); diff --git a/src/Services/Passenger/src/Passenger.Api/Program.cs b/src/Services/Passenger/src/Passenger.Api/Program.cs index 95eb0bb..020eac2 100644 --- a/src/Services/Passenger/src/Passenger.Api/Program.cs +++ b/src/Services/Passenger/src/Passenger.Api/Program.cs @@ -34,7 +34,7 @@ builder.Services.AddMongoDbContext(configuration); builder.Services.AddPersistMessage(configuration); builder.AddCustomSerilog(); -builder.Services.AddCore(); +builder.Services.AddCore(configuration); builder.Services.AddJwt(); builder.Services.AddControllers(); builder.Services.AddCustomSwagger(configuration, typeof(PassengerRoot).Assembly); diff --git a/src/Services/Passenger/src/Passenger/Identity/RegisterNewUser/RegisterNewUserConsumerHandler.cs b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs similarity index 64% rename from src/Services/Passenger/src/Passenger/Identity/RegisterNewUser/RegisterNewUserConsumerHandler.cs rename to src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs index b9c519d..912aa6d 100644 --- a/src/Services/Passenger/src/Passenger/Identity/RegisterNewUser/RegisterNewUserConsumerHandler.cs +++ b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs @@ -3,30 +3,43 @@ using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.Core; using BuildingBlocks.Core.Event; using BuildingBlocks.IdsGenerator; +using BuildingBlocks.Web; +using Humanizer; using MassTransit; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; using Passenger.Data; using Passenger.Passengers.Events.Domain; -namespace Passenger.Identity.RegisterNewUser; +namespace Passenger.Identity.Consumers.RegisterNewUser; public class RegisterNewUserConsumerHandler : IConsumer { private readonly PassengerDbContext _passengerDbContext; private readonly IEventDispatcher _eventDispatcher; + private readonly ILogger _logger; + private readonly AppOptions _options; public RegisterNewUserConsumerHandler(PassengerDbContext passengerDbContext, - IEventDispatcher eventDispatcher) + IEventDispatcher eventDispatcher, + ILogger logger, + IOptions options) { _passengerDbContext = passengerDbContext; _eventDispatcher = eventDispatcher; + _logger = logger; + _options = options.Value; } public async Task Consume(ConsumeContext context) { Guard.Against.Null(context.Message, nameof(UserCreated)); - var passengerExist = await _passengerDbContext.Passengers.AnyAsync(x => x.PassportNumber == context.Message.PassportNumber); + _logger.LogInformation($"consumer for {nameof(UserCreated).Underscore()} in {_options.Name}"); + + var passengerExist = + await _passengerDbContext.Passengers.AnyAsync(x => x.PassportNumber == context.Message.PassportNumber); if (passengerExist) return; diff --git a/src/Services/Passenger/src/Passenger/Passenger.csproj b/src/Services/Passenger/src/Passenger/Passenger.csproj index 1cd1e12..24f41b5 100644 --- a/src/Services/Passenger/src/Passenger/Passenger.csproj +++ b/src/Services/Passenger/src/Passenger/Passenger.csproj @@ -14,6 +14,7 @@ +