From 4686ed32d87f385f73d52794f1805f4d23c7c9bc Mon Sep 17 00:00:00 2001
From: Aleksandra Kozubal
 <104600942+AleksandraKozubal@users.noreply.github.com>
Date: Mon, 21 Aug 2023 07:34:11 +0200
Subject: [PATCH] #120 - fix load() in DataImporter.php (#121)

---
 app/Importers/DataImporter.php                |  27 +++++++++++-------
 .../2023_06_06_114212_create_cities_table.php |   2 +-
 public/providers/binbin.png                   | Bin 0 -> 1696 bytes
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 public/providers/binbin.png

diff --git a/app/Importers/DataImporter.php b/app/Importers/DataImporter.php
index e705ea3a..e3f286ae 100644
--- 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
index 52ffe8a9..ac05805c 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..55756c4ce8d045dabd946753ef5ff6592e5b6dd5
GIT binary patch
literal 1696
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

literal 0
HcmV?d00001