Skip to content

Apply fixes from StyleCI #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
murrant wants to merge 2 commits into from
Closed

Apply fixes from StyleCI #446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaa7937
Fix location count sorting and improve queries
murrant Dec 2, 2025
4e3a9ae
Apply fixes from StyleCI
StyleCIBot Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 11 additions & 30 deletions app/Http/Controllers/Table/LocationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@

protected function sortFields($request)
{
return ['location', 'devices', 'down'];
return [
'location',
'devices' => 'devices_count',
'down' => 'down_count',
];
}

/**
Expand All @@ -55,19 +59,10 @@
*/
public function baseQuery($request)
{
// joins are needed for device count sorts
$sort = $request->get('sort');
$key = key($sort);
$join = $this->getJoinQuery($key);

if ($join) {
return Location::hasAccess($request->user())
->select(['id', 'location', 'lat', 'lng', \DB::raw("COUNT(device_id) AS `$key`")])
->leftJoin('devices', $join)
->groupBy(['id', 'location', 'lat', 'lng']);
}

return Location::hasAccess($request->user());
return Location::hasAccess($request->user())->withCount([
'devices',
'devices as down_count' => fn ($q) => (new Device)->scopeIsDown($q),
]);
}

/**
Expand All @@ -81,22 +76,8 @@
'location' => htmlspecialchars((string) $location->location),
'lat' => $location->lat,
'lng' => $location->lng,
'down' => $location->devices()->isDown()->count(),
'devices' => $location->devices()->count(),
'devices' => $location->devices_count,
'down' => $location->down_count,

Check failure on line 80 in app/Http/Controllers/Table/LocationController.php

View workflow job for this annotation

GitHub Actions / PHP Static Analysis 

Access to an undefined property App\Models\Location::$down_count.
];
}

private function getJoinQuery($field)
{
return match ($field) {
'devices' => function ($query): void {
$query->on('devices.location_id', 'locations.id');
},
'down' => function ($query): void {
$query->on('devices.location_id', 'locations.id');
(new Device)->scopeIsDown($query);
},
default => null,
};
}
}
Loading