admin
f552bccd1a
Backend: - New GET /api/v1/me/live/trucks. Returns active trucks whose in-progress trip serves the resident's assigned drop-off point, with the same shape as the admin endpoint. Empty when household has no DOP yet. Frontend (customer-web/): - /codes — paginated list with status filter pills (all / active / allocated / used / expired), one-click activate for allocated codes (in-place state update), inline balance summary + low-balance warning banner with link to partner stores. - /pickups — upcoming-trip cards with status pill, route, scheduled date/time, my stop sequence, driver, truck plate, link to live tracker. Friendly empty states for "no DOP assigned" and "no trips scheduled". - /collections — date-range filtered scan history table (when / serial / drop-off / weight / waste type), shows total scan count. - /tracker — Leaflet map polling /me/live/trucks every 10s. Drop-off pin (verde dot) + truck markers (rotating SVG arrow by heading degrees, 400ms transition between updates). Diff-update logic: reuses markers across polls and removes trucks that vanish. Side list of active trucks with plate, team, speed, last update. Falls back to NCR center when no DOP coords. Leaflet loaded from CDN (kept out of bundle) — no SSR concerns. - Resident nav adds /collections (label "History"). - API client: types LiveTruck + LiveTrucksResponse; me.liveTrucks(). Build: 16 routes, all type-check + lint clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
59 lines
2.1 KiB
PHP
59 lines
2.1 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Api\V1\Me;
|
|
|
|
use App\Http\Controllers\Api\V1\ApiController;
|
|
use App\Models\Household;
|
|
use App\Models\Trip;
|
|
use App\Services\LiveTracking\TruckTracker;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\Request;
|
|
|
|
class MyLiveTrucksController extends ApiController
|
|
{
|
|
public function __construct(private readonly TruckTracker $tracker) {}
|
|
|
|
/**
|
|
* Live truck positions filtered to trucks whose currently-running
|
|
* trip serves the resident's assigned drop-off point. Same shape as
|
|
* the admin endpoint so the frontend can share marker rendering.
|
|
*/
|
|
public function trucks(Request $request): JsonResponse
|
|
{
|
|
$household = Household::with('assignedDropOffPoint')
|
|
->where('head_user_id', $request->user()->id)
|
|
->first();
|
|
|
|
if (! $household || ! $household->assigned_drop_off_point_id) {
|
|
return $this->ok([
|
|
'trucks' => [],
|
|
'as_of' => now()->toIso8601String(),
|
|
'household_assigned' => false,
|
|
]);
|
|
}
|
|
|
|
$relevantTripUuids = Trip::query()
|
|
->whereIn('status', [Trip::STATUS_IN_PROGRESS, Trip::STATUS_AT_DUMPSITE])
|
|
->whereHas('stops', fn ($q) => $q->where('drop_off_point_id', $household->assigned_drop_off_point_id))
|
|
->pluck('uuid')
|
|
->all();
|
|
|
|
$positions = collect($this->tracker->activeTruckPositions())
|
|
->filter(fn ($p) => $p['active_trip_id'] && in_array($p['active_trip_id'], $relevantTripUuids, true))
|
|
->values()
|
|
->all();
|
|
|
|
return $this->ok([
|
|
'trucks' => $positions,
|
|
'as_of' => now()->toIso8601String(),
|
|
'household_assigned' => true,
|
|
'drop_off_point' => [
|
|
'id' => $household->assignedDropOffPoint?->uuid,
|
|
'name' => $household->assignedDropOffPoint?->name,
|
|
'lat' => $household->assignedDropOffPoint?->coordinates?->latitude,
|
|
'lng' => $household->assignedDropOffPoint?->coordinates?->longitude,
|
|
],
|
|
]);
|
|
}
|
|
}
|