mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-08-18 11:15:42 +00:00
Code Issues Projects Releases Wiki Activity

Handle soft deletes

Browse Source
This commit is contained in:
Marcus Moore
2026-05-11 16:36:44 -07:00
parent 2404dfb83b
commit fff50044f8
2 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Reports/CustomComponentReportController.php
View File

@ -101,6 +101,14 @@ class CustomComponentReportController extends Controller
'last_updated' => 'updated_at',
]);
if ($request->input('deleted_components') === 'include_deleted') {
$query->withTrashed();
}
if ($request->input('deleted_components') === 'only_deleted') {
$query->onlyTrashed();
}
$query->orderBy('components.id', 'ASC')->chunk(500, function ($components) use ($handle, $request) {
Log::debug('Walking results: '.$this->getExecutionTime());

45
tests/Feature/Reporting/Custom/CustomComponentReportTest.php
View File

@ -472,24 +472,49 @@ class CustomComponentReportTest extends TestCase
->assertDontSeeTextInStreamedResponse('Component B');
}
public function test_limiting_by_excluding_deleted_components()
public function test_excluding_deleted_components()
{
$this->markTestIncomplete();
Component::factory()->create(['name' => 'Deleted Component', 'deleted_at' => now()]);
Component::factory()->create(['name' => 'Active Component']);
$this->sendRequest([
'component_name' => '1',
'deleted_components' => 'exclude_deleted',
])
->assertOk()
->assertCsvHeader()
->assertSeeTextInStreamedResponse('Active Component')
->assertDontSeeTextInStreamedResponse('Deleted Component');
}
public function test_limiting_by_including_deleted_components()
public function test_including_deleted_components()
{
$this->markTestIncomplete();
Component::factory()->create(['name' => 'Deleted Component', 'deleted_at' => now()]);
Component::factory()->create(['name' => 'Active Component']);
$this->sendRequest([
'component_name' => '1',
'deleted_components' => 'include_deleted',
])
->assertOk()
->assertCsvHeader()
->assertSeeTextInStreamedResponse('Active Component')
->assertSeeTextInStreamedResponse('Deleted Component');
}
public function test_limiting_by_only_deleted_components()
public function test_including_only_deleted_components()
{
$this->markTestIncomplete();
}
Component::factory()->create(['name' => 'Deleted Component', 'deleted_at' => now()]);
Component::factory()->create(['name' => 'Active Component']);
public function test_custom_component_report_exclude_deleted()
{
$this->markTestIncomplete();
$this->sendRequest([
'component_name' => '1',
'deleted_components' => 'only_deleted',
])
->assertOk()
->assertCsvHeader()
->assertDontSeeTextInStreamedResponse('Active Component')
->assertSeeTextInStreamedResponse('Deleted Component');
}
public function test_custom_component_report_adheres_to_company_scoping()