DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

New field mapping

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-04-16 07:47:26 -07:00
parent bcf9188dcd
commit a831a34594
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/Importer/Importer.php
View file

@ -65,19 +65,22 @@ abstract class Importer
'email' => 'email', 'email' => 'email',
'username' => 'username', 'username' => 'username',
'address' => 'address', 'address' => 'address',
'address2' => 'address2',
'city' => 'city', 'city' => 'city',
'state' => 'state', 'state' => 'state',
'country' => 'country', 'country' => 'country',
'zip' => 'zip',
'jobtitle' => 'job title', 'jobtitle' => 'job title',
'employee_num' => 'employee number', 'employee_num' => 'employee number',
'phone_number' => 'phone number', 'phone_number' => 'phone number',
'first_name' => 'first name', 'first_name' => 'first name',
'last_name' => 'last name', 'last_name' => 'last name',
'department' => 'department', 'department' => 'department',
'manager_first_name' => 'manager first name', 'manager_name' => 'manager full name',
'manager_last_name' => 'manager last name', 'manager_username' => 'manager username',
'min_amt' => 'minimum quantity', 'min_amt' => 'minimum quantity',
'remote' => 'remote', 'remote' => 'remote',
'vip' => 'vip',
]; ];
/** /**
* Map of item fields->csv names * Map of item fields->csv names
@ -198,11 +201,11 @@ abstract class Importer
$val = $default; $val = $default;
$key = $this->lookupCustomKey($key); $key = $this->lookupCustomKey($key);
$this->log("Custom Key: ${key}"); // $this->log("Custom Key: ${key}");
if (array_key_exists($key, $array)) { if (array_key_exists($key, $array)) {
$val = Encoding::toUTF8(trim($array[$key])); $val = Encoding::toUTF8(trim($array[$key]));
} }
$this->log("${key}: ${val}"); //$this->log("${key}: ${val}");
return $val; return $val;
} }
@ -280,8 +283,9 @@ abstract class Importer
* @return User Model w/ matching name * @return User Model w/ matching name
* @internal param array $user_array User details parsed from csv * @internal param array $user_array User details parsed from csv
*/ */
protected function createOrFetchUser($row) protected function createOrFetchUser($row, $type = null)
{ {
$user_array = [ $user_array = [
'full_name' => $this->findCsvMatch($row, 'full_name'), 'full_name' => $this->findCsvMatch($row, 'full_name'),
'email' => $this->findCsvMatch($row, 'email'), 'email' => $this->findCsvMatch($row, 'email'),
@ -292,25 +296,29 @@ abstract class Importer
'remote' => $this->fetchHumanBoolean(($this->findCsvMatch($row, 'remote'))), 'remote' => $this->fetchHumanBoolean(($this->findCsvMatch($row, 'remote'))),
]; ];
if ($type == 'manager') {
\Log::debug('Type = manager');
$user_array = [
'full_name' => $this->findCsvMatch($row, 'manager'),
'username' => $this->findCsvMatch($row, 'manager_username'),
];
}
// Maybe we're lucky and the user already exists. // Maybe we're lucky and the user already exists.
if ($user = User::where('username', $user_array['username'])->first()) { if ($user = User::where('username', $user_array['username'])->first()) {
$this->log('User '.$user_array['username'].' already exists'); $this->log('User '.$user_array['username'].' already exists');
return $user; return $user;
} }
// If the full name is empty, bail out--we need this to extract first name (at the very least) // If the full name is empty, bail out--we need this to extract first name (at the very least)
if (empty($user_array['full_name'])) { if (empty($user_array['full_name'])) {
$this->log('Insufficient user data provided (Full name is required)- skipping user creation, just adding asset'); $this->log('Insufficient user data provided (Full name is required) - skipping user creation.');
\Log::debug(print_r($user_array, true));
\Log::debug(print_r($row, true));
return false; return false;
} }
// Is the user actually an ID?
if ($user = $this->findUserByNumber($user_array['full_name'])) {
return $user;
}
$this->log('User does not appear to be an id with number: '.$user_array['full_name'].'. Continuing through our processes');
// Populate email if it does not exist. // Populate email if it does not exist.
if (empty($user_array['email'])) { if (empty($user_array['email'])) {