Merge pull request #13171 from snipe/features/importer/allow_update_by_user_id

Accept user ID as authoratative field for updates

Author: snipe

app/Http/Livewire/Importer.php

@@ -288,6 +288,7 @@ public function mount()
         ];
 
         $this->users_fields  = [
+            'id' => trans('general.id'),
             'company' => trans('general.company'),
             'location' => trans('general.location'),
             'department' => trans('general.department'),

app/Importer/UserImporter.php

@@ -42,6 +42,7 @@ protected function handle($row)
     public function createUserIfNotExists(array $row)
     {
         // Pull the records from the CSV to determine their values
+        $this->item['id'] = $this->findCsvMatch($row, 'id');
         $this->item['username'] = $this->findCsvMatch($row, 'username');
         $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
         $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
@@ -76,13 +77,18 @@ public function createUserIfNotExists(array $row)
             $user_formatted_array = User::generateFormattedNameFromFullName($user_full_name, Setting::getSettings()->username_format);
             $this->item['username'] = $user_formatted_array['username'];
         }
-        
-        $user = User::where('username', $this->item['username'])->first();
+
+        // Check if a numeric ID was passed. If it does, use that above all else.
+        if ((array_key_exists('id', $this->item) && ($this->item['id'] != "") && (is_numeric($this->item['id']))))  {
+            $user = User::find($this->item['id']);
+        } else {
+            $user = User::where('username', $this->item['username'])->first();
+        }
+
         if ($user) {
+
             if (! $this->updating) {
-                $this->log('A matching User '.$this->item['name'].' already exists.  ');
                 \Log::debug('A matching User '.$this->item['name'].' already exists.  ');
-
                 return;
             }
             $this->log('Updating User');
@@ -109,7 +115,6 @@ public function createUserIfNotExists(array $row)
         $user->fill($this->sanitizeItemForStoring($user));
 
         if ($user->save()) {
-            // $user->logCreate('Imported using CSV Importer');
             $this->log('User '.$this->item['name'].' was created');
 
             if (($user->email) && ($user->activated == '1')) {