Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add required keyword to models for handle mandatory property in… #244

Merged
merged 1 commit into from
Apr 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/BuildingBlocks/BuildingBlocks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
<PackageReference Include="Serilog.Sinks.SpectreConsole" Version="0.3.3" />
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI" Version="6.0.5" />
Expand Down
2 changes: 1 addition & 1 deletion src/BuildingBlocks/Core/Model/Aggregate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ public IEvent[] ClearDomainEvents()

public long Version { get; set; }

public TId Id { get; set; }
public required TId Id { get; set; }
}
2 changes: 1 addition & 1 deletion src/BuildingBlocks/Swagger/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static IServiceCollection AddCustomSwagger(this IServiceCollection servic
// options.OperationFilter<TagBySwaggerOperationFilter>();

// Enables Swagger annotations (SwaggerOperationAttribute, SwaggerParameterAttribute etc.)
options.EnableAnnotations();
// options.EnableAnnotations();
});

services.Configure<SwaggerGeneratorOptions>(o => o.InferSecuritySchemes = true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace Booking.Booking.Features.CreatingBook.Commands.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record CreateBookingRequestDto(Guid PassengerId, Guid FlightId, string Description);
public record CreateBookingResponseDto(ulong Id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

public class BookingReadModel
{
public Guid Id { get; init; }
public Guid BookId { get; init; }
public Trip Trip { get; init; }
public PassengerInfo PassengerInfo { get; init; }
public bool IsDeleted { get; init; }
public required Guid Id { get; init; }
public required Guid BookId { get; init; }
public required Trip Trip { get; init; }
public required PassengerInfo PassengerInfo { get; init; }
public required bool IsDeleted { get; init; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Aircrafts.Features.CreatingAircraft.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record CreateAircraftRequestDto(string Name, string Model, int ManufacturingYear);
public record CreateAircraftResponseDto(Guid Id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
using BuildingBlocks.Core.CQRS;
using BuildingBlocks.Core.Event;
using Exceptions;
using Flight.Aircrafts.Models;
using Flight.Data;
using Models;
using Data;
using MapsterMapper;
using MediatR;
using MongoDB.Driver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

public class AircraftReadModel
{
public Guid Id { get; init; }
public Guid AircraftId { get; init; }
public string Name { get; init; }
public string Model { get; init; }
public int ManufacturingYear { get; init; }
public bool IsDeleted { get; init; }
public required Guid Id { get; init; }
public required Guid AircraftId { get; init; }
public required string Name { get; init; }
public required string Model { get; init; }
public required int ManufacturingYear { get; init; }
public required bool IsDeleted { get; init; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Airports.Features.CreatingAirport.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record CreateAirportRequestDto(string Name, string Address, string Code);
public record CreateAirportResponseDto(Guid Id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

public class AirportReadModel
{
public Guid Id { get; init; }
public Guid AirportId { get; init; }
public string Name { get; init; }
public required Guid Id { get; init; }
public required Guid AirportId { get; init; }
public required string Name { get; init; }
public string Address { get; init; }
public string Code { get; init; }
public bool IsDeleted { get; init; }
public required string Code { get; init; }
public required bool IsDeleted { get; init; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Flights.Features.CreatingFlight.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record CreateFlightRequestDto(string FlightNumber, Guid AircraftId, Guid DepartureAirportId,
DateTime DepartureDate, DateTime ArriveDate, Guid ArriveAirportId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public class DeleteFlightEndpoint : IMinimalEndpoint
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Flights.Features.GettingAvailableFlights.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record GetAvailableFlightsResponseDto(IEnumerable<FlightDto> FlightDtos);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Flights.Features.GettingFlightById.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record GetFlightByIdResponseDto(FlightDto FlightDto);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Flights.Features.UpdatingFlight.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record UpdateFlightRequestDto(Guid Id, string FlightNumber, Guid AircraftId, Guid DepartureAirportId, DateTime DepartureDate, DateTime ArriveDate,
Guid ArriveAirportId, decimal DurationMinutes, DateTime FlightDate, Enums.FlightStatus Status, decimal Price, bool IsDeleted);
Expand Down
26 changes: 13 additions & 13 deletions src/Services/Flight/src/Flight/Flights/Models/FlightReadModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ namespace Flight.Flights.Models;

public class FlightReadModel
{
public Guid Id { get; init; }
public Guid FlightId { get; init; }
public string FlightNumber { get; init; }
public Guid AircraftId { get; init; }
public DateTime DepartureDate { get; init; }
public Guid DepartureAirportId { get; init; }
public DateTime ArriveDate { get; init; }
public Guid ArriveAirportId { get; init; }
public decimal DurationMinutes { get; init; }
public DateTime FlightDate { get; init; }
public Enums.FlightStatus Status { get; init; }
public decimal Price { get; init; }
public bool IsDeleted { get; init; }
public required Guid Id { get; init; }
public required Guid FlightId { get; init; }
public required string FlightNumber { get; init; }
public required Guid AircraftId { get; init; }
public required DateTime DepartureDate { get; init; }
public required Guid DepartureAirportId { get; init; }
public required DateTime ArriveDate { get; init; }
public required Guid ArriveAirportId { get; init; }
public required decimal DurationMinutes { get; init; }
public required DateTime FlightDate { get; init; }
public required Enums.FlightStatus Status { get; init; }
public required decimal Price { get; init; }
public required bool IsDeleted { get; init; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Seats.Features.CreatingSeat.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record CreateSeatRequestDto(string SeatNumber, Enums.SeatType Type, Enums.SeatClass Class, Guid FlightId);
public record CreateSeatResponseDto(Guid Id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ namespace Flight.Seats.Features.GettingAvailableSeats.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record GetAvailableSeatsResponseDto(IEnumerable<SeatDto> SeatDtos);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Flight.Seats.Features.ReservingSeat.Commands.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record ReserveSeatRequestDto(Guid FlightId, string SeatNumber);
public record ReserveSeatResponseDto(Guid Id);
Expand Down
14 changes: 7 additions & 7 deletions src/Services/Flight/src/Flight/Seats/Models/SeatReadModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

public class SeatReadModel
{
public Guid Id { get; init; }
public Guid SeatId { get; init; }
public string SeatNumber { get; init; }
public Enums.SeatType Type { get; init; }
public Enums.SeatClass Class { get; init; }
public Guid FlightId { get; init; }
public bool IsDeleted { get; init; }
public required Guid Id { get; init; }
public required Guid SeatId { get; init; }
public required string SeatNumber { get; init; }
public required Enums.SeatType Type { get; init; }
public required Enums.SeatClass Class { get; init; }
public required Guid FlightId { get; init; }
public required bool IsDeleted { get; init; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Identity.Identity.Features.RegisteringNewUser.V1;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record RegisterNewUserRequestDto(string FirstName, string LastName, string Username, string Email,
string Password, string ConfirmPassword, string PassportNumber);
Expand Down
6 changes: 3 additions & 3 deletions src/Services/Identity/src/Identity/Identity/Models/User.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace Identity.Identity.Models;

public class User : IdentityUser<Guid>, IVersion
{
public string FirstName { get; init; }
public string LastName { get; init; }
public string PassPortNumber { get; init; }
public required string FirstName { get; init; }
public required string LastName { get; init; }
public required string PassPortNumber { get; init; }
public long Version { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ namespace Passenger.Passengers.Features.CompletingRegisterPassenger.V1;
using Dtos;
using MassTransit;

public record CompleteRegisterPassenger(string PassportNumber, Enums.PassengerType PassengerType, int Age) : ICommand<CompleteRegisterPassengerResult>, IInternalCommand
public record CompleteRegisterPassenger
(string PassportNumber, Enums.PassengerType PassengerType, int Age) : ICommand<CompleteRegisterPassengerResult>,
IInternalCommand
{
public Guid Id { get; init; } = NewId.NextGuid();
}
Expand All @@ -33,7 +35,9 @@ public CompleteRegisterPassengerValidator()
}
}

internal class CompleteRegisterPassengerCommandHandler : ICommandHandler<CompleteRegisterPassenger, CompleteRegisterPassengerResult>
internal class
CompleteRegisterPassengerCommandHandler : ICommandHandler<CompleteRegisterPassenger,
CompleteRegisterPassengerResult>
{
private readonly IMapper _mapper;
private readonly PassengerDbContext _passengerDbContext;
Expand All @@ -44,7 +48,8 @@ public CompleteRegisterPassengerCommandHandler(IMapper mapper, PassengerDbContex
_passengerDbContext = passengerDbContext;
}

public async Task<CompleteRegisterPassengerResult> Handle(CompleteRegisterPassenger request, CancellationToken cancellationToken)
public async Task<CompleteRegisterPassengerResult> Handle(CompleteRegisterPassenger request,
CancellationToken cancellationToken)
{
Guard.Against.Null(request, nameof(request));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace Passenger.Passengers.Features.GettingPassengerById.Queries.V1;
using Microsoft.AspNetCore.Routing;
using Dtos;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Annotations;

public record GetPassengerByIdResponseDto(PassengerDto PassengerDto);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

public class PassengerReadModel
{
public Guid Id { get; init; }
public Guid PassengerId { get; init; }
public string PassportNumber { get; init; }
public string Name { get; init; }
public Enums.PassengerType PassengerType { get; init; }
public required Guid Id { get; init; }
public required Guid PassengerId { get; init; }
public required string PassportNumber { get; init; }
public required string Name { get; init; }
public required Enums.PassengerType PassengerType { get; init; }
public int Age { get; init; }
public bool IsDeleted { get; init; }
public required bool IsDeleted { get; init; }
}