From e458a761d333c43b6edb90530574bcd73df8ffd8 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Mon, 9 Mar 2020 16:20:04 -0400
Subject: [PATCH] Include airline name in subfleet name #628

---
 .../Importer/Services/Importers/AircraftImporter.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/Importer/Services/Importers/AircraftImporter.php b/modules/Importer/Services/Importers/AircraftImporter.php
index fdf817cf..bf89ba94 100644
--- a/modules/Importer/Services/Importers/AircraftImporter.php
+++ b/modules/Importer/Services/Importers/AircraftImporter.php
@@ -37,12 +37,15 @@ class AircraftImporter extends BaseImporter
         $count = 0;
         $rows = $this->db->readRows($this->table, $this->idField, $start, $fields);
         foreach ($rows as $row) {
+            $subfleet_name = $row->icao;
+
             $airline_id = null;
             if (!empty($row->airline)) {
+                $subfleet_name = $row->airline.' - '.$row->icao;
                 $airline_id = $this->idMapper->getMapping('airlines', $row->airline);
             }
 
-            $subfleet = $this->getSubfleet($row->icao, $airline_id);
+            $subfleet = $this->getSubfleet($subfleet_name, $row->icao, $airline_id);
             $this->info('Subfleet ID is '.$subfleet->id);
 
             $where = [
@@ -75,12 +78,13 @@ class AircraftImporter extends BaseImporter
     /**
      * Return the subfleet
      *
-     * @param string $icao       ICAO of the subfleet
+     * @param string $name
+     * @param string $icao ICAO of the subfleet
      * @param int    $airline_id
      *
      * @return mixed
      */
-    protected function getSubfleet($icao, $airline_id = null)
+    protected function getSubfleet($name, $icao, $airline_id = null)
     {
         if (empty($airline_id)) {
             $airline = Airline::first();
@@ -89,7 +93,7 @@ class AircraftImporter extends BaseImporter
 
         return Subfleet::firstOrCreate([
             'airline_id' => $airline_id,
-            'name'       => $icao,
+            'name'       => $name,
         ], ['type' => $icao]);
     }
 }