DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Instead of a field in the csv, set whether assets, consumables, or accessories are generated by an option on the command line. Also Adjustconsumables/accessories to function smoother.

Browse source
This commit is contained in:
Daniel Meltzer 2016-05-25 20:19:12 -05:00
parent 04428d2d07
commit 22c6f32e92
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/Console/Commands/ObjectImportCommand.php
View file

@ -55,8 +55,6 @@ class ObjectImportCommand extends Command {
{ {
$filename = $this->argument('filename'); $filename = $this->argument('filename');
$logFile = $this->option('logfile'); $logFile = $this->option('logfile');
if(empty($logFile))
$logFile=storage_path('logs/importer.log');
\Log::useFiles($logFile); \Log::useFiles($logFile);
if ($this->option('testrun')) { if ($this->option('testrun')) {
@ -94,6 +92,7 @@ class ObjectImportCommand extends Command {
$this->consumables = Consumable::All(['name']); $this->consumables = Consumable::All(['name']);
// Loop through the records // Loop through the records
DB::transaction(function() use (&$newarray){ DB::transaction(function() use (&$newarray){
$item_type = strtolower($this->option('item-type'));
foreach( $newarray as $row ) { foreach( $newarray as $row ) {
// Let's just map some of these entries to more user friendly words // Let's just map some of these entries to more user friendly words
@ -105,12 +104,6 @@ class ObjectImportCommand extends Command {
$item_company_name = $this->array_smart_fetch($row, "company"); $item_company_name = $this->array_smart_fetch($row, "company");
$item_location = $this->array_smart_fetch($row, "location"); $item_location = $this->array_smart_fetch($row, "location");
$item["item_type"] = strtolower($this->array_smart_fetch($row, "item type"));
if(empty($item["item_type"])) {
$this->log("Item Type not set. Assuming asset");
$item["item_type"] = 'asset';
}
$item["item_name"] = $this->array_smart_fetch($row, "item name"); $item["item_name"] = $this->array_smart_fetch($row, "item name");
$item["purchase_date"] = date("Y-m-d 00:00:01", strtotime($this->array_smart_fetch($row, "purchase date"))); $item["purchase_date"] = date("Y-m-d 00:00:01", strtotime($this->array_smart_fetch($row, "purchase date")));
$item["purchase_cost"] = $this->array_smart_fetch($row, "purchase cost"); $item["purchase_cost"] = $this->array_smart_fetch($row, "purchase cost");
@ -121,7 +114,6 @@ class ObjectImportCommand extends Command {
$this->current_assetId = $item["item_name"]; $this->current_assetId = $item["item_name"];
$this->log("Item Type: " . $item["item_type"]);
$this->log('Category Name: ' . $item_category); $this->log('Category Name: ' . $item_category);
$this->log('Location: ' . $item_location); $this->log('Location: ' . $item_location);
$this->log('Purchase Date: ' . $item["purchase_date"]); $this->log('Purchase Date: ' . $item["purchase_date"]);
@ -131,11 +123,11 @@ class ObjectImportCommand extends Command {
$item["user"] = $this->createOrFetchUser($row); $item["user"] = $this->createOrFetchUser($row);
$item["location"] = $this->createOrFetchLocation($item_location); $item["location"] = $this->createOrFetchLocation($item_location);
$item["category"] = $this->createOrFetchCategory($item_category, $item["item_type"]); $item["category"] = $this->createOrFetchCategory($item_category, $item_type);
$item["manufacturer"] = $this->createOrFetchManufacturer($row); $item["manufacturer"] = $this->createOrFetchManufacturer($row);
$item["company"] = $this->createOrFetchCompany($item_company_name); $item["company"] = $this->createOrFetchCompany($item_company_name);
switch ($item["item_type"]) { switch ($item_type) {
case "asset": case "asset":
$this->createAssetIfNotExists($row, $item); $this->createAssetIfNotExists($row, $item);
break; break;
@ -455,7 +447,7 @@ class ObjectImportCommand extends Command {
$supplier = new Supplier(); $supplier = new Supplier();
$supplier->name = $supplier_name; $supplier->name = $supplier_name;
$supplier->user_id = 1; $supplier->user_id = 1;
if(!$this->option('testrun')) { if(!$this->option('testrun')) {
if ($supplier->save()) { if ($supplier->save()) {
$this->suppliers->add($supplier); $this->suppliers->add($supplier);
@ -664,11 +656,14 @@ class ObjectImportCommand extends Command {
} else { } else {
$accessory->purchase_cost = 0.00; $accessory->purchase_cost = 0.00;
} }
$accessory->location_id = $item["location"]->id; if($item["location"])
$accessory->location_id = $item["location"]->id;
$accessory->user_id = 1; $accessory->user_id = 1;
$accessory->company_id = $item["company"]->id; if($item["company"])
$accessory->company_id = $item["company"]->id;
$accessory->order_number = $item["order_number"]; $accessory->order_number = $item["order_number"];
$accessory->category_id = $item["category"]->id; if($item["category"])
$accessory->category_id = $item["category"]->id;
//TODO: Implement //TODO: Implement
// $accessory->notes = e($item_notes); // $accessory->notes = e($item_notes);
@ -684,8 +679,10 @@ class ObjectImportCommand extends Command {
if (!$this->option('testrun')) { if (!$this->option('testrun')) {
if ($accessory->save()) { if ($accessory->save()) {
$this->log('Accessory ' . $item["item_name"] . ' was created'); $this->log('Accessory ' . $item["item_name"] . ' was created');
$this->comment('Accessory ' . $item["item_name"] . ' was created');
} else { } else {
$this->log('Something went wrong! Accessory ' . $item["item_name"] . ' was NOT created'); $this->error('Accessory: ' . $accessory->getErrors());
} }
} else { } else {
$this->log('TEST RUN - Accessory ' . $item["item_name"] . ' not created'); $this->log('TEST RUN - Accessory ' . $item["item_name"] . ' not created');
@ -703,7 +700,7 @@ class ObjectImportCommand extends Command {
$this->log("Creating Consumable"); $this->log("Creating Consumable");
foreach($this->consumables as $tempconsumable) { foreach($this->consumables as $tempconsumable) {
if($tempconsumable->name === $item["item_name"]) { if($tempconsumable->name === $item["item_name"]) {
$this->log("A matching sumable " . $item["item_name"] . " already exists"); $this->log("A matching consumable " . $item["item_name"] . " already exists");
//TODO: Adjust quantity if different maybe? //TODO: Adjust quantity if different maybe?
return; return;
} }
@ -741,8 +738,10 @@ class ObjectImportCommand extends Command {
if(!$this->option("testrun")) { if(!$this->option("testrun")) {
if($consumable->save()) { if($consumable->save()) {
$this->log("Consumable " . $item["item_name"] . ' was created'); $this->log("Consumable " . $item["item_name"] . ' was created');
$this->comment("Consumable " . $item["item_name"] . ' was created');
} else { } else {
$this->log('Something went wrong! Consumable ' . $item["item_name"] . ' not created'); $this->error('Consumable: ' . $consumable->getErrors());
} }
} else { } else {
$this->log('TEST RUN - Consumable ' . $item['item_name'] . ' not created'); $this->log('TEST RUN - Consumable ' . $item['item_name'] . ' not created');
@ -773,7 +772,8 @@ class ObjectImportCommand extends Command {
array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null), array('email_format', null, InputOption::VALUE_REQUIRED, 'The format of the email addresses that should be generated. Options are firstname.lastname, firstname, filastname', null),
array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null), array('username_format', null, InputOption::VALUE_REQUIRED, 'The format of the username that should be generated. Options are firstname.lastname, firstname, filastname, email', null),
array('testrun', null, InputOption::VALUE_NONE, 'If set, will parse and output data without adding to database', null), array('testrun', null, InputOption::VALUE_NONE, 'If set, will parse and output data without adding to database', null),
array('logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to. storage/logs/importer.log by default' ) array('logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to. storage/logs/importer.log by default', storage_path('logs/importer.log') ),
array('item-type', null, InputOption::VALUE_REQUIRED, 'Item Type To import. Valid Options are Asset, Consumable, Or Accessory', 'Asset')
); );
} }