🚸 Improve Autocomplete Results (#3446)

Author: HerrLevin

app/Http/Controllers/Backend/Transport/StationController.php

@@ -6,6 +6,7 @@
 use App\DataProviders\DataProviderInterface;
 use App\Http\Controllers\Controller;
 use App\Models\Checkin;
+use App\Models\Station;
 use App\Models\Stopover;
 use App\Models\User;
 use App\Repositories\StationRepository;
@@ -81,8 +82,12 @@ public function search(string $search): Collection {
         $stations = $this->dataProvider->getStations($search);
         if ($stations->count() < 10) {
             $remaining  = 10 - $stations->count();
-            $dbStations = $this->stationRepository->getStationByName($search, 'de', true, $remaining);
-            $stations   = $stations->merge($dbStations);
+            $dbStations = $this->stationRepository->getStationByName($search, 'de', true);
+            // remove duplicates
+            $dbStations = $dbStations->filter(function(Station $station) use ($stations) {
+                return !$stations->contains('id', $station->id);
+            });
+            $stations   = $stations->merge($dbStations->take($remaining));
         }
         return $stations;
     }

app/Repositories/StationRepository.php

@@ -15,7 +15,8 @@ class StationRepository
     public function getStationByName(string $name, string $lang, bool $invertLanguage = false, int $limit = 20): Collection {
         $invertLanguage = $invertLanguage ? '!=' : '=';
 
-        return Station::leftJoin('station_names', 'station_names.station_id', '=', 'train_stations.id')
+        return Station::with('areas')
+                      ->leftJoin('station_names', 'station_names.station_id', '=', 'train_stations.id')
                       ->where('station_names.name', 'LIKE', "$name")
                       ->where('station_names.language', $invertLanguage, $lang)
                       ->orWhere('train_stations.name', 'LIKE', "$name")