From 407797d04dc1462598dfcd8a9518b84e7f8025c1 Mon Sep 17 00:00:00 2001 From: meysamhadeli Date: Thu, 20 Oct 2022 13:51:07 +0330 Subject: [PATCH] add versioning to feature folder structure --- src/ApiGateway/src/Program.cs | 5 ++-- src/BuildingBlocks/Logging/Extensions.cs | 9 ++++--- .../Booking/src/Booking.Api/Program.cs | 10 ++++---- .../Exceptions/PassengerNotFoundException.cs | 10 -------- .../Booking/Features/BookingMappings.cs | 1 - .../{ => Commands/V1}/CreateBookingCommand.cs | 2 +- .../V1}/CreateBookingCommandHandler.cs | 7 ++---- .../V1}/CreateBookingCommandValidator.cs | 2 +- .../V1}/CreateBookingEndpoint.cs | 3 ++- .../Domain/V1}/BookingCreatedDomainEvent.cs | 2 +- .../BookingAlreadyExistException.cs | 2 +- .../Exceptions/FlightNotFoundException.cs | 2 +- .../src/Booking/Booking/Models/Booking.cs | 2 +- .../Booking/src/Booking/BookingProjection.cs | 2 +- .../Booking/src/Booking/EventMapper.cs | 2 +- .../Booking/Features/CreateBookingTests.cs | 1 + .../Fakes/FakeCreateBookingCommand.cs | 1 + src/Services/Flight/src/Flight.Api/Program.cs | 11 ++++---- .../Aircrafts/Features/AircraftMappings.cs | 2 +- .../V1}/CreateAircraftCommand.cs | 3 +-- .../V1}/CreateAircraftCommandHandler.cs | 4 +-- .../V1}/CreateAircraftCommandValidator.cs | 2 +- .../V1}/Reads/CreateAircraftMongoCommand.cs | 2 +- .../CreateAircraftMongoCommandHandler.cs | 4 +-- .../V1}/CreateAircraftEndpoint.cs | 3 ++- .../Domain/V1}/AircraftCreatedDomainEvent.cs | 2 +- .../AircraftAlreadyExistException.cs | 2 +- .../src/Flight/Aircrafts/Models/Aircraft.cs | 2 +- .../src/Flight/Airports/AirportMappings.cs | 2 +- .../{ => Commands/V1}/CreateAirportCommand.cs | 3 +-- .../V1}/CreateAirportCommandHandler.cs | 4 +-- .../V1}/CreateAirportCommandValidator.cs | 2 +- .../V1}/Reads/CreateAirportMongoCommand.cs | 2 +- .../Reads/CreateAirportMongoCommandHandler.cs | 4 +-- .../V1}/CreateAirportEndpoint.cs | 3 ++- .../Domain/V1}/AirportCreatedDomainEvent.cs | 2 +- .../AirportAlreadyExistException.cs | 2 +- .../src/Flight/Airports/Models/Airport.cs | 2 +- src/Services/Flight/src/Flight/EventMapper.cs | 25 +++++++++++-------- src/Services/Flight/src/Flight/Flight.csproj | 3 +-- .../{ => Commands/V1}/CreateFlightCommand.cs | 3 +-- .../V1}/CreateFlightCommandHandler.cs | 3 ++- .../V1}/CreateFlightCommandValidator.cs | 3 +-- .../V1}/Reads/CreateFlightMongoCommand.cs | 3 +-- .../Reads/CreateFlightMongoCommandHandler.cs | 3 ++- .../V1}/CreateFlightEndpoint.cs | 3 ++- .../Domain/V1}/FlightCreatedDomainEvent.cs | 3 +-- .../Exceptions/FlightAlreadyExistException.cs | 2 +- .../{ => Commands/V1}/DeleteFlightCommand.cs | 2 +- .../V1}/DeleteFlightCommandHandler.cs | 4 +-- .../V1}/DeleteFlightCommandValidator.cs | 2 +- .../V1}/Reads/DeleteFlightMongoCommand.cs | 3 +-- .../Reads/DeleteFlightMongoCommandHandler.cs | 2 +- .../V1}/DeleteFlightEndpoint.cs | 3 ++- .../Domain/V1}/FlightDeletedDomainEvent.cs | 3 +-- .../Flight/Flights/Features/FlightMappings.cs | 6 ++--- .../V1}/GetAvailableFlightsEndpoint.cs | 3 ++- .../V1}/GetAvailableFlightsQuery.cs | 3 +-- .../V1}/GetAvailableFlightsQueryHandler.cs | 2 +- .../V1}/GetAvailableFlightsQueryValidator.cs | 2 +- .../V1}/GetFlightByIdEndpoint.cs | 4 +-- .../{ => Queries/V1}/GetFlightByIdQuery.cs | 2 +- .../V1}/GetFlightByIdQueryHandler.cs | 2 +- .../V1}/GetFlightByIdQueryValidator.cs | 2 +- .../V1}/Reads/UpdateFlightMongoCommand.cs | 3 +-- .../Reads/UpdateFlightMongoCommandHandler.cs | 2 +- .../{ => Commands/V1}/UpdateFlightCommand.cs | 4 +-- .../V1}/UpdateFlightCommandHandler.cs | 5 +--- .../V1}/UpdateFlightCommandValidator.cs | 5 ++-- .../V1}/UpdateFlightEndpoint.cs | 3 ++- .../Events/V1}/FlightUpdatedDomainEvent.cs | 3 +-- .../src/Flight/Flights/Models/Flight.cs | 4 ++- .../GrpcServer/Services/FlightGrpcServices.cs | 3 +++ .../V1}/RegisterNewUserConsumerHandler.cs | 2 +- .../Exceptions/SeatAlreadyChosenException.cs | 10 -------- .../{ => Commands/V1}/CreateSeatCommand.cs | 3 +-- .../V1}/CreateSeatCommandHandler.cs | 9 ++----- .../V1}/CreateSeatCommandValidator.cs | 4 +-- .../V1}/Reads/CreateSeatMongoCommand.cs | 3 +-- .../Reads/CreateSeatMongoCommandHandler.cs | 4 +-- .../{ => Endpoints/V1}/CreateSeatEndpoint.cs | 4 +-- .../Domain/V1}/SeatCreatedDomainEvent.cs | 3 +-- .../Exceptions/SeatAlreadyExistException.cs | 2 +- .../V1}/GetAvailableSeatsEndpoint.cs | 3 ++- .../Exceptions/AllSeatsFullException.cs | 2 +- .../V1}/GetAvailableSeatsQuery.cs | 3 +-- .../V1}/GetAvailableSeatsQueryHandler.cs | 4 +-- .../V1}/GetAvailableSeatsQueryValidator.cs | 2 +- .../V1}/Reads/ReserveSeatMongoCommand.cs | 3 +-- .../Reads/ReserveSeatMongoCommandHandler.cs | 2 +- .../{ => Commands/V1}/ReserveSeatCommand.cs | 2 +- .../V1}/ReserveSeatCommandHandler.cs | 4 +-- .../V1}/ReserveSeatCommandValidator.cs | 2 +- .../{ => Endpoints/V1}/ReserveSeatEndpoint.cs | 3 ++- .../Domain/V1}/SeatReservedDomainEvent.cs | 3 +-- .../SeatNumberIncorrectException.cs | 2 +- .../src/Flight/Seats/Features/SeatMappings.cs | 4 +-- .../Flight/src/Flight/Seats/Models/Seat.cs | 3 ++- .../Aircraft/Features/CreateAircraftTests.cs | 4 +-- .../Airport/Features/CreateAirportTests.cs | 4 +-- .../Fakes/FakeCreateAircraftCommand.cs | 1 + .../Fakes/FakeCreateAirportCommand.cs | 1 + .../Fakes/FakeCreateFlightCommand.cs | 1 + .../Fakes/FakeCreateSeatCommand.cs | 1 + .../Fakes/FakeFlightCreated.cs | 1 + .../IntegrationTest/Fakes/FakeSeatCreated.cs | 1 + .../Fakes/FakeUpdateFlightCommand.cs | 1 + .../Flight/Features/CreateFlightTests.cs | 3 ++- .../Flight/Features/DeleteFlightTests.cs | 4 ++- .../Features/GetAvailableFlightsTests.cs | 4 ++- .../Flight/Features/GetFlightByIdTests.cs | 4 ++- .../Flight/Features/UpdateFlightTests.cs | 3 ++- .../Seat/Features/GetAvailableSeatsTests.cs | 5 ++-- .../Seat/Features/ReserveSeatTests.cs | 5 ++-- .../CreateAircraftCommandHandlerTests.cs | 1 + .../CreateAircraftCommandValidatorTests.cs | 1 + .../CreateAirportCommandHandlerTests.cs | 1 + .../CreateAirportCommandValidatorTests.cs | 1 + .../Fakes/FakeCreateAircraftCommand.cs | 1 + .../Fakes/FakeCreateAirportCommand.cs | 1 + .../UnitTest/Fakes/FakeCreateFlightCommand.cs | 1 + .../UnitTest/Fakes/FakeCreateSeatCommand.cs | 1 + .../FakeValidateCreateAircraftCommand.cs | 1 + .../Fakes/FakeValidateCreateAirportCommand.cs | 1 + .../Fakes/FakeValidateCreateFlightCommand.cs | 1 + .../Fakes/FakeValidateCreateSeatCommand.cs | 1 + .../CreateFlightCommandHandlerTests.cs | 1 + .../CreateFlightCommandValidatorTests.cs | 1 + .../Features/CreateSeatCommandHandlerTests.cs | 1 + .../CreateSeatCommandValidatorTests.cs | 1 + .../Identity/src/Identity.Api/Program.cs | 10 ++++---- .../V1}/RegisterNewUserCommand.cs | 2 +- .../V1}/RegisterNewUserCommandHandler.cs | 6 ++--- .../V1}/RegisterNewUserValidator.cs | 2 +- .../V1}/RegisterNewUserEndpoint.cs | 3 ++- .../RegisterIdentityUserException.cs | 4 +-- .../Fakes/FakeRegisterNewUserCommand.cs | 1 + .../Identity/Features/RegisterNewUserTests.cs | 1 + .../Passenger/src/Passenger.Api/Program.cs | 8 +++--- .../Passenger/src/Passenger/EventMapper.cs | 5 ++-- .../Services/PassengerGrpcServices.cs | 1 + .../V1}/RegisterNewUserConsumerHandler.cs | 4 +-- .../Domain/V1}/PassengerCreatedDomainEvent.cs | 2 +- .../V1}/CompleteRegisterPassengerCommand.cs | 3 +-- ...CompleteRegisterPassengerCommandHandler.cs | 5 ++-- ...mpleteRegisterPassengerCommandValidator.cs | 3 +-- .../CompleteRegisterPassengerMongoCommand.cs | 3 +-- ...eteRegisterPassengerMongoCommandHandler.cs | 3 +-- .../V1}/CompleteRegisterPassengerEndpoint.cs | 3 ++- ...ssengerRegistrationCompletedDomainEvent.cs | 3 +-- .../Exceptions/PassengerAlreadyExist.cs | 2 +- .../V1}/GetPassengerByIdEndpoint.cs | 3 ++- .../Exceptions/PassengerNotFoundException.cs | 2 +- .../{ => Queries/V1}/GetPassengerQueryById.cs | 2 +- .../V1}/GetPassengerQueryByIdHandler.cs | 5 ++-- .../V1}/GetPassengerQueryByIdValidator.cs | 2 +- .../Passengers/Features/PassengerMappings.cs | 2 +- .../Passenger/Passengers/Models/Passenger.cs | 3 ++- .../FakeCompleteRegisterPassengerCommand.cs | 1 + .../Fakes/FakePassengerResponseDto.cs | 4 ++- .../CompleteRegisterPassengerTests.cs | 1 + .../Features/GetPassengerByIdTests.cs | 2 ++ 162 files changed, 253 insertions(+), 247 deletions(-) delete mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/PassengerNotFoundException.cs rename src/Services/Booking/src/Booking/Booking/Features/CreateBooking/{ => Commands/V1}/CreateBookingCommand.cs (82%) rename src/Services/Booking/src/Booking/Booking/Features/CreateBooking/{ => Commands/V1}/CreateBookingCommandHandler.cs (94%) rename src/Services/Booking/src/Booking/Booking/Features/CreateBooking/{ => Commands/V1}/CreateBookingCommandValidator.cs (85%) rename src/Services/Booking/src/Booking/Booking/Features/CreateBooking/{ => Endpoints/V1}/CreateBookingEndpoint.cs (86%) rename src/Services/Booking/src/Booking/Booking/{Events/Domain => Features/CreateBooking/Events/Domain/V1}/BookingCreatedDomainEvent.cs (76%) rename src/Services/Booking/src/Booking/Booking/{ => Features/CreateBooking}/Exceptions/BookingAlreadyExistException.cs (77%) rename src/Services/Booking/src/Booking/Booking/{ => Features/CreateBooking}/Exceptions/FlightNotFoundException.cs (74%) rename src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/{ => Commands/V1}/CreateAircraftCommand.cs (83%) rename src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/{ => Commands/V1}/CreateAircraftCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/{ => Commands/V1}/CreateAircraftCommandValidator.cs (86%) rename src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/{ => Commands/V1}/Reads/CreateAircraftMongoCommand.cs (88%) rename src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/{ => Commands/V1}/Reads/CreateAircraftMongoCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/{ => Endpoints/V1}/CreateAircraftEndpoint.cs (85%) rename src/Services/Flight/src/Flight/Aircrafts/{Events => Features/CreateAircraft/Events/Domain/V1}/AircraftCreatedDomainEvent.cs (70%) rename src/Services/Flight/src/Flight/Aircrafts/{ => Features/CreateAircraft}/Exceptions/AircraftAlreadyExistException.cs (78%) rename src/Services/Flight/src/Flight/Airports/Features/CreateAirport/{ => Commands/V1}/CreateAirportCommand.cs (83%) rename src/Services/Flight/src/Flight/Airports/Features/CreateAirport/{ => Commands/V1}/CreateAirportCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Airports/Features/CreateAirport/{ => Commands/V1}/CreateAirportCommandValidator.cs (86%) rename src/Services/Flight/src/Flight/Airports/Features/CreateAirport/{ => Commands/V1}/Reads/CreateAirportMongoCommand.cs (87%) rename src/Services/Flight/src/Flight/Airports/Features/CreateAirport/{ => Commands/V1}/Reads/CreateAirportMongoCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Airports/Features/CreateAirport/{ => Endpoints/V1}/CreateAirportEndpoint.cs (85%) rename src/Services/Flight/src/Flight/Airports/{Events => Features/CreateAirport/Events/Domain/V1}/AirportCreatedDomainEvent.cs (70%) rename src/Services/Flight/src/Flight/Airports/{ => Features/CreateAirport}/Exceptions/AirportAlreadyExistException.cs (77%) rename src/Services/Flight/src/Flight/Flights/Features/CreateFlight/{ => Commands/V1}/CreateFlightCommand.cs (87%) rename src/Services/Flight/src/Flight/Flights/Features/CreateFlight/{ => Commands/V1}/CreateFlightCommandHandler.cs (92%) rename src/Services/Flight/src/Flight/Flights/Features/CreateFlight/{ => Commands/V1}/CreateFlightCommandValidator.cs (94%) rename src/Services/Flight/src/Flight/Flights/Features/CreateFlight/{ => Commands/V1}/Reads/CreateFlightMongoCommand.cs (93%) rename src/Services/Flight/src/Flight/Flights/Features/CreateFlight/{ => Commands/V1}/Reads/CreateFlightMongoCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Flights/Features/CreateFlight/{ => Endpoints/V1}/CreateFlightEndpoint.cs (87%) rename src/Services/Flight/src/Flight/Flights/{Events/Domain => Features/CreateFlight/Events/Domain/V1}/FlightCreatedDomainEvent.cs (83%) rename src/Services/Flight/src/Flight/Flights/{ => Features/CreateFlight}/Exceptions/FlightAlreadyExistException.cs (77%) rename src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/{ => Commands/V1}/DeleteFlightCommand.cs (75%) rename src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/{ => Commands/V1}/DeleteFlightCommandHandler.cs (94%) rename src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/{ => Commands/V1}/DeleteFlightCommandValidator.cs (80%) rename src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/{ => Commands/V1}/Reads/DeleteFlightMongoCommand.cs (93%) rename src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/{ => Commands/V1}/Reads/DeleteFlightMongoCommandHandler.cs (95%) rename src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/{ => Endpoints/V1}/DeleteFlightEndpoint.cs (86%) rename src/Services/Flight/src/Flight/Flights/{Events/Domain => Features/DeleteFlight/Events/Domain/V1}/FlightDeletedDomainEvent.cs (83%) rename src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/{ => Endpoints/V1}/GetAvailableFlightsEndpoint.cs (86%) rename src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/{ => Queries/V1}/GetAvailableFlightsQuery.cs (84%) rename src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/{ => Queries/V1}/GetAvailableFlightsQueryHandler.cs (94%) rename src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/{ => Queries/V1}/GetAvailableFlightsQueryValidator.cs (65%) rename src/Services/Flight/src/Flight/Flights/Features/GetFlightById/{ => Endpoints/V1}/GetFlightByIdEndpoint.cs (86%) rename src/Services/Flight/src/Flight/Flights/Features/GetFlightById/{ => Queries/V1}/GetFlightByIdQuery.cs (68%) rename src/Services/Flight/src/Flight/Flights/Features/GetFlightById/{ => Queries/V1}/GetFlightByIdQueryHandler.cs (95%) rename src/Services/Flight/src/Flight/Flights/Features/GetFlightById/{ => Queries/V1}/GetFlightByIdQueryValidator.cs (82%) rename src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/{ => Commands/V1}/Reads/UpdateFlightMongoCommand.cs (94%) rename src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/{ => Commands/V1}/Reads/UpdateFlightMongoCommandHandler.cs (97%) rename src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/{ => Commands/V1}/UpdateFlightCommand.cs (90%) rename src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/{ => Commands/V1}/UpdateFlightCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/{ => Commands/V1}/UpdateFlightCommandValidator.cs (91%) rename src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/{ => Endpoints/V1}/UpdateFlightEndpoint.cs (86%) rename src/Services/Flight/src/Flight/Flights/{Events/Domain => Features/UpdateFlight/Events/V1}/FlightUpdatedDomainEvent.cs (83%) rename src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/{ => Consumes/V1}/RegisterNewUserConsumerHandler.cs (92%) delete mode 100644 src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyChosenException.cs rename src/Services/Flight/src/Flight/Seats/Features/CreateSeat/{ => Commands/V1}/CreateSeatCommand.cs (83%) rename src/Services/Flight/src/Flight/Seats/Features/CreateSeat/{ => Commands/V1}/CreateSeatCommandHandler.cs (83%) rename src/Services/Flight/src/Flight/Seats/Features/CreateSeat/{ => Commands/V1}/CreateSeatCommandValidator.cs (85%) rename src/Services/Flight/src/Flight/Seats/Features/CreateSeat/{ => Commands/V1}/Reads/CreateSeatMongoCommand.cs (89%) rename src/Services/Flight/src/Flight/Seats/Features/CreateSeat/{ => Commands/V1}/Reads/CreateSeatMongoCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Seats/Features/CreateSeat/{ => Endpoints/V1}/CreateSeatEndpoint.cs (86%) rename src/Services/Flight/src/Flight/Seats/{Events => Features/CreateSeat/Events/Domain/V1}/SeatCreatedDomainEvent.cs (75%) rename src/Services/Flight/src/Flight/Seats/{ => Features/CreateSeat}/Exceptions/SeatAlreadyExistException.cs (78%) rename src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/{ => Endpoints/V1}/GetAvailableSeatsEndpoint.cs (87%) rename src/Services/Flight/src/Flight/Seats/{ => Features/GetAvailableSeats}/Exceptions/AllSeatsFullException.cs (73%) rename src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/{ => Queries/V1}/GetAvailableSeatsQuery.cs (73%) rename src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/{ => Queries/V1}/GetAvailableSeatsQueryHandler.cs (90%) rename src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/{ => Queries/V1}/GetAvailableSeatsQueryValidator.cs (82%) rename src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/{ => Commands/V1}/Reads/ReserveSeatMongoCommand.cs (88%) rename src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/{ => Commands/V1}/Reads/ReserveSeatMongoCommandHandler.cs (94%) rename src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/{ => Commands/V1}/ReserveSeatCommand.cs (78%) rename src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/{ => Commands/V1}/ReserveSeatCommandHandler.cs (91%) rename src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/{ => Commands/V1}/ReserveSeatCommandValidator.cs (87%) rename src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/{ => Endpoints/V1}/ReserveSeatEndpoint.cs (87%) rename src/Services/Flight/src/Flight/Seats/{Events => Features/ReserveSeat/Events/Domain/V1}/SeatReservedDomainEvent.cs (75%) rename src/Services/Flight/src/Flight/Seats/{ => Features/ReserveSeat}/Exceptions/SeatNumberIncorrectException.cs (77%) rename src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/{ => Commands/V1}/RegisterNewUserCommand.cs (80%) rename src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/{ => Commands/V1}/RegisterNewUserCommandHandler.cs (94%) rename src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/{ => Commands/V1}/RegisterNewUserValidator.cs (94%) rename src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/{ => Endpoints/V1}/RegisterNewUserEndpoint.cs (87%) rename src/Services/Identity/src/Identity/Identity/{ => Features/RegisterNewUser}/Exceptions/RegisterIdentityUserException.cs (72%) rename src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/{ => Consumes/V1}/RegisterNewUserConsumerHandler.cs (93%) rename src/Services/Passenger/src/Passenger/{Passengers/Events/Domain => Identity/Consumers/RegisterNewUser/Events/Domain/V1}/PassengerCreatedDomainEvent.cs (69%) rename src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/{ => Commands/V1}/CompleteRegisterPassengerCommand.cs (91%) rename src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/{ => Commands/V1}/CompleteRegisterPassengerCommandHandler.cs (94%) rename src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/{ => Commands/V1}/CompleteRegisterPassengerCommandValidator.cs (96%) rename src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/{ => Commands/V1}/Reads/CompleteRegisterPassengerMongoCommand.cs (94%) rename src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/{ => Commands/V1}/Reads/CompleteRegisterPassengerMongoCommandHandler.cs (97%) rename src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/{ => Endpoints/V1}/CompleteRegisterPassengerEndpoint.cs (90%) rename src/Services/Passenger/src/Passenger/Passengers/{Events/Domain => Features/CompleteRegisterPassenger/Events/Domain/V1}/PassengerRegistrationCompletedDomainEvent.cs (72%) rename src/Services/Passenger/src/Passenger/Passengers/{ => Features/CompleteRegisterPassenger}/Exceptions/PassengerAlreadyExist.cs (70%) rename src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/{ => Endpoints/V1}/GetPassengerByIdEndpoint.cs (84%) rename src/Services/Passenger/src/Passenger/Passengers/{ => Features/GetPassengerById}/Exceptions/PassengerNotFoundException.cs (74%) rename src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/{ => Queries/V1}/GetPassengerQueryById.cs (67%) rename src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/{ => Queries/V1}/GetPassengerQueryByIdHandler.cs (88%) rename src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/{ => Queries/V1}/GetPassengerQueryByIdValidator.cs (80%) diff --git a/src/ApiGateway/src/Program.cs b/src/ApiGateway/src/Program.cs index ad75dfe..b6098a6 100644 --- a/src/ApiGateway/src/Program.cs +++ b/src/ApiGateway/src/Program.cs @@ -6,18 +6,17 @@ using Microsoft.AspNetCore.Authentication; using Serilog; var builder = WebApplication.CreateBuilder(args); - +var env = builder.Environment; var appOptions = builder.Services.GetOptions("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(); diff --git a/src/BuildingBlocks/Logging/Extensions.cs b/src/BuildingBlocks/Logging/Extensions.cs index 7642cfa..f4a1f9f 100644 --- a/src/BuildingBlocks/Logging/Extensions.cs +++ b/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 @@ namespace BuildingBlocks.Logging 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(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); } }); diff --git a/src/Services/Booking/src/Booking.Api/Program.cs b/src/Services/Booking/src/Booking.Api/Program.cs index 6f3bbfe..9931863 100644 --- a/src/Services/Booking/src/Booking.Api/Program.cs +++ b/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.PersistMessageProcessor; 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 @@ Console.WriteLine(FiggleFonts.Standard.Render(appOptions.Name)); builder.Services.AddPersistMessage(configuration); builder.Services.AddMongoDbContext(configuration); -builder.AddCustomSerilog(); +builder.AddCustomSerilog(env); builder.Services.AddCore(); builder.Services.AddJwt(); builder.Services.AddControllers(); @@ -86,6 +83,9 @@ app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name)); app.Run(); -public partial class Program +namespace Booking.Api { + public partial class Program + { + } } diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/PassengerNotFoundException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/PassengerNotFoundException.cs deleted file mode 100644 index a20999d..0000000 --- a/src/Services/Booking/src/Booking/Booking/Exceptions/PassengerNotFoundException.cs +++ /dev/null @@ -1,10 +0,0 @@ -using BuildingBlocks.Exception; - -namespace Booking.Booking.Exceptions; - -public class PassengerNotFoundException: NotFoundException -{ - public PassengerNotFoundException() : base("Flight doesn't exist! ") - { - } -} \ No newline at end of file diff --git a/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs b/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs index e190aeb..7dcec1a 100644 --- a/src/Services/Booking/src/Booking/Booking/Features/BookingMappings.cs +++ b/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; diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommand.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommand.cs similarity index 82% rename from src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommand.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommand.cs index f041564..441ad67 100644 --- a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommand.cs +++ b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommand.cs @@ -2,7 +2,7 @@ using BuildingBlocks.Core.CQRS; 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, IInternalCommand { diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandHandler.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommandHandler.cs similarity index 94% rename from src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandHandler.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommandHandler.cs index 8583e34..0f91a85 100644 --- a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandHandler.cs +++ b/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 { diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandValidator.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommandValidator.cs similarity index 85% rename from src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandValidator.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Commands/V1/CreateBookingCommandValidator.cs index bffa3ed..dd662bc 100644 --- a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingCommandValidator.cs +++ b/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 { diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingEndpoint.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Endpoints/V1/CreateBookingEndpoint.cs similarity index 86% rename from src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingEndpoint.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Endpoints/V1/CreateBookingEndpoint.cs index 77b6fcc..af7d105 100644 --- a/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/CreateBookingEndpoint.cs +++ b/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 diff --git a/src/Services/Booking/src/Booking/Booking/Events/Domain/BookingCreatedDomainEvent.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Events/Domain/V1/BookingCreatedDomainEvent.cs similarity index 76% rename from src/Services/Booking/src/Booking/Booking/Events/Domain/BookingCreatedDomainEvent.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Events/Domain/V1/BookingCreatedDomainEvent.cs index 9533ffe..2a13e14 100644 --- a/src/Services/Booking/src/Booking/Booking/Events/Domain/BookingCreatedDomainEvent.cs +++ b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Events/Domain/V1/BookingCreatedDomainEvent.cs @@ -2,6 +2,6 @@ using Booking.Booking.Models.ValueObjects; 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; diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Exceptions/BookingAlreadyExistException.cs similarity index 77% rename from src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Exceptions/BookingAlreadyExistException.cs index f18d25c..ff9f3f9 100644 --- a/src/Services/Booking/src/Booking/Booking/Exceptions/BookingAlreadyExistException.cs +++ b/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 { diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs b/src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Exceptions/FlightNotFoundException.cs similarity index 74% rename from src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs rename to src/Services/Booking/src/Booking/Booking/Features/CreateBooking/Exceptions/FlightNotFoundException.cs index 0bc6d60..124d7c3 100644 --- a/src/Services/Booking/src/Booking/Booking/Exceptions/FlightNotFoundException.cs +++ b/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 { diff --git a/src/Services/Booking/src/Booking/Booking/Models/Booking.cs b/src/Services/Booking/src/Booking/Booking/Models/Booking.cs index 5ac1c18..ab14f85 100644 --- a/src/Services/Booking/src/Booking/Booking/Models/Booking.cs +++ b/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; diff --git a/src/Services/Booking/src/Booking/BookingProjection.cs b/src/Services/Booking/src/Booking/BookingProjection.cs index e9402fe..663c938 100644 --- a/src/Services/Booking/src/Booking/BookingProjection.cs +++ b/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; diff --git a/src/Services/Booking/src/Booking/EventMapper.cs b/src/Services/Booking/src/Booking/EventMapper.cs index 84f743e..f8ee726 100644 --- a/src/Services/Booking/src/Booking/EventMapper.cs +++ b/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; diff --git a/src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs b/src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs index 06cac08..3e4af47 100644 --- a/src/Services/Booking/tests/IntegrationTest/Booking/Features/CreateBookingTests.cs +++ b/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; diff --git a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs b/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs index 97ba209..86bcfee 100644 --- a/src/Services/Booking/tests/IntegrationTest/Fakes/FakeCreateBookingCommand.cs +++ b/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; diff --git a/src/Services/Flight/src/Flight.Api/Program.cs b/src/Services/Flight/src/Flight.Api/Program.cs index c0e196e..81c943e 100644 --- a/src/Services/Flight/src/Flight.Api/Program.cs +++ b/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 Flight.GrpcServer.Services; 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.AddScoped(); builder.Services.AddMongoDbContext(configuration); builder.Services.AddPersistMessage(configuration); -builder.AddCustomSerilog(); +builder.AddCustomSerilog(env); builder.Services.AddCore(); builder.Services.AddJwt(); builder.Services.AddControllers(); @@ -98,6 +94,9 @@ app.UseEndpoints(endpoints => app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name)); app.Run(); -public partial class Program +namespace Flight.Api { + public partial class Program + { + } } diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs index 5c6e274..695ad9d 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/AircraftMappings.cs +++ b/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; diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommand.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommand.cs similarity index 83% rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommand.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommand.cs index f9fc9db..df98fd5 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommand.cs +++ b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommand.cs @@ -2,9 +2,8 @@ using BuildingBlocks.Core.CQRS; 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, IInternalCommand { diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandHandler.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandHandler.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandHandler.cs index 8409e12..718c087 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandHandler.cs @@ -2,14 +2,14 @@ using System.Threading; 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 { diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandValidator.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandValidator.cs similarity index 86% rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandValidator.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/CreateAircraftCommandValidator.cs index da923f6..ced2729 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftCommandValidator.cs +++ b/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 { diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommand.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommand.cs similarity index 88% rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommand.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommand.cs index 25acf47..efdf3f7 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommand.cs +++ b/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 { diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommandHandler.cs index 93e805c..c1efb94 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Reads/CreateAircraftMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Commands/V1/Reads/CreateAircraftMongoCommandHandler.cs @@ -2,7 +2,7 @@ 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; @@ -10,7 +10,7 @@ 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 { diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftEndpoint.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Endpoints/V1/CreateAircraftEndpoint.cs similarity index 85% rename from src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftEndpoint.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Endpoints/V1/CreateAircraftEndpoint.cs index 1d504cd..4682311 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/CreateAircraftEndpoint.cs +++ b/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 diff --git a/src/Services/Flight/src/Flight/Aircrafts/Events/AircraftCreatedDomainEvent.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Events/Domain/V1/AircraftCreatedDomainEvent.cs similarity index 70% rename from src/Services/Flight/src/Flight/Aircrafts/Events/AircraftCreatedDomainEvent.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Events/Domain/V1/AircraftCreatedDomainEvent.cs index 0a90be0..fa70815 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Events/AircraftCreatedDomainEvent.cs +++ b/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; diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Exceptions/AircraftAlreadyExistException.cs similarity index 78% rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs rename to src/Services/Flight/src/Flight/Aircrafts/Features/CreateAircraft/Exceptions/AircraftAlreadyExistException.cs index 49cb76b..e441645 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/AircraftAlreadyExistException.cs +++ b/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 { diff --git a/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs b/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs index f5c17bd..592605e 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Models/Aircraft.cs +++ b/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; diff --git a/src/Services/Flight/src/Flight/Airports/AirportMappings.cs b/src/Services/Flight/src/Flight/Airports/AirportMappings.cs index 83cb64d..9118285 100644 --- a/src/Services/Flight/src/Flight/Airports/AirportMappings.cs +++ b/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; diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommand.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommand.cs similarity index 83% rename from src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommand.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommand.cs index 9196892..5a01136 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommand.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommand.cs @@ -2,9 +2,8 @@ using BuildingBlocks.Core.CQRS; 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, IInternalCommand { diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommandHandler.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommandHandler.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommandHandler.cs index 503bbd3..77dab54 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommandHandler.cs @@ -2,13 +2,13 @@ using System.Threading; using System.Threading.Tasks; using Ardalis.GuardClauses; using Flight.Airports.Dtos; -using Flight.Airports.Exceptions; +using Flight.Airports.Features.CreateAirport.Exceptions; using Flight.Data; using MapsterMapper; using MediatR; using Microsoft.EntityFrameworkCore; -namespace Flight.Airports.Features.CreateAirport; +namespace Flight.Airports.Features.CreateAirport.Commands.V1; public class CreateAirportCommandHandler : IRequestHandler { diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommandValidator.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommandValidator.cs similarity index 86% rename from src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommandValidator.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommandValidator.cs index 1d02059..eb1ac55 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportCommandValidator.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/CreateAirportCommandValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Flight.Airports.Features.CreateAirport; +namespace Flight.Airports.Features.CreateAirport.Commands.V1; public class CreateAirportCommandValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Reads/CreateAirportMongoCommand.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/Reads/CreateAirportMongoCommand.cs similarity index 87% rename from src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Reads/CreateAirportMongoCommand.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/Reads/CreateAirportMongoCommand.cs index 658f5ce..cfbc48c 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Reads/CreateAirportMongoCommand.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/Reads/CreateAirportMongoCommand.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Core.Event; -namespace Flight.Airports.Features.CreateAirport.Reads; +namespace Flight.Airports.Features.CreateAirport.Commands.V1.Reads; public class CreateAirportMongoCommand : InternalCommand { diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Reads/CreateAirportMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/Reads/CreateAirportMongoCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Reads/CreateAirportMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/Reads/CreateAirportMongoCommandHandler.cs index 3ceab97..6dc3de1 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Reads/CreateAirportMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Commands/V1/Reads/CreateAirportMongoCommandHandler.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using BuildingBlocks.Core.CQRS; -using Flight.Airports.Exceptions; +using Flight.Airports.Features.CreateAirport.Exceptions; using Flight.Airports.Models.Reads; using Flight.Data; using MapsterMapper; @@ -10,7 +10,7 @@ using MediatR; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Flight.Airports.Features.CreateAirport.Reads; +namespace Flight.Airports.Features.CreateAirport.Commands.V1.Reads; public class CreateAirportMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportEndpoint.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Endpoints/V1/CreateAirportEndpoint.cs similarity index 85% rename from src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportEndpoint.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Endpoints/V1/CreateAirportEndpoint.cs index b84f441..0d37781 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/CreateAirportEndpoint.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Endpoints/V1/CreateAirportEndpoint.cs @@ -1,11 +1,12 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Airports.Features.CreateAirport.Commands.V1; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Airports.Features.CreateAirport; +namespace Flight.Airports.Features.CreateAirport.Endpoints.V1; [Route(BaseApiPath + "/flight/airport")] public class CreateAirportEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Airports/Events/AirportCreatedDomainEvent.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Events/Domain/V1/AirportCreatedDomainEvent.cs similarity index 70% rename from src/Services/Flight/src/Flight/Airports/Events/AirportCreatedDomainEvent.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Events/Domain/V1/AirportCreatedDomainEvent.cs index d6b9285..6f1536b 100644 --- a/src/Services/Flight/src/Flight/Airports/Events/AirportCreatedDomainEvent.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Events/Domain/V1/AirportCreatedDomainEvent.cs @@ -1,5 +1,5 @@ using BuildingBlocks.Core.Event; -namespace Flight.Airports.Events; +namespace Flight.Airports.Features.CreateAirport.Events.Domain.V1; public record AirportCreatedDomainEvent(long Id, string Name, string Address, string Code, bool IsDeleted) : IDomainEvent; diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Exceptions/AirportAlreadyExistException.cs similarity index 77% rename from src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs rename to src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Exceptions/AirportAlreadyExistException.cs index e850127..b4d32d2 100644 --- a/src/Services/Flight/src/Flight/Airports/Exceptions/AirportAlreadyExistException.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreateAirport/Exceptions/AirportAlreadyExistException.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Flight.Airports.Exceptions; +namespace Flight.Airports.Features.CreateAirport.Exceptions; public class AirportAlreadyExistException : ConflictException { diff --git a/src/Services/Flight/src/Flight/Airports/Models/Airport.cs b/src/Services/Flight/src/Flight/Airports/Models/Airport.cs index a6e6b46..ae2a0b5 100644 --- a/src/Services/Flight/src/Flight/Airports/Models/Airport.cs +++ b/src/Services/Flight/src/Flight/Airports/Models/Airport.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Core.Model; using BuildingBlocks.IdsGenerator; -using Flight.Airports.Events; +using Flight.Airports.Features.CreateAirport.Events.Domain.V1; namespace Flight.Airports.Models; diff --git a/src/Services/Flight/src/Flight/EventMapper.cs b/src/Services/Flight/src/Flight/EventMapper.cs index d0eeb2c..32e0d36 100644 --- a/src/Services/Flight/src/Flight/EventMapper.cs +++ b/src/Services/Flight/src/Flight/EventMapper.cs @@ -1,17 +1,20 @@ using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.Core; using BuildingBlocks.Core.Event; -using Flight.Aircrafts.Events; -using Flight.Aircrafts.Features.CreateAircraft.Reads; -using Flight.Airports.Events; -using Flight.Airports.Features.CreateAirport.Reads; -using Flight.Flights.Events.Domain; -using Flight.Flights.Features.CreateFlight.Reads; -using Flight.Flights.Features.DeleteFlight.Reads; -using Flight.Flights.Features.UpdateFlight.Reads; -using Flight.Seats.Events; -using Flight.Seats.Features.CreateSeat.Reads; -using Flight.Seats.Features.ReserveSeat.Reads; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1.Reads; +using Flight.Aircrafts.Features.CreateAircraft.Events.Domain.V1; +using Flight.Airports.Features.CreateAirport.Commands.V1.Reads; +using Flight.Airports.Features.CreateAirport.Events.Domain.V1; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; +using Flight.Flights.Features.CreateFlight.Events.Domain.V1; +using Flight.Flights.Features.DeleteFlight.Commands.V1.Reads; +using Flight.Flights.Features.DeleteFlight.Events.Domain.V1; +using Flight.Flights.Features.UpdateFlight.Commands.V1.Reads; +using Flight.Flights.Features.UpdateFlight.Events.V1; +using Flight.Seats.Features.CreateSeat.Commands.V1.Reads; +using Flight.Seats.Features.CreateSeat.Events.Domain.V1; +using Flight.Seats.Features.ReserveSeat.Commands.V1.Reads; +using Flight.Seats.Features.ReserveSeat.Events.Domain.V1; namespace Flight; diff --git a/src/Services/Flight/src/Flight/Flight.csproj b/src/Services/Flight/src/Flight/Flight.csproj index 817c812..a89a5de 100644 --- a/src/Services/Flight/src/Flight/Flight.csproj +++ b/src/Services/Flight/src/Flight/Flight.csproj @@ -18,9 +18,8 @@ - - + diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommand.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommand.cs similarity index 87% rename from src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommand.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommand.cs index e5e1e96..9e816ab 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommand.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommand.cs @@ -3,9 +3,8 @@ using BuildingBlocks.Core.CQRS; using BuildingBlocks.Core.Event; using BuildingBlocks.IdsGenerator; using Flight.Flights.Dtos; -using Flight.Flights.Models; -namespace Flight.Flights.Features.CreateFlight; +namespace Flight.Flights.Features.CreateFlight.Commands.V1; public record CreateFlightCommand(string FlightNumber, long AircraftId, long DepartureAirportId, DateTime DepartureDate, DateTime ArriveDate, long ArriveAirportId, diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommandHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommandHandler.cs similarity index 92% rename from src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommandHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommandHandler.cs index 67b8fa7..c176dfe 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommandHandler.cs @@ -5,10 +5,11 @@ using BuildingBlocks.Core.CQRS; using Flight.Data; using Flight.Flights.Dtos; using Flight.Flights.Exceptions; +using Flight.Flights.Features.CreateFlight.Exceptions; using MapsterMapper; using Microsoft.EntityFrameworkCore; -namespace Flight.Flights.Features.CreateFlight; +namespace Flight.Flights.Features.CreateFlight.Commands.V1; public class CreateFlightCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommandValidator.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommandValidator.cs similarity index 94% rename from src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommandValidator.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommandValidator.cs index f88ae34..482a741 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightCommandValidator.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/CreateFlightCommandValidator.cs @@ -1,7 +1,6 @@ -using Flight.Flights.Models; using FluentValidation; -namespace Flight.Flights.Features.CreateFlight; +namespace Flight.Flights.Features.CreateFlight.Commands.V1; public class CreateFlightCommandValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Reads/CreateFlightMongoCommand.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/Reads/CreateFlightMongoCommand.cs similarity index 93% rename from src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Reads/CreateFlightMongoCommand.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/Reads/CreateFlightMongoCommand.cs index 69b1a73..8498e57 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Reads/CreateFlightMongoCommand.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/Reads/CreateFlightMongoCommand.cs @@ -1,8 +1,7 @@ using System; using BuildingBlocks.Core.Event; -using Flight.Flights.Models; -namespace Flight.Flights.Features.CreateFlight.Reads; +namespace Flight.Flights.Features.CreateFlight.Commands.V1.Reads; public class CreateFlightMongoCommand : InternalCommand { diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Reads/CreateFlightMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/Reads/CreateFlightMongoCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Reads/CreateFlightMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/Reads/CreateFlightMongoCommandHandler.cs index cbc889c..b484200 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Reads/CreateFlightMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Commands/V1/Reads/CreateFlightMongoCommandHandler.cs @@ -4,13 +4,14 @@ using Ardalis.GuardClauses; using BuildingBlocks.Core.CQRS; using Flight.Data; using Flight.Flights.Exceptions; +using Flight.Flights.Features.CreateFlight.Exceptions; using Flight.Flights.Models.Reads; using MapsterMapper; using MediatR; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Flight.Flights.Features.CreateFlight.Reads; +namespace Flight.Flights.Features.CreateFlight.Commands.V1.Reads; public class CreateFlightMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightEndpoint.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Endpoints/V1/CreateFlightEndpoint.cs similarity index 87% rename from src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightEndpoint.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Endpoints/V1/CreateFlightEndpoint.cs index b3630d8..2c2df68 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/CreateFlightEndpoint.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Endpoints/V1/CreateFlightEndpoint.cs @@ -1,12 +1,13 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Flights.Features.CreateFlight.Commands.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Flights.Features.CreateFlight; +namespace Flight.Flights.Features.CreateFlight.Endpoints.V1; [Route(BaseApiPath + "/flight")] public class CreateFlightEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Flights/Events/Domain/FlightCreatedDomainEvent.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Events/Domain/V1/FlightCreatedDomainEvent.cs similarity index 83% rename from src/Services/Flight/src/Flight/Flights/Events/Domain/FlightCreatedDomainEvent.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Events/Domain/V1/FlightCreatedDomainEvent.cs index 9ac0abd..8b52a9a 100644 --- a/src/Services/Flight/src/Flight/Flights/Events/Domain/FlightCreatedDomainEvent.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Events/Domain/V1/FlightCreatedDomainEvent.cs @@ -1,8 +1,7 @@ using System; using BuildingBlocks.Core.Event; -using Flight.Flights.Models; -namespace Flight.Flights.Events.Domain; +namespace Flight.Flights.Features.CreateFlight.Events.Domain.V1; public record FlightCreatedDomainEvent(long Id, string FlightNumber, long AircraftId, DateTime DepartureDate, long DepartureAirportId, DateTime ArriveDate, long ArriveAirportId, decimal DurationMinutes, diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Exceptions/FlightAlreadyExistException.cs similarity index 77% rename from src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs rename to src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Exceptions/FlightAlreadyExistException.cs index be1740e..e179bd8 100644 --- a/src/Services/Flight/src/Flight/Flights/Exceptions/FlightAlreadyExistException.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreateFlight/Exceptions/FlightAlreadyExistException.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Flight.Flights.Exceptions; +namespace Flight.Flights.Features.CreateFlight.Exceptions; public class FlightAlreadyExistException : ConflictException { diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommand.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommand.cs similarity index 75% rename from src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommand.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommand.cs index d0a44f0..b6c8268 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommand.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommand.cs @@ -2,6 +2,6 @@ using BuildingBlocks.Core.Event; using Flight.Flights.Dtos; -namespace Flight.Flights.Features.DeleteFlight; +namespace Flight.Flights.Features.DeleteFlight.Commands.V1; public record DeleteFlightCommand(long Id) : ICommand, IInternalCommand; diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommandHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommandHandler.cs similarity index 94% rename from src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommandHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommandHandler.cs index ec7054e..6875395 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommandHandler.cs @@ -5,12 +5,10 @@ using BuildingBlocks.Core.CQRS; using Flight.Data; using Flight.Flights.Dtos; using Flight.Flights.Exceptions; -using Flight.Flights.Models; using MapsterMapper; -using MediatR; using Microsoft.EntityFrameworkCore; -namespace Flight.Flights.Features.DeleteFlight; +namespace Flight.Flights.Features.DeleteFlight.Commands.V1; public class DeleteFlightCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommandValidator.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommandValidator.cs similarity index 80% rename from src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommandValidator.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommandValidator.cs index 416865f..fb9a709 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightCommandValidator.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/DeleteFlightCommandValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Flight.Flights.Features.DeleteFlight; +namespace Flight.Flights.Features.DeleteFlight.Commands.V1; public class DeleteFlightCommandValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Reads/DeleteFlightMongoCommand.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/Reads/DeleteFlightMongoCommand.cs similarity index 93% rename from src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Reads/DeleteFlightMongoCommand.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/Reads/DeleteFlightMongoCommand.cs index e8ab371..06b0837 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Reads/DeleteFlightMongoCommand.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/Reads/DeleteFlightMongoCommand.cs @@ -1,8 +1,7 @@ using System; using BuildingBlocks.Core.Event; -using Flight.Flights.Models; -namespace Flight.Flights.Features.DeleteFlight.Reads; +namespace Flight.Flights.Features.DeleteFlight.Commands.V1.Reads; public class DeleteFlightMongoCommand : InternalCommand { diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Reads/DeleteFlightMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/Reads/DeleteFlightMongoCommandHandler.cs similarity index 95% rename from src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Reads/DeleteFlightMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/Reads/DeleteFlightMongoCommandHandler.cs index f120518..edb6385 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Reads/DeleteFlightMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Commands/V1/Reads/DeleteFlightMongoCommandHandler.cs @@ -10,7 +10,7 @@ using MediatR; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Flight.Flights.Features.DeleteFlight.Reads; +namespace Flight.Flights.Features.DeleteFlight.Commands.V1.Reads; public class DeleteFlightMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightEndpoint.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Endpoints/V1/DeleteFlightEndpoint.cs similarity index 86% rename from src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightEndpoint.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Endpoints/V1/DeleteFlightEndpoint.cs index 2045b43..d862eab 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/DeleteFlightEndpoint.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Endpoints/V1/DeleteFlightEndpoint.cs @@ -1,12 +1,13 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Flights.Features.DeleteFlight.Commands.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Flights.Features.DeleteFlight; +namespace Flight.Flights.Features.DeleteFlight.Endpoints.V1; [Route(BaseApiPath + "/flight")] public class DeleteFlightEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Flights/Events/Domain/FlightDeletedDomainEvent.cs b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Events/Domain/V1/FlightDeletedDomainEvent.cs similarity index 83% rename from src/Services/Flight/src/Flight/Flights/Events/Domain/FlightDeletedDomainEvent.cs rename to src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Events/Domain/V1/FlightDeletedDomainEvent.cs index dc10029..a73bad9 100644 --- a/src/Services/Flight/src/Flight/Flights/Events/Domain/FlightDeletedDomainEvent.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeleteFlight/Events/Domain/V1/FlightDeletedDomainEvent.cs @@ -1,8 +1,7 @@ using System; using BuildingBlocks.Core.Event; -using Flight.Flights.Models; -namespace Flight.Flights.Events.Domain; +namespace Flight.Flights.Features.DeleteFlight.Events.Domain.V1; public record FlightDeletedDomainEvent(long Id, string FlightNumber, long AircraftId, DateTime DepartureDate, long DepartureAirportId, DateTime ArriveDate, long ArriveAirportId, decimal DurationMinutes, diff --git a/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs b/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs index 7dfcf91..e733305 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/FlightMappings.cs @@ -1,9 +1,9 @@ using AutoMapper; using BuildingBlocks.IdsGenerator; using Flight.Flights.Dtos; -using Flight.Flights.Features.CreateFlight.Reads; -using Flight.Flights.Features.DeleteFlight.Reads; -using Flight.Flights.Features.UpdateFlight.Reads; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; +using Flight.Flights.Features.DeleteFlight.Commands.V1.Reads; +using Flight.Flights.Features.UpdateFlight.Commands.V1.Reads; using Flight.Flights.Models.Reads; using Mapster; diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsEndpoint.cs b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Endpoints/V1/GetAvailableFlightsEndpoint.cs similarity index 86% rename from src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsEndpoint.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Endpoints/V1/GetAvailableFlightsEndpoint.cs index 508a98d..e0c7bd8 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsEndpoint.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Endpoints/V1/GetAvailableFlightsEndpoint.cs @@ -1,12 +1,13 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Flights.Features.GetAvailableFlights.Queries.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Flights.Features.GetAvailableFlights; +namespace Flight.Flights.Features.GetAvailableFlights.Endpoints.V1; [Route(BaseApiPath + "/flight/get-available-flights")] public class GetAvailableFlightsEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQuery.cs b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQuery.cs similarity index 84% rename from src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQuery.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQuery.cs index f5c8f12..64a6fd3 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQuery.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQuery.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using BuildingBlocks.Caching; using BuildingBlocks.Core.CQRS; using Flight.Flights.Dtos; -using MediatR; -namespace Flight.Flights.Features.GetAvailableFlights; +namespace Flight.Flights.Features.GetAvailableFlights.Queries.V1; public record GetAvailableFlightsQuery : IQuery>, ICacheRequest { diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQueryHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQueryHandler.cs similarity index 94% rename from src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQueryHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQueryHandler.cs index 8470dc9..305b1cf 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQueryHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQueryHandler.cs @@ -10,7 +10,7 @@ using Flight.Flights.Exceptions; using MapsterMapper; using MongoDB.Driver; -namespace Flight.Flights.Features.GetAvailableFlights; +namespace Flight.Flights.Features.GetAvailableFlights.Queries.V1; public class GetAvailableFlightsQueryHandler : IQueryHandler> { diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQueryValidator.cs b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQueryValidator.cs similarity index 65% rename from src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQueryValidator.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQueryValidator.cs index 39cff6e..d4e95c6 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/GetAvailableFlightsQueryValidator.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetAvailableFlights/Queries/V1/GetAvailableFlightsQueryValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Flight.Flights.Features.GetAvailableFlights; +namespace Flight.Flights.Features.GetAvailableFlights.Queries.V1; public class GetAvailableFlightsQueryValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdEndpoint.cs b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Endpoints/V1/GetFlightByIdEndpoint.cs similarity index 86% rename from src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdEndpoint.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Endpoints/V1/GetFlightByIdEndpoint.cs index ab355c2..e089df1 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdEndpoint.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Endpoints/V1/GetFlightByIdEndpoint.cs @@ -1,13 +1,13 @@ -using System; using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Flights.Features.GetFlightById.Queries.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Flights.Features.GetFlightById; +namespace Flight.Flights.Features.GetFlightById.Endpoints.V1; [Route(BaseApiPath + "/flight")] public class GetFlightByIdEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQuery.cs b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQuery.cs similarity index 68% rename from src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQuery.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQuery.cs index c093b98..18f6cdd 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQuery.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQuery.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Core.CQRS; using Flight.Flights.Dtos; -namespace Flight.Flights.Features.GetFlightById; +namespace Flight.Flights.Features.GetFlightById.Queries.V1; public record GetFlightByIdQuery(long Id) : IQuery; diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQueryHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQueryHandler.cs similarity index 95% rename from src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQueryHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQueryHandler.cs index e2cb9ea..4af6560 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQueryHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQueryHandler.cs @@ -9,7 +9,7 @@ using MapsterMapper; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Flight.Flights.Features.GetFlightById; +namespace Flight.Flights.Features.GetFlightById.Queries.V1; public class GetFlightByIdQueryHandler : IQueryHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQueryValidator.cs b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQueryValidator.cs similarity index 82% rename from src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQueryValidator.cs rename to src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQueryValidator.cs index 5a8252f..5a30758 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/GetFlightByIdQueryValidator.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GetFlightById/Queries/V1/GetFlightByIdQueryValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Flight.Flights.Features.GetFlightById; +namespace Flight.Flights.Features.GetFlightById.Queries.V1; public class GetFlightByIdQueryValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Reads/UpdateFlightMongoCommand.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/Reads/UpdateFlightMongoCommand.cs similarity index 94% rename from src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Reads/UpdateFlightMongoCommand.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/Reads/UpdateFlightMongoCommand.cs index d6142f1..4f07624 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Reads/UpdateFlightMongoCommand.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/Reads/UpdateFlightMongoCommand.cs @@ -1,8 +1,7 @@ using System; using BuildingBlocks.Core.Event; -using Flight.Flights.Models; -namespace Flight.Flights.Features.UpdateFlight.Reads; +namespace Flight.Flights.Features.UpdateFlight.Commands.V1.Reads; public class UpdateFlightMongoCommand : InternalCommand { diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Reads/UpdateFlightMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/Reads/UpdateFlightMongoCommandHandler.cs similarity index 97% rename from src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Reads/UpdateFlightMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/Reads/UpdateFlightMongoCommandHandler.cs index ca0fa1e..f66ec87 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Reads/UpdateFlightMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/Reads/UpdateFlightMongoCommandHandler.cs @@ -10,7 +10,7 @@ using MediatR; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Flight.Flights.Features.UpdateFlight.Reads; +namespace Flight.Flights.Features.UpdateFlight.Commands.V1.Reads; public class UpdateFlightMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommand.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommand.cs similarity index 90% rename from src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommand.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommand.cs index cf095b4..0cc5ba4 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommand.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommand.cs @@ -3,10 +3,8 @@ using BuildingBlocks.Caching; using BuildingBlocks.Core.CQRS; using BuildingBlocks.Core.Event; using Flight.Flights.Dtos; -using Flight.Flights.Models; -using MediatR; -namespace Flight.Flights.Features.UpdateFlight; +namespace Flight.Flights.Features.UpdateFlight.Commands.V1; public record UpdateFlightCommand : ICommand, IInvalidateCacheRequest, IInternalCommand { diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommandHandler.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommandHandler.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommandHandler.cs index 09baa0e..011575f 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommandHandler.cs @@ -2,16 +2,13 @@ using System.Threading; using System.Threading.Tasks; using Ardalis.GuardClauses; using BuildingBlocks.Core.CQRS; -using BuildingBlocks.EventStoreDB.Repository; using Flight.Data; using Flight.Flights.Dtos; using Flight.Flights.Exceptions; -using Flight.Flights.Models; using MapsterMapper; -using MediatR; using Microsoft.EntityFrameworkCore; -namespace Flight.Flights.Features.UpdateFlight; +namespace Flight.Flights.Features.UpdateFlight.Commands.V1; public class UpdateFlightCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommandValidator.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommandValidator.cs similarity index 91% rename from src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommandValidator.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommandValidator.cs index 186c0b9..8a859b6 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightCommandValidator.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Commands/V1/UpdateFlightCommandValidator.cs @@ -1,8 +1,7 @@ -using Flight.Flights.Features.CreateFlight; -using Flight.Flights.Models; +using Flight.Flights.Features.CreateFlight.Commands.V1; using FluentValidation; -namespace Flight.Flights.Features.UpdateFlight; +namespace Flight.Flights.Features.UpdateFlight.Commands.V1; public class UpdateFlightCommandValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightEndpoint.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Endpoints/V1/UpdateFlightEndpoint.cs similarity index 86% rename from src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightEndpoint.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Endpoints/V1/UpdateFlightEndpoint.cs index fbc6e68..a01603b 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/UpdateFlightEndpoint.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Endpoints/V1/UpdateFlightEndpoint.cs @@ -1,12 +1,13 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Flights.Features.UpdateFlight.Commands.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Flights.Features.UpdateFlight; +namespace Flight.Flights.Features.UpdateFlight.Endpoints.V1; [Route(BaseApiPath + "/flight")] public class UpdateFlightEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Flights/Events/Domain/FlightUpdatedDomainEvent.cs b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Events/V1/FlightUpdatedDomainEvent.cs similarity index 83% rename from src/Services/Flight/src/Flight/Flights/Events/Domain/FlightUpdatedDomainEvent.cs rename to src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Events/V1/FlightUpdatedDomainEvent.cs index ae71e11..a81e410 100644 --- a/src/Services/Flight/src/Flight/Flights/Events/Domain/FlightUpdatedDomainEvent.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/UpdateFlight/Events/V1/FlightUpdatedDomainEvent.cs @@ -1,8 +1,7 @@ using System; using BuildingBlocks.Core.Event; -using Flight.Flights.Models; -namespace Flight.Flights.Events.Domain; +namespace Flight.Flights.Features.UpdateFlight.Events.V1; public record FlightUpdatedDomainEvent(long Id, string FlightNumber, long AircraftId, DateTime DepartureDate, long DepartureAirportId, DateTime ArriveDate, long ArriveAirportId, decimal DurationMinutes, DateTime FlightDate, Enums.FlightStatus Status, decimal Price, bool IsDeleted) : IDomainEvent; diff --git a/src/Services/Flight/src/Flight/Flights/Models/Flight.cs b/src/Services/Flight/src/Flight/Flights/Models/Flight.cs index 7e47e48..5b4bf29 100644 --- a/src/Services/Flight/src/Flight/Flights/Models/Flight.cs +++ b/src/Services/Flight/src/Flight/Flights/Models/Flight.cs @@ -1,6 +1,8 @@ using System; using BuildingBlocks.Core.Model; -using Flight.Flights.Events.Domain; +using Flight.Flights.Features.CreateFlight.Events.Domain.V1; +using Flight.Flights.Features.DeleteFlight.Events.Domain.V1; +using Flight.Flights.Features.UpdateFlight.Events.V1; namespace Flight.Flights.Models; diff --git a/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs b/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs index cb39f3a..2fc625f 100644 --- a/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs +++ b/src/Services/Flight/src/Flight/GrpcServer/Services/FlightGrpcServices.cs @@ -1,7 +1,10 @@ using System.Threading.Tasks; using Flight.Flights.Features.GetFlightById; +using Flight.Flights.Features.GetFlightById.Queries.V1; using Flight.Seats.Features.GetAvailableSeats; +using Flight.Seats.Features.GetAvailableSeats.Queries.V1; using Flight.Seats.Features.ReserveSeat; +using Flight.Seats.Features.ReserveSeat.Commands.V1; using Grpc.Core; using Mapster; using MediatR; diff --git a/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs b/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/Consumes/V1/RegisterNewUserConsumerHandler.cs similarity index 92% rename from src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs rename to src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/Consumes/V1/RegisterNewUserConsumerHandler.cs index 20f997b..0325841 100644 --- a/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs +++ b/src/Services/Flight/src/Flight/Identity/Consumers/RegisterNewUser/Consumes/V1/RegisterNewUserConsumerHandler.cs @@ -6,7 +6,7 @@ using MassTransit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Flight.Identity.Consumers.RegisterNewUser; +namespace Flight.Identity.Consumers.RegisterNewUser.Consumes.V1; public class RegisterNewUserConsumerHandler : IConsumer { diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyChosenException.cs b/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyChosenException.cs deleted file mode 100644 index 5c132c2..0000000 --- a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyChosenException.cs +++ /dev/null @@ -1,10 +0,0 @@ -using BuildingBlocks.Exception; - -namespace Flight.Seats.Exceptions; - -public class SeatAlreadyChosenException : ConflictException -{ - public SeatAlreadyChosenException(int? code = default) : base("Seat already chosen!", code) - { - } -} diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommand.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommand.cs similarity index 83% rename from src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommand.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommand.cs index e62202d..9793485 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommand.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommand.cs @@ -2,9 +2,8 @@ using BuildingBlocks.Core.CQRS; using BuildingBlocks.Core.Event; using BuildingBlocks.IdsGenerator; using Flight.Seats.Dtos; -using Flight.Seats.Models; -namespace Flight.Seats.Features.CreateSeat; +namespace Flight.Seats.Features.CreateSeat.Commands.V1; public record CreateSeatCommand(string SeatNumber, Enums.SeatType Type, Enums.SeatClass Class, long FlightId) : ICommand, IInternalCommand { diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommandHandler.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommandHandler.cs similarity index 83% rename from src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommandHandler.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommandHandler.cs index 08b26c9..757cb43 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommandHandler.cs @@ -1,20 +1,15 @@ -using System.Linq; using System.Threading; using System.Threading.Tasks; using Ardalis.GuardClauses; -using BuildingBlocks.EventStoreDB.Repository; -using Flight.Airports.Exceptions; -using Flight.Airports.Features.CreateAirport; -using Flight.Airports.Models; using Flight.Data; using Flight.Seats.Dtos; -using Flight.Seats.Exceptions; +using Flight.Seats.Features.CreateSeat.Exceptions; using Flight.Seats.Models; using MapsterMapper; using MediatR; using Microsoft.EntityFrameworkCore; -namespace Flight.Seats.Features.CreateSeat; +namespace Flight.Seats.Features.CreateSeat.Commands.V1; public class CreateSeatCommandHandler : IRequestHandler { diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommandValidator.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommandValidator.cs similarity index 85% rename from src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommandValidator.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommandValidator.cs index 2f103a1..48bfa99 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatCommandValidator.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/CreateSeatCommandValidator.cs @@ -1,8 +1,6 @@ -using Flight.Airports.Features.CreateAirport; -using Flight.Seats.Models; using FluentValidation; -namespace Flight.Seats.Features.CreateSeat; +namespace Flight.Seats.Features.CreateSeat.Commands.V1; public class CreateSeatCommandValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Reads/CreateSeatMongoCommand.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/Reads/CreateSeatMongoCommand.cs similarity index 89% rename from src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Reads/CreateSeatMongoCommand.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/Reads/CreateSeatMongoCommand.cs index baac229..dc94bc1 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Reads/CreateSeatMongoCommand.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/Reads/CreateSeatMongoCommand.cs @@ -1,7 +1,6 @@ using BuildingBlocks.Core.Event; -using Flight.Seats.Models; -namespace Flight.Seats.Features.CreateSeat.Reads; +namespace Flight.Seats.Features.CreateSeat.Commands.V1.Reads; public class CreateSeatMongoCommand : InternalCommand { diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Reads/CreateSeatMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/Reads/CreateSeatMongoCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Reads/CreateSeatMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/Reads/CreateSeatMongoCommandHandler.cs index 47487fa..5658e43 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Reads/CreateSeatMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Commands/V1/Reads/CreateSeatMongoCommandHandler.cs @@ -3,14 +3,14 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using BuildingBlocks.Core.CQRS; using Flight.Data; -using Flight.Seats.Exceptions; +using Flight.Seats.Features.CreateSeat.Exceptions; using Flight.Seats.Models.Reads; using MapsterMapper; using MediatR; using MongoDB.Driver; using MongoDB.Driver.Linq; -namespace Flight.Seats.Features.CreateSeat.Reads; +namespace Flight.Seats.Features.CreateSeat.Commands.V1.Reads; public class CreateSeatMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatEndpoint.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Endpoints/V1/CreateSeatEndpoint.cs similarity index 86% rename from src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatEndpoint.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Endpoints/V1/CreateSeatEndpoint.cs index 77f6e7b..3cec678 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/CreateSeatEndpoint.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Endpoints/V1/CreateSeatEndpoint.cs @@ -1,12 +1,12 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; -using Flight.Airports.Features.CreateAirport; +using Flight.Seats.Features.CreateSeat.Commands.V1; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Seats.Features.CreateSeat; +namespace Flight.Seats.Features.CreateSeat.Endpoints.V1; [Route(BaseApiPath + "/flight/seat")] public class CreateSeatEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Seats/Events/SeatCreatedDomainEvent.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Events/Domain/V1/SeatCreatedDomainEvent.cs similarity index 75% rename from src/Services/Flight/src/Flight/Seats/Events/SeatCreatedDomainEvent.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Events/Domain/V1/SeatCreatedDomainEvent.cs index a1faf5e..c80ea00 100644 --- a/src/Services/Flight/src/Flight/Seats/Events/SeatCreatedDomainEvent.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Events/Domain/V1/SeatCreatedDomainEvent.cs @@ -1,6 +1,5 @@ using BuildingBlocks.Core.Event; -using Flight.Seats.Models; -namespace Flight.Seats.Events; +namespace Flight.Seats.Features.CreateSeat.Events.Domain.V1; public record SeatCreatedDomainEvent(long Id, string SeatNumber, Enums.SeatType Type, Enums.SeatClass Class, long FlightId, bool IsDeleted) : IDomainEvent; diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Exceptions/SeatAlreadyExistException.cs similarity index 78% rename from src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs rename to src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Exceptions/SeatAlreadyExistException.cs index 35c59b1..a40afe4 100644 --- a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatAlreadyExistException.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreateSeat/Exceptions/SeatAlreadyExistException.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Flight.Seats.Exceptions; +namespace Flight.Seats.Features.CreateSeat.Exceptions; public class SeatAlreadyExistException : ConflictException { diff --git a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsEndpoint.cs b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Endpoints/V1/GetAvailableSeatsEndpoint.cs similarity index 87% rename from src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsEndpoint.cs rename to src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Endpoints/V1/GetAvailableSeatsEndpoint.cs index e1f1c04..c1fe0eb 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsEndpoint.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Endpoints/V1/GetAvailableSeatsEndpoint.cs @@ -1,12 +1,13 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Seats.Features.GetAvailableSeats.Queries.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Seats.Features.GetAvailableSeats; +namespace Flight.Seats.Features.GetAvailableSeats.Endpoints.V1; [Route(BaseApiPath + "/flight/get-available-seats")] public class GetAvailableSeatsEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Exceptions/AllSeatsFullException.cs similarity index 73% rename from src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs rename to src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Exceptions/AllSeatsFullException.cs index a23a4b9..1f41e9f 100644 --- a/src/Services/Flight/src/Flight/Seats/Exceptions/AllSeatsFullException.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Exceptions/AllSeatsFullException.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Flight.Seats.Exceptions; +namespace Flight.Seats.Features.GetAvailableSeats.Exceptions; public class AllSeatsFullException : BadRequestException { diff --git a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQuery.cs b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQuery.cs similarity index 73% rename from src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQuery.cs rename to src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQuery.cs index cf9e936..770f9eb 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQuery.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQuery.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using BuildingBlocks.Core.CQRS; using Flight.Seats.Dtos; -using MediatR; -namespace Flight.Seats.Features.GetAvailableSeats; +namespace Flight.Seats.Features.GetAvailableSeats.Queries.V1; public record GetAvailableSeatsQuery(long FlightId) : IQuery>; diff --git a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQueryHandler.cs b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQueryHandler.cs similarity index 90% rename from src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQueryHandler.cs rename to src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQueryHandler.cs index 199d6e3..c418b50 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQueryHandler.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQueryHandler.cs @@ -5,12 +5,12 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using Flight.Data; using Flight.Seats.Dtos; -using Flight.Seats.Exceptions; +using Flight.Seats.Features.GetAvailableSeats.Exceptions; using MapsterMapper; using MediatR; using MongoDB.Driver; -namespace Flight.Seats.Features.GetAvailableSeats; +namespace Flight.Seats.Features.GetAvailableSeats.Queries.V1; public class GetAvailableSeatsQueryHandler : IRequestHandler> { diff --git a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQueryValidator.cs b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQueryValidator.cs similarity index 82% rename from src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQueryValidator.cs rename to src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQueryValidator.cs index 4d35498..a3e486e 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/GetAvailableSeatsQueryValidator.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/GetAvailableSeats/Queries/V1/GetAvailableSeatsQueryValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Flight.Seats.Features.GetAvailableSeats; +namespace Flight.Seats.Features.GetAvailableSeats.Queries.V1; public class GetAvailableSeatsQueryValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Reads/ReserveSeatMongoCommand.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/Reads/ReserveSeatMongoCommand.cs similarity index 88% rename from src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Reads/ReserveSeatMongoCommand.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/Reads/ReserveSeatMongoCommand.cs index a1f6e31..fdf77d5 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Reads/ReserveSeatMongoCommand.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/Reads/ReserveSeatMongoCommand.cs @@ -1,7 +1,6 @@ using BuildingBlocks.Core.Event; -using Flight.Seats.Models; -namespace Flight.Seats.Features.ReserveSeat.Reads; +namespace Flight.Seats.Features.ReserveSeat.Commands.V1.Reads; public class ReserveSeatMongoCommand : InternalCommand { diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Reads/ReserveSeatMongoCommandHandler.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/Reads/ReserveSeatMongoCommandHandler.cs similarity index 94% rename from src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Reads/ReserveSeatMongoCommandHandler.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/Reads/ReserveSeatMongoCommandHandler.cs index c479951..a37f7b7 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Reads/ReserveSeatMongoCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/Reads/ReserveSeatMongoCommandHandler.cs @@ -8,7 +8,7 @@ using MapsterMapper; using MediatR; using MongoDB.Driver; -namespace Flight.Seats.Features.ReserveSeat.Reads; +namespace Flight.Seats.Features.ReserveSeat.Commands.V1.Reads; public class ReserveSeatMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommand.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommand.cs similarity index 78% rename from src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommand.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommand.cs index b63e562..dfba907 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommand.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommand.cs @@ -2,6 +2,6 @@ using BuildingBlocks.Core.CQRS; using BuildingBlocks.Core.Event; using Flight.Seats.Dtos; -namespace Flight.Seats.Features.ReserveSeat; +namespace Flight.Seats.Features.ReserveSeat.Commands.V1; public record ReserveSeatCommand(long FlightId, string SeatNumber) : ICommand, IInternalCommand; diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommandHandler.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommandHandler.cs similarity index 91% rename from src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommandHandler.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommandHandler.cs index 04dd257..2b15fc1 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommandHandler.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommandHandler.cs @@ -3,12 +3,12 @@ using System.Threading.Tasks; using Ardalis.GuardClauses; using Flight.Data; using Flight.Seats.Dtos; -using Flight.Seats.Exceptions; +using Flight.Seats.Features.ReserveSeat.Exceptions; using MapsterMapper; using MediatR; using Microsoft.EntityFrameworkCore; -namespace Flight.Seats.Features.ReserveSeat; +namespace Flight.Seats.Features.ReserveSeat.Commands.V1; public class ReserveSeatCommandHandler : IRequestHandler { diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommandValidator.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommandValidator.cs similarity index 87% rename from src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommandValidator.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommandValidator.cs index daedbda..881d36a 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatCommandValidator.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Commands/V1/ReserveSeatCommandValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Flight.Seats.Features.ReserveSeat; +namespace Flight.Seats.Features.ReserveSeat.Commands.V1; public class ReserveSeatCommandValidator : AbstractValidator { diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatEndpoint.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Endpoints/V1/ReserveSeatEndpoint.cs similarity index 87% rename from src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatEndpoint.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Endpoints/V1/ReserveSeatEndpoint.cs index f95dd27..cf71023 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/ReserveSeatEndpoint.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Endpoints/V1/ReserveSeatEndpoint.cs @@ -1,12 +1,13 @@ using System.Threading; using System.Threading.Tasks; using BuildingBlocks.Web; +using Flight.Seats.Features.ReserveSeat.Commands.V1; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Flight.Seats.Features.ReserveSeat; +namespace Flight.Seats.Features.ReserveSeat.Endpoints.V1; [Route(BaseApiPath + "/flight/reserve-seat")] public class ReserveSeatEndpoint : BaseController diff --git a/src/Services/Flight/src/Flight/Seats/Events/SeatReservedDomainEvent.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Events/Domain/V1/SeatReservedDomainEvent.cs similarity index 75% rename from src/Services/Flight/src/Flight/Seats/Events/SeatReservedDomainEvent.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Events/Domain/V1/SeatReservedDomainEvent.cs index 06f3891..45655ee 100644 --- a/src/Services/Flight/src/Flight/Seats/Events/SeatReservedDomainEvent.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Events/Domain/V1/SeatReservedDomainEvent.cs @@ -1,6 +1,5 @@ using BuildingBlocks.Core.Event; -using Flight.Seats.Models; -namespace Flight.Seats.Events; +namespace Flight.Seats.Features.ReserveSeat.Events.Domain.V1; public record SeatReservedDomainEvent(long Id, string SeatNumber, Enums.SeatType Type, Enums.SeatClass Class, long FlightId, bool IsDeleted) : IDomainEvent; diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Exceptions/SeatNumberIncorrectException.cs similarity index 77% rename from src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs rename to src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Exceptions/SeatNumberIncorrectException.cs index e434104..cf731ea 100644 --- a/src/Services/Flight/src/Flight/Seats/Exceptions/SeatNumberIncorrectException.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReserveSeat/Exceptions/SeatNumberIncorrectException.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Flight.Seats.Exceptions; +namespace Flight.Seats.Features.ReserveSeat.Exceptions; public class SeatNumberIncorrectException : BadRequestException { diff --git a/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs b/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs index 79aabb7..d8db4fb 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/SeatMappings.cs @@ -1,7 +1,7 @@ using BuildingBlocks.IdsGenerator; using Flight.Seats.Dtos; -using Flight.Seats.Features.CreateSeat.Reads; -using Flight.Seats.Features.ReserveSeat.Reads; +using Flight.Seats.Features.CreateSeat.Commands.V1.Reads; +using Flight.Seats.Features.ReserveSeat.Commands.V1.Reads; using Flight.Seats.Models; using Flight.Seats.Models.Reads; using Mapster; diff --git a/src/Services/Flight/src/Flight/Seats/Models/Seat.cs b/src/Services/Flight/src/Flight/Seats/Models/Seat.cs index 8db8a70..f4c4f2e 100644 --- a/src/Services/Flight/src/Flight/Seats/Models/Seat.cs +++ b/src/Services/Flight/src/Flight/Seats/Models/Seat.cs @@ -1,7 +1,8 @@ using System; using System.Threading.Tasks; using BuildingBlocks.Core.Model; -using Flight.Seats.Events; +using Flight.Seats.Features.CreateSeat.Events.Domain.V1; +using Flight.Seats.Features.ReserveSeat.Events.Domain.V1; namespace Flight.Seats.Models; diff --git a/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs b/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs index 3d9b45f..75f1c7c 100644 --- a/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Aircraft/Features/CreateAircraftTests.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.TestBase; -using Flight.Aircrafts.Features.CreateAircraft.Reads; -using Flight.Airports.Features.CreateAirport.Reads; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1.Reads; +using Flight.Api; using Flight.Data; using FluentAssertions; using Grpc.Net.Client; diff --git a/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs b/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs index 10c25ce..260644d 100644 --- a/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Airport/Features/CreateAirportTests.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.TestBase; -using Flight.Aircrafts.Features.CreateAircraft.Reads; -using Flight.Airports.Features.CreateAirport.Reads; +using Flight.Airports.Features.CreateAirport.Commands.V1.Reads; +using Flight.Api; using Flight.Data; using FluentAssertions; using Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs index 3ae5518..0ddedd2 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAircraftCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Aircrafts.Features.CreateAircraft; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs index 5e6c479..54a9e49 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateAirportCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Airports.Features.CreateAirport; +using Flight.Airports.Features.CreateAirport.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs index d3f2c92..6f34b79 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateFlightCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Flights.Features.CreateFlight; +using Flight.Flights.Features.CreateFlight.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs index 54546ff..faeae0a 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeCreateSeatCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Seats.Features.CreateSeat; +using Flight.Seats.Features.CreateSeat.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeFlightCreated.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeFlightCreated.cs index 6281287..90579b0 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeFlightCreated.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeFlightCreated.cs @@ -1,4 +1,5 @@ using Flight.Flights.Features.CreateFlight; +using Flight.Flights.Features.CreateFlight.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeSeatCreated.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeSeatCreated.cs index 8814ad1..f546faa 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeSeatCreated.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeSeatCreated.cs @@ -1,4 +1,5 @@ using Flight.Seats.Features.CreateSeat; +using Flight.Seats.Features.CreateSeat.Commands.V1; using Flight.Seats.Models; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs index 9adeeae..196a206 100644 --- a/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs +++ b/src/Services/Flight/tests/IntegrationTest/Fakes/FakeUpdateFlightCommand.cs @@ -1,5 +1,6 @@ using AutoBogus; using Flight.Flights.Features.UpdateFlight; +using Flight.Flights.Features.UpdateFlight.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs b/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs index 0c21ad7..36d0d2d 100644 --- a/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Flight/Features/CreateFlightTests.cs @@ -1,8 +1,9 @@ using System.Threading.Tasks; using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.TestBase; +using Flight.Api; using Flight.Data; -using Flight.Flights.Features.CreateFlight.Reads; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; using FluentAssertions; using Integration.Test.Fakes; using MassTransit; diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs b/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs index add3a17..1e3da0b 100644 --- a/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Flight/Features/DeleteFlightTests.cs @@ -2,9 +2,11 @@ using System.Threading.Tasks; using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.TestBase; +using Flight.Api; using Flight.Data; using Flight.Flights.Features.DeleteFlight; -using Flight.Flights.Features.DeleteFlight.Reads; +using Flight.Flights.Features.DeleteFlight.Commands.V1; +using Flight.Flights.Features.DeleteFlight.Commands.V1.Reads; using FluentAssertions; using MassTransit; using MassTransit.Testing; diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs b/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs index 9718e00..913e22a 100644 --- a/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetAvailableFlightsTests.cs @@ -1,9 +1,11 @@ using System.Linq; using System.Threading.Tasks; using BuildingBlocks.TestBase; +using Flight.Api; using Flight.Data; -using Flight.Flights.Features.CreateFlight.Reads; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; using Flight.Flights.Features.GetAvailableFlights; +using Flight.Flights.Features.GetAvailableFlights.Queries.V1; using FluentAssertions; using Integration.Test.Fakes; using Xunit; diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs b/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs index cf9f01c..e4615be 100644 --- a/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Flight/Features/GetFlightByIdTests.cs @@ -1,9 +1,11 @@ using System.Threading.Tasks; using BuildingBlocks.TestBase; using Flight; +using Flight.Api; using Flight.Data; -using Flight.Flights.Features.CreateFlight.Reads; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; using Flight.Flights.Features.GetFlightById; +using Flight.Flights.Features.GetFlightById.Queries.V1; using Flight.GrpcServer.Services; using FluentAssertions; using Grpc.Net.Client; diff --git a/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs b/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs index 03d9cca..5586a1f 100644 --- a/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Flight/Features/UpdateFlightTests.cs @@ -1,8 +1,9 @@ using System.Threading.Tasks; using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.TestBase; +using Flight.Api; using Flight.Data; -using Flight.Flights.Features.UpdateFlight.Reads; +using Flight.Flights.Features.UpdateFlight.Commands.V1.Reads; using FluentAssertions; using Integration.Test.Fakes; using MassTransit; diff --git a/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs b/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs index a0577e5..7276158 100644 --- a/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Seat/Features/GetAvailableSeatsTests.cs @@ -1,9 +1,10 @@ using System.Threading.Tasks; using BuildingBlocks.TestBase; using Flight; +using Flight.Api; using Flight.Data; -using Flight.Flights.Features.CreateFlight.Reads; -using Flight.Seats.Features.CreateSeat.Reads; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; +using Flight.Seats.Features.CreateSeat.Commands.V1.Reads; using FluentAssertions; using Grpc.Net.Client; using Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs b/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs index 94c4a95..be2da07 100644 --- a/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs +++ b/src/Services/Flight/tests/IntegrationTest/Seat/Features/ReserveSeatTests.cs @@ -1,9 +1,10 @@ using System.Threading.Tasks; using BuildingBlocks.TestBase; using Flight; +using Flight.Api; using Flight.Data; -using Flight.Flights.Features.CreateFlight.Reads; -using Flight.Seats.Features.CreateSeat.Reads; +using Flight.Flights.Features.CreateFlight.Commands.V1.Reads; +using Flight.Seats.Features.CreateSeat.Commands.V1.Reads; using FluentAssertions; using Grpc.Net.Client; using Integration.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs b/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs index 166a096..eefbd98 100644 --- a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs +++ b/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs @@ -3,6 +3,7 @@ using System.Threading; using System.Threading.Tasks; using Flight.Aircrafts.Dtos; using Flight.Aircrafts.Features.CreateAircraft; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1; using FluentAssertions; using Microsoft.EntityFrameworkCore; using Unit.Test.Common; diff --git a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs b/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs index dc26903..dea9e32 100644 --- a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs +++ b/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandValidatorTests.cs @@ -1,4 +1,5 @@ using Flight.Aircrafts.Features.CreateAircraft; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1; using FluentAssertions; using FluentValidation.TestHelper; using Unit.Test.Common; diff --git a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs b/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs index f794fa6..5a8a991 100644 --- a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs +++ b/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs @@ -3,6 +3,7 @@ using System.Threading; using System.Threading.Tasks; using Flight.Airports.Dtos; using Flight.Airports.Features.CreateAirport; +using Flight.Airports.Features.CreateAirport.Commands.V1; using FluentAssertions; using Microsoft.EntityFrameworkCore; using Unit.Test.Common; diff --git a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs b/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs index 2e3d574..eb0b650 100644 --- a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs +++ b/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandValidatorTests.cs @@ -1,4 +1,5 @@ using Flight.Airports.Features.CreateAirport; +using Flight.Airports.Features.CreateAirport.Commands.V1; using FluentAssertions; using FluentValidation.TestHelper; using Unit.Test.Common; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs index 59ce6a5..818b22f 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAircraftCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Aircrafts.Features.CreateAircraft; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs index 1b19edc..b3ef3ef 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateAirportCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Airports.Features.CreateAirport; +using Flight.Airports.Features.CreateAirport.Commands.V1; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs index 9533e7a..c34811c 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateFlightCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using BuildingBlocks.IdsGenerator; using Flight.Flights.Features.CreateFlight; +using Flight.Flights.Features.CreateFlight.Commands.V1; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs index 52785b0..6986011 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeCreateSeatCommand.cs @@ -2,6 +2,7 @@ using BuildingBlocks.IdsGenerator; using Flight.Seats.Enums; using Flight.Seats.Features.CreateSeat; +using Flight.Seats.Features.CreateSeat.Commands.V1; using Flight.Seats.Models; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs index 913e0d1..6b3d292 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAircraftCommand.cs @@ -1,5 +1,6 @@ using AutoBogus; using Flight.Aircrafts.Features.CreateAircraft; +using Flight.Aircrafts.Features.CreateAircraft.Commands.V1; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs index ad578b6..1e188f1 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateAirportCommand.cs @@ -1,5 +1,6 @@ using AutoBogus; using Flight.Airports.Features.CreateAirport; +using Flight.Airports.Features.CreateAirport.Commands.V1; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs index 8a80b93..c2379be 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateFlightCommand.cs @@ -2,6 +2,7 @@ using AutoBogus; using Flight.Flights.Enums; using Flight.Flights.Features.CreateFlight; +using Flight.Flights.Features.CreateFlight.Commands.V1; using Flight.Flights.Models; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs index 6647e65..6d17c53 100644 --- a/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs +++ b/src/Services/Flight/tests/UnitTest/Fakes/FakeValidateCreateSeatCommand.cs @@ -1,6 +1,7 @@ using AutoBogus; using Flight.Seats.Enums; using Flight.Seats.Features.CreateSeat; +using Flight.Seats.Features.CreateSeat.Commands.V1; using Flight.Seats.Models; namespace Unit.Test.Fakes; diff --git a/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandHandlerTests.cs b/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandHandlerTests.cs index 80f053a..b78db65 100644 --- a/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandHandlerTests.cs +++ b/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandHandlerTests.cs @@ -3,6 +3,7 @@ using System.Threading; using System.Threading.Tasks; using Flight.Flights.Dtos; using Flight.Flights.Features.CreateFlight; +using Flight.Flights.Features.CreateFlight.Commands.V1; using FluentAssertions; using Microsoft.AspNetCore.Http; using NSubstitute; diff --git a/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandValidatorTests.cs b/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandValidatorTests.cs index 2f23a69..d126811 100644 --- a/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandValidatorTests.cs +++ b/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandValidatorTests.cs @@ -1,4 +1,5 @@ using Flight.Flights.Features.CreateFlight; +using Flight.Flights.Features.CreateFlight.Commands.V1; using FluentAssertions; using FluentValidation.TestHelper; using Unit.Test.Common; diff --git a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs b/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs index 9a8f144..f5acd26 100644 --- a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs +++ b/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs @@ -3,6 +3,7 @@ using System.Threading; using System.Threading.Tasks; using Flight.Seats.Dtos; using Flight.Seats.Features.CreateSeat; +using Flight.Seats.Features.CreateSeat.Commands.V1; using FluentAssertions; using Microsoft.EntityFrameworkCore; using Unit.Test.Common; diff --git a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs b/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs index 544db18..d61637d 100644 --- a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs +++ b/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandValidatorTests.cs @@ -1,4 +1,5 @@ using Flight.Seats.Features.CreateSeat; +using Flight.Seats.Features.CreateSeat.Commands.V1; using FluentAssertions; using FluentValidation.TestHelper; using Unit.Test.Common; diff --git a/src/Services/Identity/src/Identity.Api/Program.cs b/src/Services/Identity/src/Identity.Api/Program.cs index e954fd2..b7b5a7d 100644 --- a/src/Services/Identity/src/Identity.Api/Program.cs +++ b/src/Services/Identity/src/Identity.Api/Program.cs @@ -1,4 +1,3 @@ -using BuildingBlocks.Core; using BuildingBlocks.EFCore; using BuildingBlocks.HealthCheck; using BuildingBlocks.IdsGenerator; @@ -8,7 +7,6 @@ using BuildingBlocks.MassTransit; using BuildingBlocks.OpenTelemetry; using BuildingBlocks.PersistMessageProcessor; using BuildingBlocks.Swagger; -using BuildingBlocks.Utils; using BuildingBlocks.Web; using Figgle; using FluentValidation; @@ -18,7 +16,6 @@ using Identity.Data; using Identity.Data.Seed; using Identity.Extensions; using Microsoft.AspNetCore.Mvc.ApiExplorer; -using Microsoft.EntityFrameworkCore; using Prometheus; using Serilog; @@ -33,7 +30,7 @@ builder.Services.AddPersistMessage(configuration); builder.Services.AddCustomDbContext(configuration); builder.Services.AddScoped(); builder.Services.AddCore(); -builder.AddCustomSerilog(); +builder.AddCustomSerilog(env); builder.Services.AddControllers(); builder.Services.AddCustomSwagger(configuration, typeof(IdentityRoot).Assembly); builder.Services.AddCustomVersioning(); @@ -80,4 +77,7 @@ app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name)); app.Run(); -public partial class Program {} +namespace Identity.Api +{ + public partial class Program {} +} diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserCommand.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserCommand.cs similarity index 80% rename from src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserCommand.cs rename to src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserCommand.cs index 77763da..2df81d8 100644 --- a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserCommand.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserCommand.cs @@ -1,7 +1,7 @@ using BuildingBlocks.Core.CQRS; using Identity.Identity.Dtos; -namespace Identity.Identity.Features.RegisterNewUser; +namespace Identity.Identity.Features.RegisterNewUser.Commands.V1; public record RegisterNewUserCommand(string FirstName, string LastName, string Username, string Email, string Password, string ConfirmPassword, string PassportNumber) : ICommand; diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserCommandHandler.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserCommandHandler.cs similarity index 94% rename from src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserCommandHandler.cs rename to src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserCommandHandler.cs index 4f3c722..2ff2f37 100644 --- a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserCommandHandler.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserCommandHandler.cs @@ -5,14 +5,12 @@ using Ardalis.GuardClauses; using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.Core; using BuildingBlocks.Core.CQRS; -using BuildingBlocks.Core.Event; using Identity.Identity.Dtos; -using Identity.Identity.Exceptions; +using Identity.Identity.Features.RegisterNewUser.Exceptions; using Identity.Identity.Models; -using MediatR; using Microsoft.AspNetCore.Identity; -namespace Identity.Identity.Features.RegisterNewUser; +namespace Identity.Identity.Features.RegisterNewUser.Commands.V1; public class RegisterNewUserCommandHandler : ICommandHandler { diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserValidator.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserValidator.cs similarity index 94% rename from src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserValidator.cs rename to src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserValidator.cs index 7e239f2..23fb9bc 100644 --- a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserValidator.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Commands/V1/RegisterNewUserValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Identity.Identity.Features.RegisterNewUser; +namespace Identity.Identity.Features.RegisterNewUser.Commands.V1; public class RegisterNewUserValidator : AbstractValidator { diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserEndpoint.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Endpoints/V1/RegisterNewUserEndpoint.cs similarity index 87% rename from src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserEndpoint.cs rename to src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Endpoints/V1/RegisterNewUserEndpoint.cs index 0d1251d..f808f5f 100644 --- a/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/RegisterNewUserEndpoint.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Endpoints/V1/RegisterNewUserEndpoint.cs @@ -1,11 +1,12 @@ using System.Threading; using System.Threading.Tasks; +using Identity.Identity.Features.RegisterNewUser.Commands.V1; using MediatR; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Swashbuckle.AspNetCore.Annotations; -namespace Identity.Identity.Features.RegisterNewUser; +namespace Identity.Identity.Features.RegisterNewUser.Endpoints.V1; [Route("identity/register-user")] [ApiController] diff --git a/src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Exceptions/RegisterIdentityUserException.cs similarity index 72% rename from src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs rename to src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Exceptions/RegisterIdentityUserException.cs index 60155e0..562aeb3 100644 --- a/src/Services/Identity/src/Identity/Identity/Exceptions/RegisterIdentityUserException.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/RegisterNewUser/Exceptions/RegisterIdentityUserException.cs @@ -1,10 +1,10 @@ using BuildingBlocks.Exception; -namespace Identity.Identity.Exceptions; +namespace Identity.Identity.Features.RegisterNewUser.Exceptions; public class RegisterIdentityUserException : AppException { public RegisterIdentityUserException(string error) : base(error) { } -} \ No newline at end of file +} diff --git a/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs b/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs index 12ac69d..d4ffff3 100644 --- a/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs +++ b/src/Services/Identity/tests/IntegrationTest/Fakes/FakeRegisterNewUserCommand.cs @@ -1,5 +1,6 @@ using AutoBogus; using Identity.Identity.Features.RegisterNewUser; +using Identity.Identity.Features.RegisterNewUser.Commands.V1; namespace Integration.Test.Fakes; diff --git a/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs b/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs index 3cbe8bd..3a3e88b 100644 --- a/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs +++ b/src/Services/Identity/tests/IntegrationTest/Identity/Features/RegisterNewUserTests.cs @@ -3,6 +3,7 @@ using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.TestBase; using FluentAssertions; using Grpc.Net.Client; +using Identity.Api; using Identity.Data; using Integration.Test.Fakes; using MassTransit; diff --git a/src/Services/Passenger/src/Passenger.Api/Program.cs b/src/Services/Passenger/src/Passenger.Api/Program.cs index 9f26fb5..6f2d550 100644 --- a/src/Services/Passenger/src/Passenger.Api/Program.cs +++ b/src/Services/Passenger/src/Passenger.Api/Program.cs @@ -1,4 +1,3 @@ -using BuildingBlocks.Core; using BuildingBlocks.EFCore; using BuildingBlocks.Exception; using BuildingBlocks.HealthCheck; @@ -34,7 +33,7 @@ builder.Services.AddCustomDbContext(configuration); builder.Services.AddMongoDbContext(configuration); builder.Services.AddPersistMessage(configuration); -builder.AddCustomSerilog(); +builder.AddCustomSerilog(env); builder.Services.AddCore(); builder.Services.AddJwt(); builder.Services.AddControllers(); @@ -85,6 +84,9 @@ app.MapGet("/", x => x.Response.WriteAsync(appOptions.Name)); app.Run(); -public partial class Program +namespace Passenger.Api { + public partial class Program + { + } } diff --git a/src/Services/Passenger/src/Passenger/EventMapper.cs b/src/Services/Passenger/src/Passenger/EventMapper.cs index 47e82b6..5fdcfed 100644 --- a/src/Services/Passenger/src/Passenger/EventMapper.cs +++ b/src/Services/Passenger/src/Passenger/EventMapper.cs @@ -1,8 +1,9 @@ using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.Core; using BuildingBlocks.Core.Event; -using Passenger.Passengers.Events.Domain; -using Passenger.Passengers.Features.CompleteRegisterPassenger.Reads; +using Passenger.Identity.Consumers.RegisterNewUser.Events.Domain.V1; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1.Reads; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Events.Domain.V1; namespace Passenger; diff --git a/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs b/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs index 3735f64..b2c15e1 100644 --- a/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs +++ b/src/Services/Passenger/src/Passenger/GrpcServer/Services/PassengerGrpcServices.cs @@ -2,6 +2,7 @@ using Mapster; using MediatR; using Passenger.Passengers.Features.GetPassengerById; +using Passenger.Passengers.Features.GetPassengerById.Queries.V1; namespace Passenger.GrpcServer.Services; diff --git a/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/Consumes/V1/RegisterNewUserConsumerHandler.cs similarity index 93% rename from src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs rename to src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/Consumes/V1/RegisterNewUserConsumerHandler.cs index 912aa6d..48c1071 100644 --- a/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/RegisterNewUserConsumerHandler.cs +++ b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/Consumes/V1/RegisterNewUserConsumerHandler.cs @@ -10,9 +10,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Passenger.Data; -using Passenger.Passengers.Events.Domain; +using Passenger.Identity.Consumers.RegisterNewUser.Events.Domain.V1; -namespace Passenger.Identity.Consumers.RegisterNewUser; +namespace Passenger.Identity.Consumers.RegisterNewUser.Consumes.V1; public class RegisterNewUserConsumerHandler : IConsumer { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Events/Domain/PassengerCreatedDomainEvent.cs b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/Events/Domain/V1/PassengerCreatedDomainEvent.cs similarity index 69% rename from src/Services/Passenger/src/Passenger/Passengers/Events/Domain/PassengerCreatedDomainEvent.cs rename to src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/Events/Domain/V1/PassengerCreatedDomainEvent.cs index bf501f5..3aaa1c8 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Events/Domain/PassengerCreatedDomainEvent.cs +++ b/src/Services/Passenger/src/Passenger/Identity/Consumers/RegisterNewUser/Events/Domain/V1/PassengerCreatedDomainEvent.cs @@ -1,5 +1,5 @@ using BuildingBlocks.Core.Event; -namespace Passenger.Passengers.Events.Domain; +namespace Passenger.Identity.Consumers.RegisterNewUser.Events.Domain.V1; public record PassengerCreatedDomainEvent(long Id, string Name, string PassportNumber, bool IsDeleted = false) : IDomainEvent; diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommand.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommand.cs similarity index 91% rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommand.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommand.cs index ec56999..6eee73f 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommand.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommand.cs @@ -2,9 +2,8 @@ using BuildingBlocks.Core.CQRS; using BuildingBlocks.Core.Event; using BuildingBlocks.IdsGenerator; using Passenger.Passengers.Dtos; -using Passenger.Passengers.Models; -namespace Passenger.Passengers.Features.CompleteRegisterPassenger; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1; public record CompleteRegisterPassengerCommand(string PassportNumber, Enums.PassengerType PassengerType, int Age) : ICommand, IInternalCommand { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommandHandler.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommandHandler.cs similarity index 94% rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommandHandler.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommandHandler.cs index 6b5c558..299fae5 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommandHandler.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommandHandler.cs @@ -1,13 +1,12 @@ using Ardalis.GuardClauses; using BuildingBlocks.Core.CQRS; using MapsterMapper; -using MediatR; using Microsoft.EntityFrameworkCore; using Passenger.Data; using Passenger.Passengers.Dtos; -using Passenger.Passengers.Exceptions; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Exceptions; -namespace Passenger.Passengers.Features.CompleteRegisterPassenger; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1; public class CompleteRegisterPassengerCommandHandler : ICommandHandler { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommandValidator.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommandValidator.cs similarity index 96% rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommandValidator.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommandValidator.cs index 27aba32..4ae3cf9 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerCommandValidator.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/CompleteRegisterPassengerCommandValidator.cs @@ -1,7 +1,6 @@ using FluentValidation; -using Passenger.Passengers.Models; -namespace Passenger.Passengers.Features.CompleteRegisterPassenger; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1; public class CompleteRegisterPassengerCommandValidator : AbstractValidator { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Reads/CompleteRegisterPassengerMongoCommand.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/Reads/CompleteRegisterPassengerMongoCommand.cs similarity index 94% rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Reads/CompleteRegisterPassengerMongoCommand.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/Reads/CompleteRegisterPassengerMongoCommand.cs index 9a40d8a..a88231d 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Reads/CompleteRegisterPassengerMongoCommand.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/Reads/CompleteRegisterPassengerMongoCommand.cs @@ -1,7 +1,6 @@ using BuildingBlocks.Core.Event; -using Passenger.Passengers.Models; -namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Reads; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1.Reads; public class CompleteRegisterPassengerMongoCommand : InternalCommand { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Reads/CompleteRegisterPassengerMongoCommandHandler.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/Reads/CompleteRegisterPassengerMongoCommandHandler.cs similarity index 97% rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Reads/CompleteRegisterPassengerMongoCommandHandler.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/Reads/CompleteRegisterPassengerMongoCommandHandler.cs index b6e9f0a..c10688e 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Reads/CompleteRegisterPassengerMongoCommandHandler.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Commands/V1/Reads/CompleteRegisterPassengerMongoCommandHandler.cs @@ -1,5 +1,4 @@ using Ardalis.GuardClauses; -using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.Core.CQRS; using MapsterMapper; using MediatR; @@ -8,7 +7,7 @@ using MongoDB.Driver.Linq; using Passenger.Data; using Passenger.Passengers.Models.Reads; -namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Reads; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1.Reads; public class CompleteRegisterPassengerMongoCommandHandler : ICommandHandler { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerEndpoint.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Endpoints/V1/CompleteRegisterPassengerEndpoint.cs similarity index 90% rename from src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerEndpoint.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Endpoints/V1/CompleteRegisterPassengerEndpoint.cs index 75fc722..4b80150 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/CompleteRegisterPassengerEndpoint.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Endpoints/V1/CompleteRegisterPassengerEndpoint.cs @@ -2,9 +2,10 @@ using BuildingBlocks.Web; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1; using Swashbuckle.AspNetCore.Annotations; -namespace Passenger.Passengers.Features.CompleteRegisterPassenger; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Endpoints.V1; [Route(BaseApiPath + "/passenger/complete-registration")] public class CompleteRegisterPassengerEndpoint : BaseController diff --git a/src/Services/Passenger/src/Passenger/Passengers/Events/Domain/PassengerRegistrationCompletedDomainEvent.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Events/Domain/V1/PassengerRegistrationCompletedDomainEvent.cs similarity index 72% rename from src/Services/Passenger/src/Passenger/Passengers/Events/Domain/PassengerRegistrationCompletedDomainEvent.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Events/Domain/V1/PassengerRegistrationCompletedDomainEvent.cs index aa5423a..885224e 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Events/Domain/PassengerRegistrationCompletedDomainEvent.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Events/Domain/V1/PassengerRegistrationCompletedDomainEvent.cs @@ -1,7 +1,6 @@ using BuildingBlocks.Core.Event; -using Passenger.Passengers.Models; -namespace Passenger.Passengers.Events.Domain; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Events.Domain.V1; public record PassengerRegistrationCompletedDomainEvent(long Id, string Name, string PassportNumber, Enums.PassengerType PassengerType, int Age, bool IsDeleted = false) : IDomainEvent; diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Exceptions/PassengerAlreadyExist.cs similarity index 70% rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Exceptions/PassengerAlreadyExist.cs index 6bed359..9584f8d 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerAlreadyExist.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompleteRegisterPassenger/Exceptions/PassengerAlreadyExist.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Passenger.Passengers.Exceptions; +namespace Passenger.Passengers.Features.CompleteRegisterPassenger.Exceptions; public class PassengerNotExist : BadRequestException { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerByIdEndpoint.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Endpoints/V1/GetPassengerByIdEndpoint.cs similarity index 84% rename from src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerByIdEndpoint.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Endpoints/V1/GetPassengerByIdEndpoint.cs index c813a32..60caaf1 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerByIdEndpoint.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Endpoints/V1/GetPassengerByIdEndpoint.cs @@ -2,9 +2,10 @@ using BuildingBlocks.Web; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Passenger.Passengers.Features.GetPassengerById.Queries.V1; using Swashbuckle.AspNetCore.Annotations; -namespace Passenger.Passengers.Features.GetPassengerById; +namespace Passenger.Passengers.Features.GetPassengerById.Endpoints.V1; [Route(BaseApiPath + "/passenger")] public class GetPassengerByIdEndpoint : BaseController diff --git a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Exceptions/PassengerNotFoundException.cs similarity index 74% rename from src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Exceptions/PassengerNotFoundException.cs index 2c3f95d..ff3faaf 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Exceptions/PassengerNotFoundException.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Exceptions/PassengerNotFoundException.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Exception; -namespace Passenger.Passengers.Exceptions; +namespace Passenger.Passengers.Features.GetPassengerById.Exceptions; public class PassengerNotFoundException: NotFoundException { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryById.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryById.cs similarity index 67% rename from src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryById.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryById.cs index 21b8f5e..c53712e 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryById.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryById.cs @@ -1,6 +1,6 @@ using BuildingBlocks.Core.CQRS; using Passenger.Passengers.Dtos; -namespace Passenger.Passengers.Features.GetPassengerById; +namespace Passenger.Passengers.Features.GetPassengerById.Queries.V1; public record GetPassengerQueryById(long Id) : IQuery; diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryByIdHandler.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryByIdHandler.cs similarity index 88% rename from src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryByIdHandler.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryByIdHandler.cs index e42d9ef..320b7e0 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryByIdHandler.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryByIdHandler.cs @@ -1,13 +1,12 @@ using Ardalis.GuardClauses; using BuildingBlocks.Core.CQRS; using MapsterMapper; -using MediatR; using Microsoft.EntityFrameworkCore; using Passenger.Data; using Passenger.Passengers.Dtos; -using Passenger.Passengers.Exceptions; +using Passenger.Passengers.Features.GetPassengerById.Exceptions; -namespace Passenger.Passengers.Features.GetPassengerById; +namespace Passenger.Passengers.Features.GetPassengerById.Queries.V1; public class GetPassengerQueryByIdHandler : IQueryHandler { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryByIdValidator.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryByIdValidator.cs similarity index 80% rename from src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryByIdValidator.cs rename to src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryByIdValidator.cs index a3dd372..48d9f26 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/GetPassengerQueryByIdValidator.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GetPassengerById/Queries/V1/GetPassengerQueryByIdValidator.cs @@ -1,6 +1,6 @@ using FluentValidation; -namespace Passenger.Passengers.Features.GetPassengerById; +namespace Passenger.Passengers.Features.GetPassengerById.Queries.V1; public class GetPassengerQueryByIdValidator: AbstractValidator { diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs index 5a8a6f1..a8da772 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/PassengerMappings.cs @@ -3,7 +3,7 @@ using BuildingBlocks.Contracts.EventBus.Messages; using BuildingBlocks.IdsGenerator; using Mapster; using Passenger.Passengers.Dtos; -using Passenger.Passengers.Features.CompleteRegisterPassenger.Reads; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1.Reads; using Passenger.Passengers.Models.Reads; namespace Passenger.Passengers.Features; diff --git a/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs b/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs index 0903693..70913ad 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Models/Passenger.cs @@ -1,5 +1,6 @@ using BuildingBlocks.Core.Model; -using Passenger.Passengers.Events.Domain; +using Passenger.Identity.Consumers.RegisterNewUser.Events.Domain.V1; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Events.Domain.V1; namespace Passenger.Passengers.Models; diff --git a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs b/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs index 76d08f8..7ee8600 100644 --- a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs +++ b/src/Services/Passenger/tests/IntegrationTest/Fakes/FakeCompleteRegisterPassengerCommand.cs @@ -2,6 +2,7 @@ using BuildingBlocks.IdsGenerator; using Passenger.Passengers.Enums; using Passenger.Passengers.Features.CompleteRegisterPassenger; +using Passenger.Passengers.Features.CompleteRegisterPassenger.Commands.V1; using Passenger.Passengers.Models; namespace Integration.Test.Fakes; diff --git a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakePassengerResponseDto.cs b/src/Services/Passenger/tests/IntegrationTest/Fakes/FakePassengerResponseDto.cs index c291696..791bcdd 100644 --- a/src/Services/Passenger/tests/IntegrationTest/Fakes/FakePassengerResponseDto.cs +++ b/src/Services/Passenger/tests/IntegrationTest/Fakes/FakePassengerResponseDto.cs @@ -2,10 +2,12 @@ using BuildingBlocks.IdsGenerator; using Passenger; +namespace Integration.Test.Fakes; + public class FakePassengerResponse : AutoFaker { public FakePassengerResponse() { RuleFor(r => r.Id, _ => SnowFlakIdGenerator.NewId()); } -} +} \ No newline at end of file diff --git a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs b/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs index 3eac82e..a1f2205 100644 --- a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs +++ b/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/CompleteRegisterPassengerTests.cs @@ -4,6 +4,7 @@ using BuildingBlocks.TestBase; using FluentAssertions; using Integration.Test.Fakes; using MassTransit.Testing; +using Passenger.Api; using Passenger.Data; using Xunit; diff --git a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs b/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs index 9994c22..4ed3f51 100644 --- a/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs +++ b/src/Services/Passenger/tests/IntegrationTest/Passenger/Features/GetPassengerByIdTests.cs @@ -7,8 +7,10 @@ using Integration.Test.Fakes; using MassTransit.Testing; using Microsoft.Extensions.DependencyInjection; using Passenger; +using Passenger.Api; using Passenger.Data; using Passenger.Passengers.Features.GetPassengerById; +using Passenger.Passengers.Features.GetPassengerById.Queries.V1; using Xunit; namespace Integration.Test.Passenger.Features;