From 12625661e69abcad983fcfe5e79c0d954d5baa6c Mon Sep 17 00:00:00 2001 From: Pc Date: Wed, 5 Jul 2023 23:54:10 +0330 Subject: [PATCH] refactor: Refactor mappings --- .../Features/CreatingBook/Commands/V1/CreateBooking.cs | 3 ++- .../Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs | 5 +++-- .../Airports/Features/CreatingAirport/V1/CreateAirport.cs | 3 ++- .../Flights/Features/CreatingFlight/V1/CreateFlight.cs | 3 ++- .../Flights/Features/DeletingFlight/V1/DeleteFlight.cs | 2 +- .../GettingAvailableFlights/V1/GetAvailableFlights.cs | 3 ++- .../Flights/Features/GettingFlightById/V1/GetFlightById.cs | 5 +++-- .../src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs | 3 ++- .../Features/GettingAvailableSeats/V1/GetAvailableSeats.cs | 3 ++- .../Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs | 5 +++-- .../src/Identity/Identity/Features/IdentityMappings.cs | 3 --- .../Features/RegisteringNewUser/V1/RegisterNewUser.cs | 3 ++- .../V1/CompleteRegisterPassenger.cs | 3 ++- .../GettingPassengerById/Queries/V1/GetPassengerById.cs | 3 ++- 14 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs b/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs index 03f4b66..ccb14df 100644 --- a/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs +++ b/src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBooking.cs @@ -12,6 +12,7 @@ using Elasticsearch.Net; using Exceptions; using Flight; using FluentValidation; +using Mapster; using MapsterMapper; using MassTransit; using MediatR; @@ -47,7 +48,7 @@ public class CreateBookingEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = new CreateBookingResponseDto(result.Id); + var response = result.Adapt(); return Results.Ok(response); }) diff --git a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs b/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs index bde4ecc..1e543f9 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs +++ b/src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraft.cs @@ -13,6 +13,7 @@ using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using Flight.Aircrafts.ValueObjects; using FluentValidation; +using Mapster; using MapsterMapper; using MassTransit; using MediatR; @@ -49,11 +50,11 @@ public class CreateAircraftEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = new CreateAircraftResponseDto(result.Id); + var response = result.Adapt(); return Results.Ok(response); }) - //.RequireAuthorization(nameof(ApiScope)) + .RequireAuthorization(nameof(ApiScope)) .WithName("CreateAircraft") .WithApiVersionSet(builder.NewApiVersionSet("Flight").Build()) .Produces() diff --git a/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs b/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs index 36499c9..42f8a40 100644 --- a/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs +++ b/src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirport.cs @@ -11,6 +11,7 @@ using Data; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using FluentValidation; +using Mapster; using MapsterMapper; using MassTransit; using MediatR; @@ -46,7 +47,7 @@ public class CreateAirportEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = new CreateAirportResponseDto(result.Id); + var response = result.Adapt(); return Results.Ok(response); }) diff --git a/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs b/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs index 85a31d6..e0a3d99 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlight.cs @@ -13,6 +13,7 @@ using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using Flight.Airports.ValueObjects; using FluentValidation; +using Mapster; using MapsterMapper; using MassTransit; using MediatR; @@ -54,7 +55,7 @@ public class CreateFlightEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = new CreateFlightResponseDto(result.Id); + var response = result.Adapt(); return Results.CreatedAtRoute("GetFlightById", new { id = result.Id }, response); }) diff --git a/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs b/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs index 085dde7..e69cbd2 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlight.cs @@ -35,7 +35,7 @@ public class DeleteFlightEndpoint : IMinimalEndpoint builder.MapDelete($"{EndpointConfig.BaseApiPath}/flight/{{id}}", async (Guid id, IMediator mediator, CancellationToken cancellationToken) => { - var result = await mediator.Send(new DeleteFlight(id), cancellationToken); + await mediator.Send(new DeleteFlight(id), cancellationToken); return Results.NoContent(); }) diff --git a/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs b/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs index d2e59bf..5a27210 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlights.cs @@ -13,6 +13,7 @@ using Data; using Dtos; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; +using Mapster; using MapsterMapper; using MediatR; using Microsoft.AspNetCore.Builder; @@ -39,7 +40,7 @@ public class GetAvailableFlightsEndpoint : IMinimalEndpoint { var result = await mediator.Send(new GetAvailableFlights(), cancellationToken); - var response = new GetAvailableFlightsResponseDto(result?.FlightDtos); + var response = result.Adapt(); return Results.Ok(response); }) diff --git a/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs b/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs index cb6f192..19fc32e 100644 --- a/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs +++ b/src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightById.cs @@ -11,6 +11,7 @@ using Dtos; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using FluentValidation; +using Mapster; using MapsterMapper; using MediatR; using Microsoft.AspNetCore.Builder; @@ -30,11 +31,11 @@ public class GetFlightByIdEndpoint : IMinimalEndpoint public IEndpointRouteBuilder MapEndpoint(IEndpointRouteBuilder builder) { builder.MapGet($"{EndpointConfig.BaseApiPath}/flight/{{id}}", - async (Guid id, IMediator mediator, CancellationToken cancellationToken) => + async (Guid id, IMediator mediator, IMapper mapper, CancellationToken cancellationToken) => { var result = await mediator.Send(new GetFlightById(id), cancellationToken); - var response = new GetFlightByIdResponseDto(result?.FlightDto); + var response = result.Adapt(); return Results.Ok(response); }) diff --git a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs b/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs index f709490..cc11ce2 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeat.cs @@ -14,6 +14,7 @@ using Flight.Seats.Exceptions; using Flight.Seats.Models; using Flights.ValueObjects; using FluentValidation; +using Mapster; using MapsterMapper; using MassTransit; using MediatR; @@ -64,7 +65,7 @@ public class CreateSeatEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = new CreateSeatResponseDto(result.Id); + var response = result.Adapt(); return Results.Ok(response); } diff --git a/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs b/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs index 74dbbbd..d4e3bb4 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeats.cs @@ -13,6 +13,7 @@ using Dtos; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using FluentValidation; +using Mapster; using MapsterMapper; using MediatR; using Microsoft.AspNetCore.Builder; @@ -48,7 +49,7 @@ public class GetAvailableSeatsEndpoint : IMinimalEndpoint { var result = await mediator.Send(new GetAvailableSeats(id), cancellationToken); - var response = new GetAvailableSeatsResponseDto(result?.SeatDtos); + var response = result.Adapt(); return Results.Ok(response); } diff --git a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs b/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs index a5e9d7d..70d876f 100644 --- a/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs +++ b/src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeat.cs @@ -12,6 +12,7 @@ using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using Flights.ValueObjects; using FluentValidation; +using Mapster; using MapsterMapper; using MediatR; using Microsoft.AspNetCore.Builder; @@ -52,11 +53,11 @@ public class ReserveSeatEndpoint : IMinimalEndpoint private async Task ReserveSeat(ReserveSeatRequestDto request, IMediator mediator, IMapper mapper, CancellationToken cancellationToken) { - var command = mapper.Map(request); + var command = mapper.Map(request); var result = await mediator.Send(command, cancellationToken); - var response = new ReserveSeatResponseDto(result.Id); + var response = result.Adapt(); return Results.Ok(response); } diff --git a/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs b/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs index c40917f..166ccac 100644 --- a/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/IdentityMappings.cs @@ -11,8 +11,5 @@ public class IdentityMappings : IRegister config.NewConfig() .ConstructUsing(x => new RegisterNewUser(x.FirstName, x.LastName, x.Username, x.Email, x.Password, x.ConfirmPassword, x.PassportNumber)); - - config.NewConfig() - .ConstructUsing(x => new RegisterNewUserResponseDto(x.Id, x.FirstName, x.LastName, x.Username, x.PassportNumber)); } } diff --git a/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs b/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs index 4dc8829..ef20e49 100644 --- a/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs +++ b/src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUser.cs @@ -12,6 +12,7 @@ using BuildingBlocks.Web; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using FluentValidation; +using Mapster; using MapsterMapper; using MediatR; using Microsoft.AspNetCore.Builder; @@ -43,7 +44,7 @@ public class RegisterNewUserEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = mapper.Map(result); + var response = result.Adapt(); return Results.Ok(response); }) diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs index 002b074..6af9367 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs @@ -9,6 +9,7 @@ using Dtos; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using FluentValidation; +using Mapster; using MapsterMapper; using MassTransit; using MediatR; @@ -46,7 +47,7 @@ public class CompleteRegisterPassengerEndpoint : IMinimalEndpoint var result = await mediator.Send(command, cancellationToken); - var response = new CompleteRegisterPassengerResponseDto(result?.PassengerDto); + var response = result.Adapt(); return Results.Ok(response); }) diff --git a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs b/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs index 50e16f9..77436bd 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerById.cs @@ -8,6 +8,7 @@ using Dtos; using Duende.IdentityServer.EntityFramework.Entities; using Exceptions; using FluentValidation; +using Mapster; using MapsterMapper; using MediatR; using Microsoft.AspNetCore.Builder; @@ -32,7 +33,7 @@ public class GetPassengerByIdEndpoint : IMinimalEndpoint { var result = await mediator.Send(new GetPassengerById(id), cancellationToken); - var response = new GetPassengerByIdResponseDto(result?.PassengerDto); + var response = result.Adapt(); return Results.Ok(response); })