#120 - fix load() in DataImporter.php (#121)

e-motion-apps · Aug 21, 2023 · 4686ed3 · 4686ed3
1 parent 3b50785
commit 4686ed3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/app/Importers/DataImporter.php b/app/Importers/DataImporter.php
@@ -99,19 +99,26 @@ protected function createImportInfoDetails(string $code, string $providerName):
 
     protected function load(string $cityName, string $countryName, string $lat = "", string $long = ""): string
     {
-        $city = City::query()->where("name", $cityName)->first();
-        $alternativeCityName = CityAlternativeName::query()->where("name", $cityName)->first();
+        $country = Country::query()->where("name", $countryName)->orWhere("alternative_name", $countryName)->first();
 
-        if ($city || $alternativeCityName) {
-            $cityId = $city ? $city->id : $alternativeCityName->city_id;
+        if ($country) {
+            $city = City::query()->where("name", $cityName)->where("country_id", $country->id)->first();
+            $alternativeCityName = CityAlternativeName::query()->where("name", $cityName)->first();
 
-            $this->createProvider($cityId, self::getProviderName());
+            if ($city) {
+                $cityId = $city->id;
+                $this->createProvider($cityId, self::getProviderName());
 
-            return strval($cityId);
-        }  
-        $country = Country::query()->where("name", $countryName)->orWhere("alternative_name", $countryName)->first();
+                return strval($cityId);
+            } elseif ($alternativeCityName) {
+                $cityId = $alternativeCityName->city_id;
+                $city = City::query()->where("id", $cityId)->first();
+
+                if ($city->country_id === $country->id){
+                    $this->createProvider($cityId, self::getProviderName());
+                }
+            }
 
-        if ($country) {
             $coordinates = $this->mapboxService->getCoordinatesFromApi($cityName, $countryName);
             $countCoordinates = count($coordinates);
 
@@ -128,7 +135,7 @@ protected function load(string $cityName, string $countryName, string $lat = "",
             $this->createProvider($city->id, self::getProviderName());
 
             return strval($city->id);
-        }  
+        }
         $this->countryNotFound($cityName, $countryName);
         $this->createImportInfoDetails("420", self::getProviderName());
 

diff --git a/database/migrations/2023_06_06_114212_create_cities_table.php b/database/migrations/2023_06_06_114212_create_cities_table.php
@@ -17,7 +17,7 @@ public function up(): void
                 ->on("countries")
                 ->onDelete("cascade");
 
-            $table->string("name")->unique();
+            $table->string("name");
             $table->string("latitude")->nullable();
             $table->string("longitude")->nullable();
             $table->timestamps();

diff --git a/public/providers/binbin.png b/public/providers/binbin.png