Merge branch 'develop'

src/BuildingBlocks/BuildingBlocks.csproj

@@ -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" />

src/BuildingBlocks/Core/Model/Aggregate.cs

@@ -25,5 +25,5 @@ public abstract record Aggregate<TId> : Audit, IAggregate<TId>
 
     public long Version { get; set; }
 
-    public TId Id { get; set;  }
+    public required TId Id { get; set;  }
 }

src/BuildingBlocks/Swagger/ServiceCollectionExtensions.cs

@@ -62,7 +62,7 @@ public static class ServiceCollectionExtensions
                 // options.OperationFilter<TagBySwaggerOperationFilter>();
 
                 // Enables Swagger annotations (SwaggerOperationAttribute, SwaggerParameterAttribute etc.)
-                options.EnableAnnotations();
+                // options.EnableAnnotations();
             });
 
         services.Configure<SwaggerGeneratorOptions>(o => o.InferSecuritySchemes = true);

src/Services/Booking/src/Booking/Booking/Features/CreatingBook/Commands/V1/CreateBookingEndpoint.cs

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Builder;
 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);

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

@@ -4,9 +4,9 @@ using ValueObjects;
 
 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; }
 }

src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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);

src/Services/Flight/src/Flight/Aircrafts/Features/CreatingAircraft/V1/CreateAircraftMongo.cs

@@ -7,8 +7,8 @@ using Ardalis.GuardClauses;
 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;

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

@@ -4,10 +4,10 @@ using System;
 
 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; }
 }

src/Services/Flight/src/Flight/Airports/Features/CreatingAirport/V1/CreateAirportEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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);

src/Services/Flight/src/Flight/Airports/Models/AirportReadModel.cs

@@ -4,10 +4,10 @@ using System;
 
 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; }
 }

src/Services/Flight/src/Flight/Flights/Features/CreatingFlight/V1/CreateFlightEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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,

src/Services/Flight/src/Flight/Flights/Features/DeletingFlight/V1/DeleteFlightEndpoint.cs

@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Annotations;
 
 public class DeleteFlightEndpoint : IMinimalEndpoint
 {

src/Services/Flight/src/Flight/Flights/Features/GettingAvailableFlights/V1/GetAvailableFlightsEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Annotations;
 
 public record GetAvailableFlightsResponseDto(IEnumerable<FlightDto> FlightDtos);
 

src/Services/Flight/src/Flight/Flights/Features/GettingFlightById/V1/GetFlightByIdEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Annotations;
 
 public record GetFlightByIdResponseDto(FlightDto FlightDto);
 

src/Services/Flight/src/Flight/Flights/Features/UpdatingFlight/V1/UpdateFlightEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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);

src/Services/Flight/src/Flight/Flights/Models/FlightReadModel.cs

@@ -4,17 +4,17 @@ using System;
 
 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; }
 }

src/Services/Flight/src/Flight/Seats/Features/CreatingSeat/V1/CreateSeatEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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);

src/Services/Flight/src/Flight/Seats/Features/GettingAvailableSeats/V1/GetAvailableSeatsEndpoint.cs

@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Annotations;
 
 public record GetAvailableSeatsResponseDto(IEnumerable<SeatDto> SeatDtos);
 

src/Services/Flight/src/Flight/Seats/Features/ReservingSeat/Commands/V1/ReserveSeatEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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);

src/Services/Flight/src/Flight/Seats/Models/SeatReadModel.cs

@@ -4,11 +4,11 @@ using System;
 
 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; }
 }

src/Services/Identity/src/Identity/Identity/Features/RegisteringNewUser/V1/RegisterNewUserEndpoint.cs

@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Builder;
 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);

src/Services/Identity/src/Identity/Identity/Models/User.cs

@@ -7,8 +7,8 @@ using BuildingBlocks.Core.Model;
 
 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; }
 }

src/Services/Passenger/src/Passenger/Passengers/Features/CompletingRegisterPassenger/V1/CompleteRegisterPassenger.cs

@@ -11,7 +11,9 @@ using Data;
 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();
 }
@@ -33,7 +35,9 @@ internal class CompleteRegisterPassengerValidator : AbstractValidator<CompleteRe
     }
 }
 
-internal class CompleteRegisterPassengerCommandHandler : ICommandHandler<CompleteRegisterPassenger, CompleteRegisterPassengerResult>
+internal class
+    CompleteRegisterPassengerCommandHandler : ICommandHandler<CompleteRegisterPassenger,
+        CompleteRegisterPassengerResult>
 {
     private readonly IMapper _mapper;
     private readonly PassengerDbContext _passengerDbContext;
@@ -44,7 +48,8 @@ internal class CompleteRegisterPassengerCommandHandler : ICommandHandler<Complet
         _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));
 

src/Services/Passenger/src/Passenger/Passengers/Features/GettingPassengerById/Queries/V1/GetPassengerByIdEndpoint.cs

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Dtos;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Annotations;
 
 public record GetPassengerByIdResponseDto(PassengerDto PassengerDto);
 

src/Services/Passenger/src/Passenger/Passengers/Models/PassengerReadModel.cs

@@ -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; }
 }