🐛 compare by id and name (#3401)

Author: MrKrisKrisu

app/Console/Commands/RefreshOperatorMappings.php

@@ -5,11 +5,11 @@
 use App\Services\OperatorService;
 use Illuminate\Console\Command;
 
-class RefreshOperatorMappings extends Command
-{
+class RefreshOperatorMappings extends Command {
     protected $signature = 'app:refresh-operator-mappings';
 
     public function handle(): void {
-        OperatorService::refreshFiles();
+        $operatorService = new OperatorService();
+        $operatorService->refreshFiles();
     }
 }

app/Services/OperatorService.php

@@ -172,19 +172,13 @@ private function findMapping(array $operatorMappings, string $agencyId, string $
         ]);
 
         foreach($operatorMappings as $mapping) {
-            // Compare by motis_id.
-            if(isset($mapping['motis_id']) && (string)$mapping['motis_id'] === $agencyId) {
-                Log::debug('Mapping found by motis_id', ['agencyId' => $agencyId]);
-                return $mapping;
-            }
-
-            // Compare by motis_name (case-insensitive).
-            if(isset($mapping['motis_name']) &&
-               strtolower(trim($mapping['motis_name'])) === strtolower(trim($agencyName))) {
-                Log::debug('Mapping found by motis_name', [
-                    'agencyName'  => $agencyName,
-                    'matchedName' => $mapping['motis_name'],
-                ]);
+            if(
+                isset($mapping['motis_id'])
+                && (string)$mapping['motis_id'] === $agencyId
+                && isset($mapping['motis_name'])
+                && strtolower(trim($mapping['motis_name'])) === strtolower(trim($agencyName))
+            ) {
+                Log::debug('Mapping found', ['agencyId' => $agencyId, 'agencyName' => $agencyName]);
                 return $mapping;
             }
         }