Another importer fix. (#5383)

* Fix condition where matching user fails when providing a username but no full name. Also shortcircuit username matching if a user exists. * Simplify Logic If the user provided is numeric, but doesn't exist in the database, assume that the user's name is a number and go through all relevant generation. of email/first+last names. Alternatively we may want to abort or remove the is_numeric bits.. it seems a little counterintuitive
snipe · Apr 18, 2018 · 7b72dde · 7b72dde
1 parent 5948a0b
commit 7b72dde
Showing 1 changed file with 28 additions and 20 deletions.
diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php
@@ -247,6 +247,18 @@ protected function createOrFetchUser($row)
         $user_username = $this->findCsvMatch($row, "username");
         $first_name = '';
         $last_name = '';
+        if(empty($user_name) && empty($user_email) && empty($user_username)) {
+            $this->log('No user data provided - skipping user creation, just adding asset');
+            //$user_username = '';
+            return false;
+        }
+        // A username was given.
+        if( !empty($user_username)) {
+            $user = User::where('username', $user_username)->first();
+            if($user) {
+                return $user;
+            }
+        }
         // A number was given instead of a name
         if (is_numeric($user_name)) {
             $this->log('User '.$user_name.' is not a name - assume this user already exists');
@@ -255,28 +267,24 @@ protected function createOrFetchUser($row)
                 return $user;
             }
             $this->log('User with id'.$user_name.' does not exist.  Continuing through our processes');
-        } elseif (empty($user_name)) {
-            $this->log('No user data provided - skipping user creation, just adding asset');
-            //$user_username = '';
-            return false;
-        } else {
-            $user_email_array = User::generateFormattedNameFromFullName(Setting::getSettings()->email_format, $user_name);
-            $first_name = $user_email_array['first_name'];
-            $last_name = $user_email_array['last_name'];
-
-            if ($user_email=='') {
-                if (Setting::getSettings()->email_domain) {
-                    $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
-                }
+        }
+        // Generate data based on user name.
+        $user_email_array = User::generateFormattedNameFromFullName(Setting::getSettings()->email_format, $user_name);
+        $first_name = $user_email_array['first_name'];
+        $last_name = $user_email_array['last_name'];
+
+        if (empty($user_email)) {
+            if (Setting::getSettings()->email_domain) {
+                $user_email = str_slug($user_email_array['username']).'@'.Setting::getSettings()->email_domain;
             }
+        }
 
-            if ($user_username=='') {
-                if ($this->usernameFormat =='email') {
-                    $user_username = $user_email;
-                } else {
-                    $user_name_array = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format, $user_name);
-                    $user_username = $user_name_array['username'];
-                }
+        if (empty($user_username)) {
+            if ($this->usernameFormat =='email') {
+                $user_username = $user_email;
+            } else {
+                $user_name_array = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format, $user_name);
+                $user_username = $user_name_array['username'];
             }
         }
         $user = new User;