fix: handle airports without a subregion and region

amvid · Jul 21, 2024 · f917424 · f917424
1 parent 4a1e9c1
commit f917424
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 22 deletions.
diff --git a/src/Airport/Action/Query/QueryAirportsAction.php b/src/Airport/Action/Query/QueryAirportsAction.php
@@ -34,11 +34,11 @@ public function run(QueryAirportsActionRequest $request): QueryAirportsActionRes
             $city = $airport->getCity();
             $country = $city->getCountry();
             $subregion = $country->getSubregion();
-            $region = $subregion->getRegion();
+            $region = $subregion?->getRegion();
             $cityIata = $city->getIata() ?? $airport->getIata();
 
-            $regions[$country->getTitle()] = $region->getTitle();
-            $subregions[$country->getTitle()] = $subregion->getTitle();
+            $regions[$country->getTitle()] = $region?->getTitle();
+            $subregions[$country->getTitle()] = $subregion?->getTitle();
 
             if (!isset($map[$country->getTitle()])) {
                 $map[$country->getTitle()] = [];

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

diff --git a/src/Airport/Controller/Response/QueryChildrenAirportResponse.php b/src/Airport/Controller/Response/QueryChildrenAirportResponse.php
@@ -9,13 +9,13 @@ class QueryChildrenAirportResponse
     public string $title;
     public string $iata;
     public string $country;
-    public string $subregion;
-    public string $region;
+    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, string $subregion, array $children = [])
+    public function __construct(string $title, string $iata, string $country, ?string $region = null, ?string $subregion = null, array $children = [])
     {
         $this->title = $title;
         $this->iata = $iata;

diff --git a/src/Airport/Entity/Airport.php b/src/Airport/Entity/Airport.php
@@ -30,11 +30,11 @@ class Airport
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
     private UuidInterface $id;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: false)]
     private City $city;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: false)]
     private Timezone $timezone;
 

diff --git a/src/Application/EventListener/ExceptionListener.php b/src/Application/EventListener/ExceptionListener.php
@@ -16,8 +16,7 @@
     public function __construct(
         private LoggerInterface $logger,
         private KernelInterface $kernel,
-    ) {
-    }
+    ) {}
 
     public function onKernelException(ExceptionEvent $event): void
     {

diff --git a/src/City/Entity/City.php b/src/City/Entity/City.php
@@ -31,11 +31,11 @@ class City
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
     private UuidInterface $id;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: false)]
     private Country $country;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: true)]
     private ?State $state = null;
 

diff --git a/src/Country/Entity/Country.php b/src/Country/Entity/Country.php
@@ -36,18 +36,18 @@ class Country
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
     private UuidInterface $id;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: true)]
     private ?SubRegion $subRegion = null;
 
-    #[ORM\ManyToMany(targetEntity: Timezone::class, orphanRemoval: true)]
+    #[ORM\ManyToMany(targetEntity: Timezone::class, orphanRemoval: true, fetch: 'EAGER')]
     private Collection $timezones;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: false)]
     private Currency $currency;
 
-    #[ORM\OneToOne]
+    #[ORM\OneToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: true)]
     private ?City $capital = null;
 

diff --git a/src/State/Entity/State.php b/src/State/Entity/State.php
@@ -12,7 +12,6 @@
 use Ramsey\Uuid\UuidInterface;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Types\UuidType;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
 #[ORM\Entity(repositoryClass: StateRepository::class)]
 #[ORM\HasLifecycleCallbacks]
@@ -36,7 +35,7 @@ class State
     #[ORM\Column(length: 50, nullable: true)]
     private ?string $type = null;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: false)]
     private Country $country;
 

diff --git a/src/SubRegion/Entity/SubRegion.php b/src/SubRegion/Entity/SubRegion.php
@@ -26,7 +26,7 @@ class SubRegion
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
     private UuidInterface $id;
 
-    #[ORM\ManyToOne]
+    #[ORM\ManyToOne(fetch: 'EAGER')]
     #[ORM\JoinColumn(nullable: false)]
     private Region $region;