License importer, small fixes for asset imporer

Author: snipe

app/commands/ImportCommand.php renamed to app/commands/AssetImportCommand.php

@@ -5,21 +5,21 @@
 use Symfony\Component\Console\Input\InputArgument;
 use League\Csv\Reader;
 
-class ImportCommand extends Command {
+class AssetImportCommand extends Command {
 
 	/**
 	 * The console command name.
 	 *
 	 * @var string
 	 */
-	protected $name = 'import:csv';
+	protected $name = 'asset-import:csv';
 
 	/**
 	 * The console command description.
 	 *
 	 * @var string
 	 */
-	protected $description = 'Import from CSV';
+	protected $description = 'Import Assets from CSV';
 
 	/**
 	 * Create a new command instance.
@@ -42,9 +42,9 @@ public function fire()
 
 
 		if (!$this->option('testrun')=='true') {
-			$this->comment('======= Importing '.$filename.' =========');
+			$this->comment('======= Importing Assets from '.$filename.' =========');
 		} else {
-			$this->comment('====== TEST ONLY Import for '.$filename.' ====');
+			$this->comment('====== TEST ONLY Asset Import for '.$filename.' ====');
 			$this->comment('============== NO DATA WILL BE WRITTEN ==============');
 		}
 
@@ -63,66 +63,77 @@ public function fire()
 
 			// Let's just map some of these entries to more user friendly words
 
+			// User's name
 			if (array_key_exists('0',$row)) {
-				$user_name = $row[0];
+				$user_name = trim($row[0]);
 			} else {
 				$user_name = '';
 			}
 
+			// User's email
 			if (array_key_exists('1',$row)) {
-				$user_email = $row[1];
+				$user_email = trim($row[1]);
 			} else {
 				$user_email = '';
 			}
 
+			// Asset Category
 			if (array_key_exists('2',$row)) {
-				$user_asset_category = $row[2];
+				$user_asset_category = trim($row[2]);
 			} else {
 				$user_asset_category = '';
 			}
 
+			// Asset Name
 			if (array_key_exists('3',$row)) {
-				$user_asset_name = $row[3];
+				$user_asset_name = trim($row[3]);
 			} else {
 				$user_asset_name = '';
 			}
 
+			// Asset Manufacturer
 			if (array_key_exists('4',$row)) {
-				$user_asset_mfgr = $row[4];
+				$user_asset_mfgr = trim($row[4]);
 			} else {
 				$user_asset_mfgr = '';
 			}
 
+			// Asset model number
 			if (array_key_exists('5',$row)) {
-				$user_asset_modelno = $row[5];
+				$user_asset_modelno = trim($row[5]);
 			} else {
 				$user_asset_modelno = '';
 			}
 
+			// Asset serial number
 			if (array_key_exists('6',$row)) {
-				$user_asset_serial = $row[6];
+				$user_asset_serial = trim($row[6]);
 			} else {
 				$user_asset_serial = '';
 			}
 
+			// Asset tag
 			if (array_key_exists('7',$row)) {
-				$user_asset_tag = $row[7];
+				$user_asset_tag = trim($row[7]);
 			} else {
 				$user_asset_tag = '';
 			}
 
+			// Asset location
 			if (array_key_exists('8',$row)) {
-				$user_asset_location = $row[8];
+				$user_asset_location = trim($row[8]);
 			} else {
 				$user_asset_location = '';
 			}
 
+			// Asset notes
 			if (array_key_exists('9',$row)) {
-				$user_asset_notes = $row[9];
+				$user_asset_notes = trim($row[9]);
 			} else {
 				$user_asset_notes = '';
 			}
 
+			// Asset purchase date
 			if (array_key_exists('10',$row)) {
 				if ($row[10]!='') {
 					$user_asset_purchase_date = date("Y-m-d 00:00:01", strtotime($row[10]));
@@ -136,17 +147,21 @@ public function fire()
 			// A number was given instead of a name
 			if (is_numeric($user_name)) {
 				$this->comment('User '.$user_name.' is not a name - assume this user already exists');
-			// No name was given
+				$user_username = '';
 
+			// No name was given
 			} elseif ($user_name=='') {
 				$this->comment('No user data provided - skipping user creation, just adding asset');
 				$first_name = '';
 				$last_name = '';
+				$user_username = '';
+
 			} else {
 
 					$name = explode(" ", $user_name);
 					$first_name = $name[0];
 					$email_last_name = '';
+					$email_prefix = $first_name;
 
 					if (!array_key_exists(1, $name)) {
 						$last_name='';
@@ -171,6 +186,9 @@ public function fire()
 
 					}
 
+
+					$user_username = $email_prefix;
+
 					// Generate an email based on their name if no email address is given
 					if ($user_email=='') {
 						if ($first_name=='Unknown') {
@@ -179,14 +197,12 @@ public function fire()
 						$email = strtolower($email_prefix).'@'.$this->option('domain');
 						$user_email = str_replace("'",'',$email);
 					}
-
-
-
 			}
 
 			$this->comment('Full Name: '.$user_name);
 			$this->comment('First Name: '.$first_name);
 			$this->comment('Last Name: '.$last_name);
+			$this->comment('Username: '.$user_username);
 			$this->comment('Email: '.$user_email);
 			$this->comment('Category Name: '.$user_asset_category);
 			$this->comment('Item: '.$user_asset_name);
@@ -200,22 +216,23 @@ public function fire()
 
 			$this->comment('------------- Action Summary ----------------');
 
-			if ($user_email!='') {
-				if ($user = User::where('email', $user_email)->first()) {
-					$this->comment('User '.$user_email.' already exists');
+			if ($user_username!='') {
+				if ($user = User::where('username', $user_username)->whereNotNull('username')->first()) {
+					$this->comment('User '.$user_username.' already exists');
 				} else {
 					// Create the user
 					$user = Sentry::createUser(array(
 						'first_name' => $first_name,
 						'last_name' => $last_name,
 						'email'     => $user_email,
+						'username'     => $user_username,
 						'password'  => substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10),
 						'activated' => true,
 						'permissions' => array(
 							'admin' => 0,
 							'user'  => 1,
 						),
-						'notes'         => 'Imported user'
+						'notes'         => 'User imported through asset importer'
 					));
 
 					// Find the group using the group id
@@ -311,6 +328,11 @@ public function fire()
 
 				$asset = new Asset();
 				$asset->name = e($user_asset_name);
+				if ($user_asset_purchase_date!='') {
+					$asset->purchase_date = $user_asset_purchase_date;
+				} else {
+					$asset->purchase_date = NULL;
+				}
 				$asset->serial = e($user_asset_serial);
 				$asset->asset_tag = e($user_asset_tag);
 				$asset->model_id = $asset_model->id;