Skip to content

A free open source IT asset/license management system

Improve output

Marcus Mooreeff2920cb5a6
diff --git a/app/Actions/Acceptances/RegenerateAcceptancesAction.php b/app/Actions/Acceptances/RegenerateAcceptancesAction.php
index a23a86e699..cb1fa9a4f2 100644
--- a/app/Actions/Acceptances/RegenerateAcceptancesAction.php
+++ b/app/Actions/Acceptances/RegenerateAcceptancesAction.php
@@ -345,9 +345,11 @@ class RegenerateAcceptancesAction
$result->sendCountsByType[$type] = ($result->sendCountsByType[$type] ?? 0) + 1;
$result->reportRows[] = [
+ $pair['user']->getKey(),
$pair['user']->present()->fullName,
$pair['item']->present()->name,
$type,
+ $pair['item']->getKey(),
$pair['units'],
$pair['qty'],
];
diff --git a/app/Actions/Acceptances/RegenerateAcceptancesResult.php b/app/Actions/Acceptances/RegenerateAcceptancesResult.php
index 3fc9943d23..069cbf7122 100644
--- a/app/Actions/Acceptances/RegenerateAcceptancesResult.php
+++ b/app/Actions/Acceptances/RegenerateAcceptancesResult.php
@@ -42,7 +42,7 @@ class RegenerateAcceptancesResult
* The rows this run re-requested, in the order the builders found them. Under a dry
* run they are the rows it would have created.
*
- * @var array<int, array{0: string, 1: string, 2: string, 3: int, 4: int}>
+ * @var array<int, array{0: int, 1: string, 2: string, 3: string, 4: int, 5: int, 6: int}>
*/
public array $reportRows = [];
diff --git a/app/Console/Commands/RegenerateAcceptances.php b/app/Console/Commands/RegenerateAcceptances.php
index 5bf316cccc..939c0a3c67 100644
--- a/app/Console/Commands/RegenerateAcceptances.php
+++ b/app/Console/Commands/RegenerateAcceptances.php
@@ -323,7 +323,7 @@ class RegenerateAcceptances extends Command
}
if ($result->reportRows !== []) {
- $this->table(['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'], $result->reportRows);
+ $this->table(['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'], $result->reportRows);
}
$this->info('To re-request: '.count($result->reportRows).'.');
diff --git a/tests/Feature/Console/RegenerateAcceptancesTest.php b/tests/Feature/Console/RegenerateAcceptancesTest.php
index a1634738f0..83e6fe3601 100644
--- a/tests/Feature/Console/RegenerateAcceptancesTest.php
+++ b/tests/Feature/Console/RegenerateAcceptancesTest.php
@@ -34,8 +34,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $asset->present()->name, 'Asset', 1, 1]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $asset->present()->name, 'Asset', $asset->id, 1, 1]],
)
->assertExitCode(0);
}
@@ -122,8 +122,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $asset->present()->name, 'Asset', 1, 1]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $asset->present()->name, 'Asset', $asset->id, 1, 1]],
)
->assertExitCode(0);
}
@@ -228,8 +228,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $accessory->present()->name, 'Accessory', 2, 2]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $accessory->present()->name, 'Accessory', $accessory->id, 2, 2]],
)
->assertExitCode(0);
}
@@ -270,8 +270,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $consumable->present()->name, 'Consumable', 2, 2]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $consumable->present()->name, 'Consumable', $consumable->id, 2, 2]],
)
->assertExitCode(0);
}
@@ -289,11 +289,11 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
[
- [$holder->present()->fullName, $laptop->present()->name, 'Asset', 1, 1],
- [$holder->present()->fullName, $desktop->present()->name, 'Asset', 1, 1],
- [$holder->present()->fullName, $component->present()->name, 'Component', 6, 6],
+ [$holder->id, $holder->present()->fullName, $laptop->present()->name, 'Asset', $laptop->id, 1, 1],
+ [$holder->id, $holder->present()->fullName, $desktop->present()->name, 'Asset', $desktop->id, 1, 1],
+ [$holder->id, $holder->present()->fullName, $component->present()->name, 'Component', $component->id, 6, 6],
],
)
->assertExitCode(0);
@@ -711,8 +711,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $accessory->present()->name, 'Accessory', 3, 2]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $accessory->present()->name, 'Accessory', $accessory->id, 3, 2]],
)
->assertExitCode(0);
@@ -744,8 +744,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $accessory->present()->name, 'Accessory', 2, 1]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $accessory->present()->name, 'Accessory', $accessory->id, 2, 1]],
)
->assertExitCode(0);
}
@@ -766,8 +766,8 @@ class RegenerateAcceptancesTest extends TestCase
$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true])
->expectsTable(
- ['User', 'Item', 'Type', 'Units currently held', 'Units to re-request'],
- [[$holder->present()->fullName, $accessory->present()->name, 'Accessory', 1, 1]],
+ ['User ID', 'User', 'Item', 'Item Type', 'Item ID', 'Units currently held', 'Units to re-request'],
+ [[$holder->id, $holder->present()->fullName, $accessory->present()->name, 'Accessory', $accessory->id, 1, 1]],
)
->assertExitCode(0);
}