6176359d1f
Extends NearbyStationsRequest validation to accept `sort=updated` and `sort=brand`. Updates StationController to use match expression with dedicated closures: 'updated' sorts by price_effective_at descending (newest first), 'brand' sorts alphabetically by brand_name, with existing price and distance options.
93 lines
3.5 KiB
PHP
93 lines
3.5 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Api;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Requests\Api\NearbyStationsRequest;
|
|
use App\Http\Resources\Api\StationResource;
|
|
use App\Models\Search;
|
|
use App\Models\Station;
|
|
use App\Services\PostcodeService;
|
|
use Illuminate\Database\Query\JoinClause;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Validation\ValidationException;
|
|
|
|
class StationController extends Controller
|
|
{
|
|
public function __construct(private readonly PostcodeService $postcodeService) {}
|
|
|
|
public function index(NearbyStationsRequest $request): JsonResponse
|
|
{
|
|
if ($request->filled('postcode')) {
|
|
$location = $this->postcodeService->resolve($request->string('postcode')->toString());
|
|
|
|
if ($location === null) {
|
|
throw ValidationException::withMessages(['postcode' => 'Postcode not found.']);
|
|
}
|
|
|
|
$lat = $location->lat;
|
|
$lng = $location->lng;
|
|
} else {
|
|
$lat = (float) $request->input('lat');
|
|
$lng = (float) $request->input('lng');
|
|
}
|
|
$fuelType = $request->fuelType();
|
|
$radius = $request->radius();
|
|
$sort = $request->sort();
|
|
|
|
$all = Station::query()
|
|
->selectRaw(
|
|
'stations.*, spc.price_pence, spc.fuel_type, spc.price_effective_at,
|
|
(6371 * acos(GREATEST(-1.0, LEAST(1.0,
|
|
cos(radians(?)) * cos(radians(lat)) * cos(radians(lng) - radians(?))
|
|
+ sin(radians(?)) * sin(radians(lat))
|
|
)))) AS distance_km',
|
|
[$lat, $lng, $lat],
|
|
)
|
|
->join('station_prices_current as spc', function (JoinClause $join) use ($fuelType): void {
|
|
$join->on('stations.node_id', '=', 'spc.station_id')
|
|
->where('spc.fuel_type', '=', $fuelType->value);
|
|
})
|
|
->where('stations.temporary_closure', false)
|
|
->where('stations.permanent_closure', false)
|
|
->get();
|
|
|
|
$stations = $all
|
|
->filter(fn ($s) => (float) $s->distance_km <= $radius)
|
|
->sortBy(match ($sort) {
|
|
'price' => fn ($s) => (int) $s->price_pence,
|
|
'updated' => fn ($s) => $s->price_effective_at ? -strtotime($s->price_effective_at) : PHP_INT_MAX,
|
|
'brand' => fn ($s) => strtolower((string) $s->brand_name),
|
|
default => fn ($s) => (float) $s->distance_km,
|
|
})
|
|
->values();
|
|
|
|
$prices = $stations->pluck('price_pence');
|
|
|
|
Search::create([
|
|
'lat_bucket' => round($lat, 2),
|
|
'lng_bucket' => round($lng, 2),
|
|
'fuel_type' => $fuelType->value,
|
|
'results_count' => $stations->count(),
|
|
'lowest_pence' => $prices->min(),
|
|
'highest_pence' => $prices->max(),
|
|
'avg_pence' => $prices->isNotEmpty() ? round($prices->avg(), 2) : null,
|
|
'searched_at' => now(),
|
|
'ip_hash' => hash('sha256', $request->ip() ?? ''),
|
|
]);
|
|
|
|
return response()->json([
|
|
'data' => StationResource::collection($stations),
|
|
'meta' => [
|
|
'count' => $stations->count(),
|
|
'fuel_type' => $fuelType->value,
|
|
'radius_km' => $radius,
|
|
'lowest_pence' => $prices->min(),
|
|
'highest_pence' => $prices->max(),
|
|
'cheapest_price_pence' => $prices->min(),
|
|
'avg_pence' => $prices->isNotEmpty() ? round($prices->avg(), 2) : null,
|
|
],
|
|
]);
|
|
}
|
|
}
|