From 8d82674e8fda08cfdcdc346d1105edfe8e170277 Mon Sep 17 00:00:00 2001 From: ramram1515 Date: Fri, 3 Jul 2026 17:00:27 +0800 Subject: [PATCH] fix: remove spatial data cache in MyLiveTrucksController and fix upcoming pickups logic --- app/Http/Controllers/Api/V1/Me/MyLiveTrucksController.php | 8 +++----- .../Controllers/Api/V1/Me/UpcomingPickupsController.php | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/V1/Me/MyLiveTrucksController.php b/app/Http/Controllers/Api/V1/Me/MyLiveTrucksController.php index 2d292cb..635281e 100644 --- a/app/Http/Controllers/Api/V1/Me/MyLiveTrucksController.php +++ b/app/Http/Controllers/Api/V1/Me/MyLiveTrucksController.php @@ -21,11 +21,9 @@ class MyLiveTrucksController extends ApiController public function trucks(Request $request): JsonResponse { $userId = $request->user()->id; - $household = \Illuminate\Support\Facades\Cache::remember("user:{$userId}:household", now()->addMinutes(10), function () use ($userId) { - return Household::with('assignedDropOffPoint') - ->where('head_user_id', $userId) - ->first(); - }); + $household = Household::with('assignedDropOffPoint') + ->where('head_user_id', $userId) + ->first(); if (! $household || ! $household->assigned_drop_off_point_id) { return $this->ok([ diff --git a/app/Http/Controllers/Api/V1/Me/UpcomingPickupsController.php b/app/Http/Controllers/Api/V1/Me/UpcomingPickupsController.php index d5813c5..d6fb710 100644 --- a/app/Http/Controllers/Api/V1/Me/UpcomingPickupsController.php +++ b/app/Http/Controllers/Api/V1/Me/UpcomingPickupsController.php @@ -106,6 +106,8 @@ class UpcomingPickupsController extends ApiController 'drop_off_point' => $household->assignedDropOffPoint ? [ 'id' => $household->assignedDropOffPoint->uuid, 'name' => $household->assignedDropOffPoint->name, + 'lat' => $household->assignedDropOffPoint->coordinates?->latitude, + 'lng' => $household->assignedDropOffPoint->coordinates?->longitude, ] : null, 'pickups' => $pickups, ]);