add versioning to feature folder structure

src/ApiGateway/src/Program.cs

@@ -6,18 +6,17 @@
 using Serilog;
 
 var builder = WebApplication.CreateBuilder(args);
-
+var env = builder.Environment;
 var appOptions = builder.Services.GetOptions<AppOptions>("AppOptions");
 Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name));
 
-builder.AddCustomSerilog();
+builder.AddCustomSerilog(env);
 builder.Services.AddJwt();
 builder.Services.AddControllers();
 builder.Services.AddHttpContextAccessor();
 
 builder.Services.AddReverseProxy().LoadFromConfig(builder.Configuration.GetSection("Yarp"));
 
-
 var app = builder.Build();
 
 app.UseSerilogRequestLogging();

src/BuildingBlocks/Logging/Extensions.cs

@@ -1,6 +1,7 @@
 using System.Text;
 using BuildingBlocks.Web;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Serilog;
 using Serilog.Events;
@@ -12,7 +13,7 @@ namespace BuildingBlocks.Logging
 {
     public static class Extensions
     {
-        public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder builder)
+        public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder builder, IWebHostEnvironment env)
         {
             builder.Host.UseSerilog((context, services, loggerConfiguration) =>
             {
@@ -50,14 +51,16 @@ public static WebApplicationBuilder AddCustomSerilog(this WebApplicationBuilder
 
                 if (logOptions.File is { Enable: true })
                 {
+                    var root = env.ContentRootPath;
+                    Directory.CreateDirectory(Path.Combine(root, "logs"));
+
                     var path = string.IsNullOrWhiteSpace(logOptions.File.Path) ? "logs/.txt" : logOptions.File.Path;
                     if (!Enum.TryParse<RollingInterval>(logOptions.File.Interval, true, out var interval))
                     {
                         interval = RollingInterval.Day;
                     }
 
-                    loggerConfiguration.WriteTo.File(path, rollingInterval: interval, encoding: Encoding.UTF8,
-                        outputTemplate: logOptions.LogTemplate);
+                    loggerConfiguration.WriteTo.File(path, rollingInterval: interval, encoding: Encoding.UTF8, outputTemplate: logOptions.LogTemplate);
                 }
             });
 

src/Services/Booking/src/Booking.Api/Program.cs

@@ -1,5 +1,4 @@
 using Booking;
-using Booking.Configuration;
 using Booking.Data;
 using Booking.Extensions;
 using BuildingBlocks.EventStoreDB;
@@ -15,11 +14,9 @@
 using BuildingBlocks.Swagger;
 using BuildingBlocks.Web;
 using Figgle;
-using Flight;
 using FluentValidation;
 using Hellang.Middleware.ProblemDetails;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Passenger;
 using Prometheus;
 using Serilog;
 
@@ -34,7 +31,7 @@
 builder.Services.AddPersistMessage(configuration);
 builder.Services.AddMongoDbContext<BookingReadDbContext>(configuration);
 
-builder.AddCustomSerilog();
+builder.AddCustomSerilog(env);
 builder.Services.AddCore();
 builder.Services.AddJwt();
 builder.Services.AddControllers();
@@ -86,6 +83,9 @@
 
 app.Run();
 
-public partial class Program
+namespace Booking.Api
 {
+    public partial class Program
+    {
+    }
 }

src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs

@@ -1,5 +1,4 @@
 using Booking.Booking.Dtos;
-using Booking.Booking.Events.Domain;
 using Booking.Booking.Models.Reads;
 using BuildingBlocks.IdsGenerator;
 using Mapster;

src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommand.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommand.cs

@@ -2,7 +2,7 @@
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.IdsGenerator;
 
-namespace Booking.Booking.Features.CreateBooking;
+namespace Booking.Booking.Features.CreateBooking.Commands.V1;
 
 public record CreateBookingCommand(long PassengerId, long FlightId, string Description) : ICommand<ulong>, IInternalCommand
 {

src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandHandler.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommandHandler.cs

@@ -1,17 +1,14 @@
 using Ardalis.GuardClauses;
-using Booking.Booking.Exceptions;
+using Booking.Booking.Features.CreateBooking.Exceptions;
 using Booking.Booking.Models.ValueObjects;
-using Booking.Configuration;
 using BuildingBlocks.Core;
 using BuildingBlocks.Core.CQRS;
 using BuildingBlocks.EventStoreDB.Repository;
 using BuildingBlocks.Utils;
 using Flight;
-using Grpc.Net.Client;
-using Microsoft.Extensions.Options;
 using Passenger;
 
-namespace Booking.Booking.Features.CreateBooking;
+namespace Booking.Booking.Features.CreateBooking.Commands.V1;
 
 public class CreateBookingCommandHandler : ICommandHandler<CreateBookingCommand, ulong>
 {

src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandValidator.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommandValidator.cs

@@ -1,6 +1,6 @@
 using FluentValidation;
 
-namespace Booking.Booking.Features.CreateBooking;
+namespace Booking.Booking.Features.CreateBooking.Commands.V1;
 
 public class CreateBookingCommandValidator : AbstractValidator<CreateBookingCommand>
 {

src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingEndpoint.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Endpoints/V1/CreateBookingEndpoint.cs

@@ -1,10 +1,11 @@
+using Booking.Booking.Features.CreateBooking.Commands.V1;
 using BuildingBlocks.Web;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 
-namespace Booking.Booking.Features.CreateBooking;
+namespace Booking.Booking.Features.CreateBooking.Endpoints.V1;
 
 [Route(BaseApiPath + "/booking")]
 public class CreateBookingEndpoint : BaseController

src/Services/Booking/src/Booking/Booking/Events/Domain/BookingCreatedDomainEvent.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Events/Domain/V1/BookingCreatedDomainEvent.cs

@@ -2,6 +2,6 @@
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.Core.Model;
 
-namespace Booking.Booking.Events.Domain;
+namespace Booking.Booking.Features.CreateBooking.Events.Domain.V1;
 
 public record BookingCreatedDomainEvent(long Id, PassengerInfo PassengerInfo, Trip Trip) : Audit, IDomainEvent;

src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Exceptions/BookingAlreadyExistException.cs

@@ -1,6 +1,6 @@
 using BuildingBlocks.Exception;
 
-namespace Booking.Booking.Exceptions;
+namespace Booking.Booking.Features.CreateBooking.Exceptions;
 
 public class BookingAlreadyExistException : ConflictException
 {

src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs → src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Exceptions/FlightNotFoundException.cs

@@ -1,6 +1,6 @@
 using BuildingBlocks.Exception;
 
-namespace Booking.Booking.Exceptions;
+namespace Booking.Booking.Features.CreateBooking.Exceptions;
 
 public class FlightNotFoundException : NotFoundException
 {

src/Services/Booking/src/Booking/Booking/Models/Booking.cs

@@ -1,4 +1,4 @@
-using Booking.Booking.Events.Domain;
+using Booking.Booking.Features.CreateBooking.Events.Domain.V1;
 using Booking.Booking.Models.ValueObjects;
 using BuildingBlocks.EventStoreDB.Events;
 using BuildingBlocks.Utils;

src/Services/Booking/src/Booking/BookingProjection.cs

@@ -1,4 +1,4 @@
-using Booking.Booking.Events.Domain;
+using Booking.Booking.Features.CreateBooking.Events.Domain.V1;
 using Booking.Booking.Models.Reads;
 using Booking.Data;
 using BuildingBlocks.EventStoreDB.Events;

src/Services/Booking/src/Booking/EventMapper.cs

@@ -1,4 +1,4 @@
-using Booking.Booking.Events.Domain;
+using Booking.Booking.Features.CreateBooking.Events.Domain.V1;
 using BuildingBlocks.Contracts.EventBus.Messages;
 using BuildingBlocks.Core;
 using BuildingBlocks.Core.Event;

src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Booking.Api;
 using Booking.Data;
 using BuildingBlocks.Contracts.EventBus.Messages;
 using BuildingBlocks.PersistMessageProcessor.Data;

src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs

@@ -1,5 +1,6 @@
 using AutoBogus;
 using Booking.Booking.Features.CreateBooking;
+using Booking.Booking.Features.CreateBooking.Commands.V1;
 using BuildingBlocks.IdsGenerator;
 
 namespace Integration.Test.Fakes;

src/Services/Flight/src/Flight.Api/Program.cs

@@ -1,7 +1,5 @@
-using System.Net;
 using System.Reflection;
 using BuildingBlocks.Caching;
-using BuildingBlocks.Core;
 using BuildingBlocks.EFCore;
 using BuildingBlocks.Exception;
 using BuildingBlocks.HealthCheck;
@@ -24,11 +22,9 @@
 using FluentValidation;
 using Hellang.Middleware.ProblemDetails;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
-using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Prometheus;
 using Serilog;
 
-
 var builder = WebApplication.CreateBuilder(args);
 var configuration = builder.Configuration;
 var env = builder.Environment;
@@ -42,7 +38,7 @@
 builder.Services.AddMongoDbContext<FlightReadDbContext>(configuration);
 builder.Services.AddPersistMessage(configuration);
 
-builder.AddCustomSerilog();
+builder.AddCustomSerilog(env);
 builder.Services.AddCore();
 builder.Services.AddJwt();
 builder.Services.AddControllers();
@@ -98,6 +94,9 @@
 app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name));
 app.Run();
 
-public partial class Program
+namespace Flight.Api
 {
+    public partial class Program
+    {
+    }
 }

src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs

@@ -1,5 +1,5 @@
 using BuildingBlocks.IdsGenerator;
-using Flight.Aircrafts.Features.CreateAircraft.Reads;
+using Flight.Aircrafts.Features.CreateAircraft.Commands.V1.Reads;
 using Flight.Aircrafts.Models;
 using Flight.Aircrafts.Models.Reads;
 using Mapster;

src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommand.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommand.cs

@@ -2,9 +2,8 @@
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.IdsGenerator;
 using Flight.Aircrafts.Dtos;
-using MediatR;
 
-namespace Flight.Aircrafts.Features.CreateAircraft;
+namespace Flight.Aircrafts.Features.CreateAircraft.Commands.V1;
 
 public record CreateAircraftCommand(string Name, string Model, int ManufacturingYear) : ICommand<AircraftResponseDto>, IInternalCommand
 {

src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandHandler.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandHandler.cs

@@ -2,14 +2,14 @@
 using System.Threading.Tasks;
 using Ardalis.GuardClauses;
 using Flight.Aircrafts.Dtos;
-using Flight.Aircrafts.Exceptions;
+using Flight.Aircrafts.Features.CreateAircraft.Exceptions;
 using Flight.Aircrafts.Models;
 using Flight.Data;
 using MapsterMapper;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 
-namespace Flight.Aircrafts.Features.CreateAircraft;
+namespace Flight.Aircrafts.Features.CreateAircraft.Commands.V1;
 
 public class CreateAircraftCommandHandler : IRequestHandler<CreateAircraftCommand, AircraftResponseDto>
 {

src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandValidator.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandValidator.cs

@@ -1,6 +1,6 @@
 using FluentValidation;
 
-namespace Flight.Aircrafts.Features.CreateAircraft;
+namespace Flight.Aircrafts.Features.CreateAircraft.Commands.V1;
 
 public class CreateAircraftCommandValidator : AbstractValidator<CreateAircraftCommand>
 {

src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommand.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommand.cs

@@ -1,6 +1,6 @@
 using BuildingBlocks.Core.Event;
 
-namespace Flight.Aircrafts.Features.CreateAircraft.Reads;
+namespace Flight.Aircrafts.Features.CreateAircraft.Commands.V1.Reads;
 
 public class CreateAircraftMongoCommand : InternalCommand
 {

src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommandHandler.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommandHandler.cs

@@ -2,15 +2,15 @@
 using System.Threading.Tasks;
 using Ardalis.GuardClauses;
 using BuildingBlocks.Core.CQRS;
-using Flight.Aircrafts.Exceptions;
+using Flight.Aircrafts.Features.CreateAircraft.Exceptions;
 using Flight.Aircrafts.Models.Reads;
 using Flight.Data;
 using MapsterMapper;
 using MediatR;
 using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 
-namespace Flight.Aircrafts.Features.CreateAircraft.Reads;
+namespace Flight.Aircrafts.Features.CreateAircraft.Commands.V1.Reads;
 
 public class CreateAircraftMongoCommandHandler : ICommandHandler<CreateAircraftMongoCommand>
 {

src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftEndpoint.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Endpoints/V1/CreateAircraftEndpoint.cs

@@ -1,11 +1,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using BuildingBlocks.Web;
+using Flight.Aircrafts.Features.CreateAircraft.Commands.V1;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Swashbuckle.AspNetCore.Annotations;
 
-namespace Flight.Aircrafts.Features.CreateAircraft;
+namespace Flight.Aircrafts.Features.CreateAircraft.Endpoints.V1;
 
 [Route(BaseApiPath + "/flight/aircraft")]
 public class CreateAircraftEndpoint : BaseController

src/Services/Flight/src/Flight/Aircrafts/Events/AircraftCreatedDomainEvent.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Events/Domain/V1/AircraftCreatedDomainEvent.cs

@@ -1,5 +1,5 @@
 using BuildingBlocks.Core.Event;
 
-namespace Flight.Aircrafts.Events;
+namespace Flight.Aircrafts.Features.CreateAircraft.Events.Domain.V1;
 
 public record AircraftCreatedDomainEvent(long Id, string Name, string Model, int ManufacturingYear, bool IsDeleted) : IDomainEvent;

src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs → src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Exceptions/AircraftAlreadyExistException.cs

@@ -1,7 +1,7 @@
 using System.Net;
 using BuildingBlocks.Exception;
 
-namespace Flight.Aircrafts.Exceptions;
+namespace Flight.Aircrafts.Features.CreateAircraft.Exceptions;
 
 public class AircraftAlreadyExistException : AppException
 {

src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs

@@ -1,6 +1,6 @@
 using BuildingBlocks.Core.Model;
 using BuildingBlocks.IdsGenerator;
-using Flight.Aircrafts.Events;
+using Flight.Aircrafts.Features.CreateAircraft.Events.Domain.V1;
 
 namespace Flight.Aircrafts.Models;
 

src/Services/Flight/src/Flight/Airports/AirportMappings.cs

@@ -1,5 +1,5 @@
 using BuildingBlocks.IdsGenerator;
-using Flight.Airports.Features.CreateAirport.Reads;
+using Flight.Airports.Features.CreateAirport.Commands.V1.Reads;
 using Flight.Airports.Models;
 using Flight.Airports.Models.Reads;
 using Mapster;

src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommand.cs → src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommand.cs

@@ -2,9 +2,8 @@
 using BuildingBlocks.Core.Event;
 using BuildingBlocks.IdsGenerator;
 using Flight.Airports.Dtos;
-using MediatR;
 
-namespace Flight.Airports.Features.CreateAirport;
+namespace Flight.Airports.Features.CreateAirport.Commands.V1;
 
 public record CreateAirportCommand(string Name, string Address, string Code) : ICommand<AirportResponseDto>, IInternalCommand
 {