stop dup location record creation 👀

YorCreative · Oct 8, 2024 · 51693d2 · 51693d2
1 parent 0c2d4d9
commit 51693d2
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Repositories/LocationRepository.php b/src/Repositories/LocationRepository.php
@@ -29,7 +29,13 @@ public static function findOrCreateLocationRecord(array $clickLocation): ShortUr
                     ->where('regionCode', $clickLocation['regionCode'])
                     ->firstOrFail();
             } catch (Exception $exception) {
-                return ShortUrlLocation::query()->firstOrCreate($clickLocation);
+                $ipAddress = $clickLocation['ip'];
+
+                unset($clickLocation['ip']);
+
+                return ShortUrlLocation::query()->firstOrCreate([
+                    'ip' => $ipAddress,
+                ], $clickLocation);
             }
         } catch (Exception $exception) {
             throw new UrlRepositoryException($exception->getMessage());
@@ -39,7 +45,7 @@ public static function findOrCreateLocationRecord(array $clickLocation): ShortUr
     public static function getLocationFrom(string $ip): array
     {
         // only look up location when not existing yet
-        if (! $clickLocation = ShortUrlLocation::query()
+        if (!$clickLocation = ShortUrlLocation::query()
             ->where('ip', $ip)
             ->whereNotNull('countryCode')
             ->whereNotNull('longitude')
@@ -48,12 +54,12 @@ public static function getLocationFrom(string $ip): array
             ->first()) {
             $clickLocation = Location::get($ip);
 
-            if (! $clickLocation) {
+            if (!$clickLocation) {
                 return LocationRepository::locationUnknown($ip);
             }
 
-            $clickLocation->longitude = (float) $clickLocation->longitude;
-            $clickLocation->latitude = (float) $clickLocation->latitude;
+            $clickLocation->longitude = (float)$clickLocation->longitude;
+            $clickLocation->latitude = (float)$clickLocation->latitude;
 
             unset($clickLocation->driver);
         }