feat: added city to query airport response

amvid · Sep 1, 2024 · 2fc43a1 · 2fc43a1
1 parent f71137e
commit 2fc43a1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 11 deletions.
diff --git a/src/Airport/Action/Query/QueryAirportsAction.php b/src/Airport/Action/Query/QueryAirportsAction.php
@@ -60,6 +60,7 @@ public function run(QueryAirportsActionRequest $request): QueryAirportsActionRes
                     $res[] = new QueryChildrenAirportResponse(
                         $cityTitle . ' (Any)',
                         $cityIata,
+                        $cityTitle,
                         $countryTitle,
                         $regions[$countryTitle],
                         $subregions[$countryTitle],
@@ -71,6 +72,7 @@ public function run(QueryAirportsActionRequest $request): QueryAirportsActionRes
                         $res[$parentIndex]->children[] = new QueryAirportResponse(
                             $airport->getTitle(),
                             $airport->getIata(),
+                            $airport->getCity()->getTitle(),
                             $countryTitle,
                             $regions[$countryTitle],
                             $subregions[$countryTitle],
@@ -81,6 +83,7 @@ public function run(QueryAirportsActionRequest $request): QueryAirportsActionRes
                     $res[] = new QueryAirportResponse(
                         $airport->getTitle(),
                         $airport->getIata(),
+                        $airport->getCity()->getTitle(),
                         $countryTitle,
                         $regions[$countryTitle],
                         $subregions[$countryTitle],

diff --git a/src/Airport/Controller/Response/QueryAirportResponse.php b/src/Airport/Controller/Response/QueryAirportResponse.php
@@ -8,15 +8,17 @@ class QueryAirportResponse
 {
     public string $title;
     public string $iata;
+    public string $city;
     public string $country;
     public ?string $region = null;
     public ?string $subregion = null;
 
-    public function __construct(string $title, string $iata, string $country, ?string $region = null, ?string $subregion = null)
+    public function __construct(string $title, string $iata, string $city, string $country, ?string $region = null, ?string $subregion = null)
     {
 
         $this->title = $title;
         $this->iata = $iata;
+        $this->city = $city;
         $this->country = $country;
         $this->region = $region;
         $this->subregion = $subregion;

diff --git a/src/Airport/Controller/Response/QueryChildrenAirportResponse.php b/src/Airport/Controller/Response/QueryChildrenAirportResponse.php
@@ -8,17 +8,19 @@ class QueryChildrenAirportResponse
 {
     public string $title;
     public string $iata;
+    public string $city;
     public string $country;
     public ?string $subregion = null;
     public ?string $region = null;
 
     /** @var array<QueryAirportResponse> */
     public array $children = [];
 
-    public function __construct(string $title, string $iata, string $country, ?string $region = null, ?string $subregion = null, array $children = [])
+    public function __construct(string $title, string $iata, string $city, string $country, ?string $region = null, ?string $subregion = null, array $children = [])
     {
         $this->title = $title;
         $this->iata = $iata;
+        $this->city = $city;
         $this->country = $country;
         $this->subregion = $subregion;
         $this->region = $region;

diff --git a/tests/Unit/Airport/Action/Query/QueryAirportsActionTest.php b/tests/Unit/Airport/Action/Query/QueryAirportsActionTest.php
@@ -54,13 +54,15 @@ public function testShouldReturnAirports(): void
         $action = new QueryAirportsAction($this->airportRepository);
         $response = $action->run($this->request);
 
-        $country = $airport->getCity()->getCountry();
+        $city = $airport->getCity();
+        $country = $city->getCountry();
         $subregion = $country->getSubregion();
         $region = $subregion->getRegion();
 
         $this->assertCount(1, $response->airports);
         $this->assertEquals($airport->getTitle(), $response->airports[0]->title);
         $this->assertEquals($airport->getIata(), $response->airports[0]->iata);
+        $this->assertEquals($city->getTitle(), $response->airports[0]->city);
         $this->assertEquals($country->getTitle(), $response->airports[0]->country);
         $this->assertEquals($subregion->getTitle(), $response->airports[0]->subregion);
         $this->assertEquals($region->getTitle(), $response->airports[0]->region);

diff --git a/tests/Unit/Airport/Controller/Response/QueryAirportResponseTest.php b/tests/Unit/Airport/Controller/Response/QueryAirportResponseTest.php
@@ -14,20 +14,23 @@ public function testValidInstantiation(): void
     {
         $airport = AirportDummy::get();
 
-        $country = $airport->getCity()->getCountry();
+        $city = $airport->getCity();
+        $country = $city->getCountry();
         $subregion = $country->getSubregion();
         $region = $subregion->getRegion();
 
         $actual = new QueryAirportResponse(
             $airport->getTitle(),
             $airport->getIata(),
-            $airport->getCity()->getCountry()->getTitle(),
+            $city->getTitle(),
+            $country->getTitle(),
             $region->getTitle(),
             $subregion->getTitle(),
         );
 
         $this->assertEquals($airport->getTitle(), $actual->title);
         $this->assertEquals($airport->getIata(), $actual->iata);
-        $this->assertEquals($airport->getCity()->getCountry()->getTitle(), $actual->country);
+        $this->assertEquals($city->getTitle(), $actual->city);
+        $this->assertEquals($country->getTitle(), $actual->country);
     }
 }
diff --git a/tests/Unit/Airport/Controller/Response/QueryChildrenAirportResponseTest.php b/tests/Unit/Airport/Controller/Response/QueryChildrenAirportResponseTest.php
@@ -14,33 +14,38 @@ class QueryChildrenAirportResponseTest extends TestCase
     public function testValidInstantiation(): void
     {
         $airport = AirportDummy::get();
-        $country = $airport->getCity()->getCountry();
+        $city = $airport->getCity();
+        $country = $city->getCountry();
         $subregion = $country->getSubregion();
         $region = $subregion->getRegion();
 
         $children = new QueryAirportResponse(
             $airport->getTitle(),
             $airport->getIata(),
-            $airport->getCity()->getCountry()->getTitle(),
+            $city->getTitle(),
+            $country->getTitle(),
             $region->getTitle(),
             $subregion->getTitle(),
         );
 
         $actual = new QueryChildrenAirportResponse(
             $airport->getTitle(),
             $airport->getIata(),
-            $airport->getCity()->getCountry()->getTitle(),
+            $city->getTitle(),
+            $country->getTitle(),
             $region->getTitle(),
             $subregion->getTitle(),
             [$children]
         );
 
         $this->assertEquals($airport->getTitle(), $actual->title);
         $this->assertEquals($airport->getIata(), $actual->iata);
-        $this->assertEquals($airport->getCity()->getCountry()->getTitle(), $actual->country);
+        $this->assertEquals($city->getTitle(), $actual->city);
+        $this->assertEquals($country->getTitle(), $actual->country);
 
         $this->assertEquals($airport->getTitle(), $actual->children[0]->title);
         $this->assertEquals($airport->getIata(), $actual->children[0]->iata);
-        $this->assertEquals($airport->getCity()->getCountry()->getTitle(), $actual->children[0]->country);
+        $this->assertEquals($city->getTitle(), $actual->children[0]->city);
+        $this->assertEquals($country->getTitle(), $actual->children[0]->country);
     }
 }