mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
61c6160b98
* Move importer to an inline-template, allows for translations and easier passing of data from laravel to vue. * Pull the modal out into a dedicated partial, move importer to views/importer. * Add document of CSV->importer mappings. Reorganize some code. Progress. * Add header_row and first_row to imports table, and process upon uploading a file * Use an expandable table row instead of a modal for import processing. This should allow for field mapping interaction easier. * Fix import processing after moving method. * Frontend importer mapping improvements. Invert display so we show found columns and allow users to select an importer field to map to. Also implement sample data based on first row of csv. * Update select2. Maintain selected items properly. * Backend support for importing. Only works on the web importer currently. Definitely needs testing and polish. * We no longer use vue-modal plugin. * Add a column to track field mappings to the imports table. * Cleanup/rename methods+refactor * Save field mappings and import type when attempting an import, and repopulate these values when returning to the page. * Update debugbar to fix a bug in the debugbar code. * Fix asset tag detection. Also rename findMatch to be a bit clearer as to what it does. Remove logging to file of imports for http imports because it eats an incredible amouint of memory. This commit also moves imports out of the hardware namespace and into their own webcontroller and route prefix, remove dead code from AssetController as a result. * Dynamically limit options for select2 based on import type selected, and group them by item type. * Add user importer. Still need to implement emailing of passwords to new users, and probably test a bit more. This also bumps the memory limit for web imports up as well, I need to profile memory usage here before too long. * Query the db to find user matches rather than search the array. Performance is much much better. * Speed/memory improvements in importers. Move to querying the db rather than maintaining an array for all importers. Also only store the id of items when we import, rather than the full model. It saves a decent amount of memory. * Remove grouping of items in select2 With the values being set dynamically, the grouping is redundant. It also caused a regression with automatically guessing/matching field names. This is starting to get close. * Remove debug line on every create. * Switch migration to be text field instead of json field for compatibility with older mysql/mariadb * Fix asset import regression matching email address. * Rearrange travis order in attempt to fix null settings. * Use auth::id instead of fetching it off the user. Fixes a null object reference during seeding.
74 lines
2.3 KiB
PHP
74 lines
2.3 KiB
PHP
<?php
|
|
|
|
namespace App\Importer;
|
|
|
|
use App\Helpers\Helper;
|
|
use App\Models\User;
|
|
|
|
class UserImporter extends ItemImporter
|
|
{
|
|
protected $users;
|
|
public function __construct($filename)
|
|
{
|
|
parent::__construct($filename);
|
|
// $this->users = User::all();
|
|
}
|
|
|
|
protected function handle($row)
|
|
{
|
|
parent::handle($row);
|
|
$this->createUserIfNotExists($row);
|
|
}
|
|
|
|
/**
|
|
* Create a user if a duplicate does not exist.
|
|
* @todo Investigate how this should interact with Importer::createOrFetchUser
|
|
*
|
|
* @author Daniel Melzter
|
|
* @since 4.0
|
|
*/
|
|
public function createUserIfNotExists(array $row)
|
|
{
|
|
// User Specific Bits
|
|
$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');
|
|
$this->item['email'] = $this->findCsvMatch($row, 'user_email');
|
|
$this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
|
|
$this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
|
|
$this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
|
|
$this->item['password'] = $this->tempPassword;
|
|
$user = User::where('username', $this->item['username'])->first();
|
|
if ($user) {
|
|
if (!$this->updating) {
|
|
$this->log('A matching User ' . $this->item["name"] . ' already exists. ');
|
|
return;
|
|
}
|
|
$this->log('Updating User');
|
|
// $user = $this->users[$userId];
|
|
$user->update($this->sanitizeItemForUpdating($user));
|
|
if (!$this->testRun) {
|
|
$user->save();
|
|
}
|
|
return;
|
|
}
|
|
$this->log("No matching user, creating one");
|
|
$user = new User();
|
|
$user->fill($this->sanitizeItemForStoring($user));
|
|
|
|
if ($this->testRun) {
|
|
$this->log('TEST RUN - User ' . $this->item['name'] . ' not created');
|
|
return;
|
|
}
|
|
if ($user->save()) {
|
|
// $user->logCreate('Imported using CSV Importer');
|
|
$this->log("User " . $this->item["name"] . ' was created');
|
|
$user = null;
|
|
$this->item = null;
|
|
return;
|
|
}
|
|
$this->logError($user, 'User');
|
|
return;
|
|
}
|
|
}
|