From ed931ae0f2a06902ee9be86125d16193380d1719 Mon Sep 17 00:00:00 2001
From: meysamhadeli <meysamhadeli@gmail.com>
Date: Sat, 11 Jun 2022 00:09:50 +0430
Subject: [PATCH] refactor unit test

---
 .../Flight/src/Flight/Aircrafts/Dtos/AircraftResponseDto.cs   | 1 +
 .../Flight/src/Flight/Airports/Dtos/AirportResponseDto.cs     | 1 +
 .../CreateAircraftTests/CreateAircraftCommandHandlerTests.cs  | 4 ++--
 .../CreateAirportTests/CreateAirportCommandHandlerTests.cs    | 4 ++--
 .../Features/CreateFlight/CreateFlightCommandHandlerTests.cs  | 1 +
 .../UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs   | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftResponseDto.cs b/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftResponseDto.cs
index 55cfdf0..00e9ff1 100644
--- a/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftResponseDto.cs
+++ b/src/Services/Flight/src/Flight/Aircrafts/Dtos/AircraftResponseDto.cs
@@ -2,6 +2,7 @@ namespace Flight.Aircrafts.Dtos;
 
 public record AircraftResponseDto
 {
+    public long Id { get; set; }
     public string Name { get; init; }
     public string Model { get; init; }
     public int ManufacturingYear { get; init; }
diff --git a/src/Services/Flight/src/Flight/Airports/Dtos/AirportResponseDto.cs b/src/Services/Flight/src/Flight/Airports/Dtos/AirportResponseDto.cs
index 0d86a7a..fc9ca89 100644
--- a/src/Services/Flight/src/Flight/Airports/Dtos/AirportResponseDto.cs
+++ b/src/Services/Flight/src/Flight/Airports/Dtos/AirportResponseDto.cs
@@ -1,6 +1,7 @@
 namespace Flight.Airports.Dtos;
 public record AirportResponseDto
 {
+    public long Id { get; set; }
     public string Name { get; init; }
     public string Address { get; init; }
     public string Code { get; init; }
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 a10a47e..166a096 100644
--- a/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs
+++ b/src/Services/Flight/tests/UnitTest/Aircraft/Features/CreateAircraftTests/CreateAircraftCommandHandlerTests.cs
@@ -36,10 +36,10 @@ public class CreateAircraftCommandHandlerTests
         var response = await Act(command, CancellationToken.None);
 
         // Assert
-        var entity = await _fixture.DbContext.Aircraft.SingleOrDefaultAsync(x => x.Model == response.Model);
+        var entity = await _fixture.DbContext.Aircraft.FindAsync(response?.Id);
 
         entity?.Should().NotBeNull();
-        response?.Model.Should().Be(entity?.Model);
+        response?.Id.Should().Be(entity?.Id);
     }
 
     [Fact]
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 99213af..f794fa6 100644
--- a/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs
+++ b/src/Services/Flight/tests/UnitTest/Airport/Features/CreateAirportTests/CreateAirportCommandHandlerTests.cs
@@ -37,10 +37,10 @@ public class CreateAirportCommandHandlerTests
         var response = await Act(command, CancellationToken.None);
 
         // Assert
-        var entity = await _fixture.DbContext.Airports.SingleOrDefaultAsync(x => x.Code == response.Code);
+        var entity = await _fixture.DbContext.Airports.FindAsync(response?.Id);
 
         entity?.Should().NotBeNull();
-        response?.Code.Should().Be(entity?.Code);
+        response?.Id.Should().Be(entity?.Id);
     }
 
     [Fact]
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 9da6e4e..318ce60 100644
--- a/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandHandlerTests.cs
+++ b/src/Services/Flight/tests/UnitTest/Flight/Features/CreateFlight/CreateFlightCommandHandlerTests.cs
@@ -39,6 +39,7 @@ public class CreateFlightCommandHandlerTests
 
         entity?.Should().NotBeNull();
         response?.Id.Should().Be(entity?.Id);
+        response?.FlightNumber.Should().Be(entity?.FlightNumber);
     }
 
     [Fact]
diff --git a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs b/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs
index 079bee2..9a8f144 100644
--- a/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs
+++ b/src/Services/Flight/tests/UnitTest/Seat/Features/CreateSeatCommandHandlerTests.cs
@@ -39,7 +39,7 @@ public class CreateSeatCommandHandlerTests
         var response = await Act(command, CancellationToken.None);
 
         // Assert
-        var entity = await _fixture.DbContext.Seats.SingleOrDefaultAsync(x => x.SeatNumber == response.SeatNumber);
+        var entity = await _fixture.DbContext.Seats.FindAsync(response?.Id);
 
         entity?.Should().NotBeNull();
         response?.Id.Should().Be(entity?.Id);