From 05025591c56eb325d87a86627610ef4a25530509 Mon Sep 17 00:00:00 2001 From: Pc Date: Mon, 19 Jun 2023 19:08:26 +0330 Subject: [PATCH] refactor: Refactor booking value objects validation --- .../Exceptions/InvalidAircraftIdException.cs | 11 +++ .../InvalidArriveAirportIdException.cs | 11 +++ .../InvalidDepartureAirportIdException.cs | 11 +++ .../Exceptions/InvalidFlightDateException.cs | 11 +++ .../InvalidFlightNumberException.cs | 10 +++ .../InvalidPassengerNameException.cs | 11 +++ .../Exceptions/InvalidPriceException.cs | 12 ++++ .../Booking/Exceptions/SeatNumberException.cs | 12 ++++ .../CreatingBook/Commands/V1/CreateBooking.cs | 4 +- .../src/Booking/Booking/Models/Booking.cs | 2 +- .../Models/ValueObjects/PassengerInfo.cs | 3 - .../Booking/Models/ValueObjects/Trip.cs | 4 -- .../Booking/ValueObjects/PassengerInfo.cs | 23 +++++++ .../src/Booking/Booking/ValueObjects/Trip.cs | 68 +++++++++++++++++++ ...tions.cs => InvalidAircraftIdException.cs} | 4 +- .../Aircrafts/ValueObjects/AircraftId.cs | 4 +- ...ptions.cs => InvalidAirportIdException.cs} | 4 +- .../Flight/Airports/ValueObjects/AirportId.cs | 2 +- ...tions.cs => InvalidArriveDateException.cs} | 4 +- ...ns.cs => InvalidDepartureDateException.cs} | 4 +- ...tions.cs => InvalidFlightDateException.cs} | 4 +- ...eptions.cs => InvalidFlightIdException.cs} | 4 +- .../Flight/Flights/ValueObjects/ArriveDate.cs | 2 +- .../Flights/ValueObjects/DepartureDate.cs | 4 +- .../Flight/Flights/ValueObjects/FlightDate.cs | 4 +- .../Flight/Flights/ValueObjects/FlightId.cs | 2 +- ...xceptions.cs => InvalidSeatIdException.cs} | 4 +- .../src/Flight/Seats/ValueObjects/SeatId.cs | 2 +- ...ions.cs => InvalidPassengerIdException.cs} | 4 +- .../Passengers/ValueObjects/PassengerId.cs | 2 +- 30 files changed, 210 insertions(+), 37 deletions(-) create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs create mode 100644 src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs delete mode 100644 src/Services/Booking/src/Booking/Booking/Models/ValueObjects/PassengerInfo.cs delete mode 100644 src/Services/Booking/src/Booking/Booking/Models/ValueObjects/Trip.cs create mode 100644 src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs create mode 100644 src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs rename src/Services/Flight/src/Flight/Aircrafts/Exceptions/{InvalidAircraftIdExceptions.cs => InvalidAircraftIdException.cs} (57%) rename src/Services/Flight/src/Flight/Airports/Exceptions/{InvalidAirportIdExceptions.cs => InvalidAirportIdException.cs} (57%) rename src/Services/Flight/src/Flight/Flights/Exceptions/{InvalidArriveDateExceptions.cs => InvalidArriveDateException.cs} (56%) rename src/Services/Flight/src/Flight/Flights/Exceptions/{InvalidDepartureDateExceptions.cs => InvalidDepartureDateException.cs} (55%) rename src/Services/Flight/src/Flight/Flights/Exceptions/{InvalidFlightDateExceptions.cs => InvalidFlightDateException.cs} (56%) rename src/Services/Flight/src/Flight/Flights/Exceptions/{InvalidFlightIdExceptions.cs => InvalidFlightIdException.cs} (57%) rename src/Services/Flight/src/Flight/Seats/Exceptions/{InvalidSeatIdExceptions.cs => InvalidSeatIdException.cs} (58%) rename src/Services/Passenger/src/Passenger/Exceptions/{InvalidPassengerIdExceptions.cs => InvalidPassengerIdException.cs} (56%) diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs new file mode 100644 index 0000000..af2d3b0 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidAircraftIdException.cs @@ -0,0 +1,11 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class InvalidAircraftIdException : BadRequestException +{ + public InvalidAircraftIdException(Guid aircraftId) + : base($"aircraftId: '{aircraftId}' is invalid.") + { + } +} diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs new file mode 100644 index 0000000..44c9d8d --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidArriveAirportIdException.cs @@ -0,0 +1,11 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class InvalidArriveAirportIdException : BadRequestException +{ + public InvalidArriveAirportIdException(Guid arriveAirportId) + : base($"arriveAirportId: '{arriveAirportId}' is invalid.") + { + } +} diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs new file mode 100644 index 0000000..07ba585 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidDepartureAirportIdException.cs @@ -0,0 +1,11 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class InvalidDepartureAirportIdException : BadRequestException +{ + public InvalidDepartureAirportIdException(Guid departureAirportId) + : base($"departureAirportId: '{departureAirportId}' is invalid.") + { + } +} diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs new file mode 100644 index 0000000..b1c80e1 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightDateException.cs @@ -0,0 +1,11 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class InvalidFlightDateException : BadRequestException +{ + public InvalidFlightDateException(DateTime flightDate) + : base($"Flight Date: '{flightDate}' is invalid.") + { + } +} diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs new file mode 100644 index 0000000..b5000e1 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidFlightNumberException.cs @@ -0,0 +1,10 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; +public class InvalidFlightNumberException : BadRequestException +{ + public InvalidFlightNumberException(string flightNumber) + : base($"Flight Number: '{flightNumber}' is invalid.") + { + } +} diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs new file mode 100644 index 0000000..238317b --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPassengerNameException.cs @@ -0,0 +1,11 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class InvalidPassengerNameException : BadRequestException +{ + public InvalidPassengerNameException(string passengerName) + : base($"Passenger Name: '{passengerName}' is invalid.") + { + } +} diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs new file mode 100644 index 0000000..eac700a --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/InvalidPriceException.cs @@ -0,0 +1,12 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class InvalidPriceException : BadRequestException +{ + public InvalidPriceException(decimal price) + : base($"Price: '{price}' must be grater than or equal 0.") + { + } +} + diff --git a/src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs b/src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs new file mode 100644 index 0000000..9b6be64 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/Exceptions/SeatNumberException.cs @@ -0,0 +1,12 @@ +namespace Booking.Booking.Exceptions; + +using BuildingBlocks.Exception; + +public class SeatNumberException : BadRequestException +{ + public SeatNumberException(string seatNumber) + : base($"Seat Number: '{seatNumber}' is invalid.") + { + } +} + 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 13aad08..03f4b66 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 @@ -18,8 +18,8 @@ using MediatR; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; -using Models.ValueObjects; using Passenger; +using ValueObjects; public record CreateBooking(Guid PassengerId, Guid FlightId, string Description) : ICommand, IInternalCommand @@ -122,7 +122,7 @@ internal class CreateBookingCommandHandler : ICommandHandler { diff --git a/src/Services/Booking/src/Booking/Booking/Models/ValueObjects/PassengerInfo.cs b/src/Services/Booking/src/Booking/Booking/Models/ValueObjects/PassengerInfo.cs deleted file mode 100644 index 5e9c527..0000000 --- a/src/Services/Booking/src/Booking/Booking/Models/ValueObjects/PassengerInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Booking.Booking.Models.ValueObjects; - -public record PassengerInfo(string Name); diff --git a/src/Services/Booking/src/Booking/Booking/Models/ValueObjects/Trip.cs b/src/Services/Booking/src/Booking/Booking/Models/ValueObjects/Trip.cs deleted file mode 100644 index 8d318fd..0000000 --- a/src/Services/Booking/src/Booking/Booking/Models/ValueObjects/Trip.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Booking.Booking.Models.ValueObjects; - -public record Trip(string FlightNumber, Guid AircraftId, Guid DepartureAirportId, Guid ArriveAirportId, - DateTime FlightDate, decimal Price, string Description, string SeatNumber); diff --git a/src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs b/src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs new file mode 100644 index 0000000..9cbedc6 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/ValueObjects/PassengerInfo.cs @@ -0,0 +1,23 @@ +namespace Booking.Booking.ValueObjects; + +using Exceptions; + +public record PassengerInfo +{ + public string Name { get; } + + private PassengerInfo(string name) + { + Name = name; + } + + public static PassengerInfo Of(string name) + { + if (string.IsNullOrWhiteSpace(name)) + { + throw new InvalidPassengerNameException(name); + } + + return new PassengerInfo(name); + } +} diff --git a/src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs b/src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs new file mode 100644 index 0000000..7c2be90 --- /dev/null +++ b/src/Services/Booking/src/Booking/Booking/ValueObjects/Trip.cs @@ -0,0 +1,68 @@ +namespace Booking.Booking.ValueObjects; + +using Exceptions; + +public record Trip +{ + public string FlightNumber { get; } + public Guid AircraftId { get; } + public Guid DepartureAirportId { get; } + public Guid ArriveAirportId { get; } + public DateTime FlightDate { get; } + public decimal Price { get; } + public string Description { get; } + public string SeatNumber { get; } + + private Trip(string flightNumber, Guid aircraftId, Guid departureAirportId, Guid arriveAirportId, + DateTime flightDate, decimal price, string description, string seatNumber) + { + FlightNumber = flightNumber; + AircraftId = aircraftId; + DepartureAirportId = departureAirportId; + ArriveAirportId = arriveAirportId; + FlightDate = flightDate; + Price = price; + Description = description; + SeatNumber = seatNumber; + } + + public static Trip Of(string flightNumber, Guid aircraftId, Guid departureAirportId, Guid arriveAirportId, + DateTime flightDate, decimal price, string description, string seatNumber) + { + if (string.IsNullOrWhiteSpace(flightNumber)) + { + throw new InvalidFlightNumberException(flightNumber); + } + + if (aircraftId == Guid.Empty) + { + throw new InvalidAircraftIdException(aircraftId); + } + + if (departureAirportId == Guid.Empty) + { + throw new InvalidDepartureAirportIdException(departureAirportId); + } + + if (arriveAirportId == Guid.Empty) + { + throw new InvalidArriveAirportIdException(departureAirportId); + } + + if (flightDate == default) + { + throw new InvalidFlightDateException(flightDate); + } + + if(price < 0){ + throw new InvalidPriceException(price); + } + + if (string.IsNullOrWhiteSpace(seatNumber)) + { + throw new SeatNumberException(seatNumber); + } + + return new Trip(flightNumber, aircraftId, departureAirportId, arriveAirportId, flightDate, price, description, seatNumber); + } +} diff --git a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdExceptions.cs b/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs similarity index 57% rename from src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdExceptions.cs rename to src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs index 2487e37..840f5e2 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdExceptions.cs +++ b/src/Services/Flight/src/Flight/Aircrafts/Exceptions/InvalidAircraftIdException.cs @@ -3,9 +3,9 @@ using System; using BuildingBlocks.Exception; -public class InvalidAircraftIdExceptions : BadRequestException +public class InvalidAircraftIdException : BadRequestException { - public InvalidAircraftIdExceptions(Guid aircraftId) + public InvalidAircraftIdException(Guid aircraftId) : base($"AircraftId: '{aircraftId}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs index db616d9..cc7e241 100644 --- a/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs +++ b/src/Services/Flight/src/Flight/Aircrafts/ValueObjects/AircraftId.cs @@ -16,9 +16,9 @@ public record AircraftId { if (value == Guid.Empty) { - throw new InvalidAircraftIdExceptions(value); + throw new InvalidAircraftIdException(value); } - + return new AircraftId(value); } diff --git a/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdExceptions.cs b/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs similarity index 57% rename from src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdExceptions.cs rename to src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs index 504030a..0b4b90e 100644 --- a/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdExceptions.cs +++ b/src/Services/Flight/src/Flight/Airports/Exceptions/InvalidAirportIdException.cs @@ -2,9 +2,9 @@ namespace Flight.Airports.Exceptions; using System; using BuildingBlocks.Exception; -public class InvalidAirportIdExceptions : BadRequestException +public class InvalidAirportIdException : BadRequestException { - public InvalidAirportIdExceptions(Guid airportId) + public InvalidAirportIdException(Guid airportId) : base($"airportId: '{airportId}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs b/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs index db79a01..d1fd8ae 100644 --- a/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs +++ b/src/Services/Flight/src/Flight/Airports/ValueObjects/AirportId.cs @@ -16,7 +16,7 @@ public record AirportId { if (value == Guid.Empty) { - throw new InvalidAirportIdExceptions(value); + throw new InvalidAirportIdException(value); } return new AirportId(value); diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateExceptions.cs b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs similarity index 56% rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateExceptions.cs rename to src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs index a379df7..b4cf65b 100644 --- a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateExceptions.cs +++ b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidArriveDateException.cs @@ -2,9 +2,9 @@ namespace Flight.Flights.Exceptions; using System; using BuildingBlocks.Exception; -public class InvalidArriveDateExceptions : BadRequestException +public class InvalidArriveDateException : BadRequestException { - public InvalidArriveDateExceptions(DateTime arriveDate) + public InvalidArriveDateException(DateTime arriveDate) : base($"Arrive Date: '{arriveDate}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateExceptions.cs b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs similarity index 55% rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateExceptions.cs rename to src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs index b173a4e..6625d57 100644 --- a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateExceptions.cs +++ b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidDepartureDateException.cs @@ -2,9 +2,9 @@ namespace Flight.Flights.Exceptions; using System; using BuildingBlocks.Exception; -public class InvalidDepartureDateExceptions : BadRequestException +public class InvalidDepartureDateException : BadRequestException { - public InvalidDepartureDateExceptions(DateTime departureDate) + public InvalidDepartureDateException(DateTime departureDate) : base($"Departure Date: '{departureDate}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateExceptions.cs b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs similarity index 56% rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateExceptions.cs rename to src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs index 8e0d878..d0c4de4 100644 --- a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateExceptions.cs +++ b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightDateException.cs @@ -2,9 +2,9 @@ namespace Flight.Flights.Exceptions; using System; using BuildingBlocks.Exception; -public class InvalidFlightDateExceptions : BadRequestException +public class InvalidFlightDateException : BadRequestException { - public InvalidFlightDateExceptions(DateTime flightDate) + public InvalidFlightDateException(DateTime flightDate) : base($"Flight Date: '{flightDate}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdExceptions.cs b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs similarity index 57% rename from src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdExceptions.cs rename to src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs index 115bf60..05b9222 100644 --- a/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdExceptions.cs +++ b/src/Services/Flight/src/Flight/Flights/Exceptions/InvalidFlightIdException.cs @@ -2,9 +2,9 @@ namespace Flight.Flights.Exceptions; using System; using BuildingBlocks.Exception; -public class InvalidFlightIdExceptions : BadRequestException +public class InvalidFlightIdException : BadRequestException { - public InvalidFlightIdExceptions(Guid flightId) + public InvalidFlightIdException(Guid flightId) : base($"flightId: '{flightId}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs b/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs index 539bc60..72996c5 100644 --- a/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs +++ b/src/Services/Flight/src/Flight/Flights/ValueObjects/ArriveDate.cs @@ -15,7 +15,7 @@ public record ArriveDate { if (value == default) { - throw new InvalidArriveDateExceptions(value); + throw new InvalidArriveDateException(value); } return new ArriveDate(value); diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs b/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs index 5321b7d..a24e137 100644 --- a/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs +++ b/src/Services/Flight/src/Flight/Flights/ValueObjects/DepartureDate.cs @@ -16,9 +16,9 @@ public record DepartureDate { if (value == default) { - throw new InvalidDepartureDateExceptions(value); + throw new InvalidDepartureDateException(value); } - + return new DepartureDate(value); } diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs b/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs index ae1ba66..0da2949 100644 --- a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs +++ b/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightDate.cs @@ -15,9 +15,9 @@ public record FlightDate { if (value == default) { - throw new InvalidFlightDateExceptions(value); + throw new InvalidFlightDateException(value); } - + return new FlightDate(value); } diff --git a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs b/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs index 0de0e44..c3e5a46 100644 --- a/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs +++ b/src/Services/Flight/src/Flight/Flights/ValueObjects/FlightId.cs @@ -16,7 +16,7 @@ public record FlightId { if (value == Guid.Empty) { - throw new InvalidFlightIdExceptions(value); + throw new InvalidFlightIdException(value); } return new FlightId(value); diff --git a/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdExceptions.cs b/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs similarity index 58% rename from src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdExceptions.cs rename to src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs index a9c37c6..72abe3e 100644 --- a/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdExceptions.cs +++ b/src/Services/Flight/src/Flight/Seats/Exceptions/InvalidSeatIdException.cs @@ -3,9 +3,9 @@ using System; using BuildingBlocks.Exception; -public class InvalidSeatIdExceptions : BadRequestException +public class InvalidSeatIdException : BadRequestException { - public InvalidSeatIdExceptions(Guid seatId) + public InvalidSeatIdException(Guid seatId) : base($"seatId: '{seatId}' is invalid.") { } diff --git a/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs b/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs index bd8c249..4196b6e 100644 --- a/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs +++ b/src/Services/Flight/src/Flight/Seats/ValueObjects/SeatId.cs @@ -16,7 +16,7 @@ public record SeatId { if (value == Guid.Empty) { - throw new InvalidSeatIdExceptions(value); + throw new InvalidSeatIdException(value); } return new SeatId(value); diff --git a/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdExceptions.cs b/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs similarity index 56% rename from src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdExceptions.cs rename to src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs index c35ae6d..b192a22 100644 --- a/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdExceptions.cs +++ b/src/Services/Passenger/src/Passenger/Exceptions/InvalidPassengerIdException.cs @@ -3,9 +3,9 @@ using System; using BuildingBlocks.Exception; -public class InvalidPassengerIdExceptions : BadRequestException +public class InvalidPassengerIdException : BadRequestException { - public InvalidPassengerIdExceptions(Guid passengerId) + public InvalidPassengerIdException(Guid passengerId) : base($"PassengerId: '{passengerId}' is invalid.") { } diff --git a/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs index f48d689..548e6ad 100644 --- a/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs +++ b/src/Services/Passenger/src/Passenger/Passengers/ValueObjects/PassengerId.cs @@ -16,7 +16,7 @@ public record PassengerId { if (value == Guid.Empty) { - throw new InvalidPassengerIdExceptions(value); + throw new InvalidPassengerIdException(value); } return new PassengerId(value);