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

fix deprecation on asset obs get unaccept report to populate

Browse Source
This commit is contained in:
Godfrey M
2025-01-06 11:26:45 -08:00
parent 331fbb66bd
commit bb03e00279
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/Http/Controllers/ReportsController.php
View File

@ -1093,30 +1093,43 @@ class ReportsController extends Controller
$this->authorize('reports.view');
$showDeleted = $deleted == 'deleted';
/**
* Get all assets with pending checkout acceptances
*/
if($showDeleted) {
$acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
$assetsForReport = collect();
$query = CheckoutAcceptance::pending()
->where('checkoutable_type', 'App\Models\Asset')
->with(['checkoutable.assignedTo', 'checkoutable.model']); // Eager load common relationships
if ($showDeleted) {
$query->withTrashed()->with(['assignedTo']);
} else {
$acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo' => function ($query) {
$query->with(['assignedTo' => function ($query) {
$query->withTrashed();
}, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
}]);
}
$assetsForReport = $acceptances
->filter(function ($acceptance) {
// Process records in chunks
$query->chunk(100, function ($chunk) use (&$assetsForReport) {
$filtered = $chunk->filter(function ($acceptance) {
$acceptance_checkoutable_flag = false;
if ($acceptance->checkoutable){
$acceptance_checkoutable_flag = $acceptance->checkoutable->checkedOutToUser();
if($acceptance->checkoutable) {
$acceptance_checkoutable_flag = $acceptance->assignedTo;
}
return $acceptance->checkoutable_type == 'App\Models\Asset' && $acceptance_checkoutable_flag;
})
->map(function($acceptance) {
return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
// Return true if criteria match
return $acceptance->checkoutable_type === 'App\Models\Asset' && $acceptance_checkoutable_flag;
})->map(function ($acceptance) {
return [
'assetItem' => $acceptance->checkoutable,
'acceptance' => $acceptance,
];
});
// Merge results into the main collection
$assetsForReport = $assetsForReport->merge($filtered);
});
return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));
}