@fleetbase/fleetops-engine 0.6.57 → 0.6.59

package/server/src/Http/Controllers/Internal/v1/IssueController.php

@@ -33,7 +33,7 @@ class IssueController extends FleetOpsController
     public function afterSave(Request $request, Issue $issue)
     {
         if ($issue->assigned_to_uuid) {
-            $assignee = User::where('uuid', $issue->assigned_to_uuid)->first();
+            $assignee = $this->findAssignedUser($issue->assigned_to_uuid);
 
             if ($assignee && $assignee->type === 'customer') {
                 $issue->assigned_to_uuid = null;
@@ -48,13 +48,13 @@ class IssueController extends FleetOpsController
 
         $uploads = $request->array('issue.files');
         if ($uploads) {
-            File::whereIn('uuid', $uploads)->get()->each(function (File $file) use ($issue) {
+            $this->filesForUploads($uploads)->each(function (File $file) use ($issue) {
                 $file->setKey($issue);
             });
         }
 
         if (!$issue->order_uuid && data_get($issue, 'meta.order_uuid')) {
-            $order = Order::where('uuid', data_get($issue, 'meta.order_uuid'))->where('company_uuid', $issue->company_uuid)->first();
+            $order = $this->findOrderForIssueMeta(data_get($issue, 'meta.order_uuid'), $issue->company_uuid);
             if ($order) {
                 $issue->order_uuid = $order->uuid;
                 $issue->saveQuietly();
@@ -69,10 +69,10 @@ class IssueController extends FleetOpsController
      */
     public function timeline($id)
     {
-        $issue = Issue::findById($id, ['reporter', 'assignee']);
+        $issue = $this->findIssueForTimeline($id);
 
         if (!$issue || $issue->company_uuid !== session('company')) {
-            return response()->error('Issue not found for this organization.', 404);
+            return $this->errorResponse('Issue not found for this organization.', 404);
         }
 
         $events = collect([$this->makeIssueOpenedEvent($issue)])
@@ -82,16 +82,12 @@ class IssueController extends FleetOpsController
             ->sortByDesc('created_at')
             ->values();
 
-        return response()->json(['events' => $events]);
+        return $this->jsonResponse(['events' => $events]);
     }
 
     protected function issueActivityEvents(Issue $issue): Collection
     {
-        return Activity::with(['causer'])
-            ->where('subject_type', Issue::class)
-            ->where('subject_id', $issue->uuid)
-            ->latest()
-            ->get()
+        return $this->activitiesForIssue($issue)
             ->flatMap(function (Activity $activity) use ($issue) {
                 if ($activity->event === 'created') {
                     return [];
@@ -115,11 +111,7 @@ class IssueController extends FleetOpsController
 
     protected function commentEvents(Issue $issue): Collection
     {
-        return Comment::with(['author'])
-            ->where('subject_type', Issue::class)
-            ->where('subject_uuid', $issue->uuid)
-            ->latest()
-            ->get()
+        return $this->commentsForIssue($issue)
             ->map(function (Comment $comment) {
                 return [
                     'id'               => $comment->uuid,
@@ -140,11 +132,7 @@ class IssueController extends FleetOpsController
 
     protected function fileEvents(Issue $issue): Collection
     {
-        $currentFiles = File::with(['uploader'])
-            ->where('subject_type', Issue::class)
-            ->where('subject_uuid', $issue->uuid)
-            ->latest()
-            ->get()
+        $currentFiles = $this->filesForIssue($issue)
             ->map(function (File $file) {
                 return [
                     'id'               => $file->uuid,
@@ -164,14 +152,7 @@ class IssueController extends FleetOpsController
                 ];
             });
 
-        $fileActivities = Activity::with(['causer'])
-            ->where('subject_type', File::class)
-            ->where(function ($query) use ($issue) {
-                $query->where('properties->attributes->subject_uuid', $issue->uuid)
-                    ->orWhere('properties->old->subject_uuid', $issue->uuid);
-            })
-            ->latest()
-            ->get()
+        $fileActivities = $this->fileActivitiesForIssue($issue)
             ->filter(fn (Activity $activity) => $activity->event === 'deleted')
             ->map(function (Activity $activity) {
                 $fileName = data_get($activity->properties, 'old.original_filename')
@@ -197,6 +178,78 @@ class IssueController extends FleetOpsController
         return $currentFiles->merge($fileActivities);
     }
 
+    // @codeCoverageIgnoreStart
+    // Thin framework/database seams are covered through caller behavior.
+    protected function findAssignedUser(string $uuid): ?User
+    {
+        return User::where('uuid', $uuid)->first();
+    }
+
+    protected function filesForUploads(array $uploads): Collection
+    {
+        return File::whereIn('uuid', $uploads)->get();
+    }
+
+    protected function findOrderForIssueMeta(string $orderUuid, string $companyUuid): ?Order
+    {
+        return Order::where('uuid', $orderUuid)->where('company_uuid', $companyUuid)->first();
+    }
+
+    protected function findIssueForTimeline(string $id): ?Issue
+    {
+        return Issue::findById($id, ['reporter', 'assignee']);
+    }
+
+    protected function activitiesForIssue(Issue $issue): Collection
+    {
+        return Activity::with(['causer'])
+            ->where('subject_type', Issue::class)
+            ->where('subject_id', $issue->uuid)
+            ->latest()
+            ->get();
+    }
+
+    protected function commentsForIssue(Issue $issue): Collection
+    {
+        return Comment::with(['author'])
+            ->where('subject_type', Issue::class)
+            ->where('subject_uuid', $issue->uuid)
+            ->latest()
+            ->get();
+    }
+
+    protected function filesForIssue(Issue $issue): Collection
+    {
+        return File::with(['uploader'])
+            ->where('subject_type', Issue::class)
+            ->where('subject_uuid', $issue->uuid)
+            ->latest()
+            ->get();
+    }
+
+    protected function fileActivitiesForIssue(Issue $issue): Collection
+    {
+        return Activity::with(['causer'])
+            ->where('subject_type', File::class)
+            ->where(function ($query) use ($issue) {
+                $query->where('properties->attributes->subject_uuid', $issue->uuid)
+                    ->orWhere('properties->old->subject_uuid', $issue->uuid);
+            })
+            ->latest()
+            ->get();
+    }
+
+    protected function jsonResponse(array $payload)
+    {
+        return response()->json($payload);
+    }
+
+    protected function errorResponse(string $message, int $status = 400)
+    {
+        return response()->error($message, $status);
+    }
+    // @codeCoverageIgnoreEnd
+
     protected function makeIssueOpenedEvent(Issue $issue): array
     {
         return [

package/server/src/Http/Controllers/Internal/v1/MaintenanceController.php

@@ -33,7 +33,7 @@ class MaintenanceController extends FleetOpsController
         $selections = $request->array('selections');
         $fileName   = trim(Str::slug('maintenances-' . date('Y-m-d-H:i')) . '.' . $format);
 
-        return Excel::download(new MaintenanceExport($selections), $fileName);
+        return $this->downloadExport(new MaintenanceExport($selections), $fileName);
     }
 
     /**
@@ -69,9 +69,7 @@ class MaintenanceController extends FleetOpsController
      */
     public function addLineItem(string $id, Request $request): JsonResponse
     {
-        $maintenance = Maintenance::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->firstOrFail();
+        $maintenance = $this->findMaintenanceForLineItem($id);
 
         $validated = $request->validate([
             'description' => 'required|string|max:255',
@@ -84,11 +82,7 @@ class MaintenanceController extends FleetOpsController
         $maintenance->refresh();
         $this->recalculateCosts($maintenance);
 
-        return response()->json([
-            'status'     => 'ok',
-            'line_items' => $maintenance->line_items,
-            'total_cost' => $maintenance->total_cost,
-        ]);
+        return response()->json($this->lineItemPayload($maintenance));
     }
 
     /**
@@ -97,9 +91,7 @@ class MaintenanceController extends FleetOpsController
      */
     public function updateLineItem(string $id, int $index, Request $request): JsonResponse
     {
-        $maintenance = Maintenance::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->firstOrFail();
+        $maintenance = $this->findMaintenanceForLineItem($id);
 
         $validated = $request->validate([
             'description' => 'required|string|max:255',
@@ -122,11 +114,7 @@ class MaintenanceController extends FleetOpsController
         $maintenance->refresh();
         $this->recalculateCosts($maintenance);
 
-        return response()->json([
-            'status'     => 'ok',
-            'line_items' => $maintenance->line_items,
-            'total_cost' => $maintenance->total_cost,
-        ]);
+        return response()->json($this->lineItemPayload($maintenance));
     }
 
     /**
@@ -135,9 +123,7 @@ class MaintenanceController extends FleetOpsController
      */
     public function removeLineItem(string $id, int $index): JsonResponse
     {
-        $maintenance = Maintenance::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->firstOrFail();
+        $maintenance = $this->findMaintenanceForLineItem($id);
 
         if (!$maintenance->removeLineItem($index)) {
             return response()->json(['error' => 'Line item not found.'], 404);
@@ -146,11 +132,7 @@ class MaintenanceController extends FleetOpsController
         $maintenance->refresh();
         $this->recalculateCosts($maintenance);
 
-        return response()->json([
-            'status'     => 'ok',
-            'line_items' => $maintenance->line_items,
-            'total_cost' => $maintenance->total_cost,
-        ]);
+        return response()->json($this->lineItemPayload($maintenance));
     }
 
     /**
@@ -167,7 +149,7 @@ class MaintenanceController extends FleetOpsController
         foreach ($files as $file) {
             try {
                 $import = new MaintenanceImport();
-                Excel::import($import, $file->path, $disk);
+                $this->importFile($import, $file->path, $disk);
                 $importedCount += $import->imported;
             } catch (\Throwable $e) {
                 return response()->error('Invalid file, unable to process.');
@@ -194,4 +176,30 @@ class MaintenanceController extends FleetOpsController
             'total_cost' => $totalCost,
         ]);
     }
+
+    protected function findMaintenanceForLineItem(string $id): Maintenance
+    {
+        return Maintenance::where('uuid', $id)
+            ->orWhere('public_id', $id)
+            ->firstOrFail();
+    }
+
+    protected function downloadExport(MaintenanceExport $export, string $fileName)
+    {
+        return Excel::download($export, $fileName);
+    }
+
+    protected function importFile(MaintenanceImport $import, string $path, string $disk): void
+    {
+        Excel::import($import, $path, $disk);
+    }
+
+    protected function lineItemPayload(Maintenance $maintenance): array
+    {
+        return [
+            'status'     => 'ok',
+            'line_items' => $maintenance->line_items,
+            'total_cost' => $maintenance->total_cost,
+        ];
+    }
 }

package/server/src/Http/Controllers/Internal/v1/MaintenanceScheduleController.php

@@ -73,9 +73,7 @@ class MaintenanceScheduleController extends FleetOpsController
      */
     public function pause(string $id): JsonResponse
     {
-        $schedule = MaintenanceSchedule::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->firstOrFail();
+        $schedule = $this->findSchedule($id);
 
         $schedule->pause();
 
@@ -92,9 +90,7 @@ class MaintenanceScheduleController extends FleetOpsController
      */
     public function resume(string $id): JsonResponse
     {
-        $schedule = MaintenanceSchedule::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->firstOrFail();
+        $schedule = $this->findSchedule($id);
 
         $schedule->resume();
 
@@ -111,25 +107,8 @@ class MaintenanceScheduleController extends FleetOpsController
      */
     public function trigger(string $id, Request $request): JsonResponse
     {
-        $schedule = MaintenanceSchedule::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->firstOrFail();
-
-        $workOrder = WorkOrder::create([
-            'company_uuid'    => $schedule->company_uuid,
-            'schedule_uuid'   => $schedule->uuid,
-            'subject'         => $schedule->name,
-            'category'        => 'preventive_maintenance',
-            'status'          => 'open',
-            'priority'        => $schedule->default_priority ?? 'normal',
-            'target_type'     => $schedule->subject_type,
-            'target_uuid'     => $schedule->subject_uuid,
-            'assignee_type'   => $schedule->default_assignee_type,
-            'assignee_uuid'   => $schedule->default_assignee_uuid,
-            'instructions'    => $schedule->instructions,
-            'due_at'          => $schedule->next_due_date,
-            'created_by_uuid' => session('user'),
-        ]);
+        $schedule  = $this->findSchedule($id);
+        $workOrder = $this->createWorkOrderFromSchedule($schedule);
 
         return response()->json([
             'status'     => 'ok',
@@ -164,80 +143,93 @@ class MaintenanceScheduleController extends FleetOpsController
         // Fetch all active schedules whose next_due_date is on or before the
         // window end. Schedules that start after the window end can never
         // produce an occurrence inside the window.
-        $schedules = MaintenanceSchedule::withoutGlobalScopes()
-            ->where('status', 'active')
-            ->whereNotNull('next_due_date')
-            ->where('next_due_date', '<=', $windowEnd)
-            ->whereNull('deleted_at')
-            ->with(['subject', 'defaultAssignee'])
-            ->get();
+        $schedules = $this->activeCalendarSchedules($windowEnd);
+
+        $events = $this->calendarEventsForSchedules($schedules, $windowStart, $windowEnd);
+
+        return response()->json(['events' => $events]);
+    }
 
+    protected function calendarEventsForSchedules(iterable $schedules, Carbon $windowStart, Carbon $windowEnd): array
+    {
         $events = [];
 
         foreach ($schedules as $schedule) {
-            $assetName = $schedule->subject?->name
-                ?? $schedule->subject?->display_name
-                ?? $schedule->subject?->public_id
-                ?? 'Unknown Asset';
-
-            $assigneeName = $schedule->defaultAssignee?->name ?? null;
-            $color        = $this->eventColorForPriority($schedule->default_priority);
-
-            $baseEvent = [
-                'id'            => $schedule->public_id,
-                'uuid'          => $schedule->uuid,
-                'title'         => $schedule->name . ' — ' . $assetName,
-                'allDay'        => true,
-                'status'        => $schedule->status,
-                'priority'      => $schedule->default_priority,
-                'type'          => $schedule->type,
-                'subject_name'  => $assetName,
-                'assignee_name' => $assigneeName,
-                'color'         => $color,
-            ];
+            array_push($events, ...$this->calendarEventsForSchedule($schedule, $windowStart, $windowEnd));
+        }
+
+        return $events;
+    }
+
+    protected function calendarEventsForSchedule(object $schedule, Carbon $windowStart, Carbon $windowEnd): array
+    {
+        $baseEvent     = $this->calendarBaseEvent($schedule);
+        $intervalValue = (int) ($schedule->interval_value ?? 0);
+        $intervalUnit  = $schedule->interval_unit ?? null; // days | weeks | months | years
+        $firstDue      = $schedule->next_due_date->copy()->startOfDay();
+
+        if ($intervalValue > 0 && $intervalUnit) {
+            return $this->recurringCalendarEvents($schedule, $baseEvent, $firstDue, $windowStart, $windowEnd, $intervalValue, $intervalUnit);
+        }
+
+        if ($firstDue->between($windowStart, $windowEnd)) {
+            $dateStr = $firstDue->toDateString();
+
+            return [array_merge($baseEvent, [
+                'start' => $dateStr,
+                'end'   => $dateStr,
+            ])];
+        }
+
+        return [];
+    }
+
+    protected function calendarBaseEvent(object $schedule): array
+    {
+        $assetName = $schedule->subject?->name
+            ?? $schedule->subject?->display_name
+            ?? $schedule->subject?->public_id
+            ?? 'Unknown Asset';
+
+        $assigneeName = $schedule->defaultAssignee?->name ?? null;
+
+        return [
+            'id'            => $schedule->public_id,
+            'uuid'          => $schedule->uuid,
+            'title'         => $schedule->name . ' — ' . $assetName,
+            'allDay'        => true,
+            'status'        => $schedule->status,
+            'priority'      => $schedule->default_priority,
+            'type'          => $schedule->type,
+            'subject_name'  => $assetName,
+            'assignee_name' => $assigneeName,
+            'color'         => $this->eventColorForPriority($schedule->default_priority),
+        ];
+    }
 
-            $intervalValue = (int) ($schedule->interval_value ?? 0);
-            $intervalUnit  = $schedule->interval_unit ?? null; // days | weeks | months | years
-            $firstDue      = $schedule->next_due_date->copy()->startOfDay();
-
-            if ($intervalValue > 0 && $intervalUnit) {
-                // --- Recurring schedule: expand all occurrences in the window ---
-                //
-                // Walk forward from next_due_date in steps of (interval_value interval_unit)
-                // and emit an event for every occurrence that falls inside [windowStart, windowEnd].
-                // We cap at 500 occurrences as a safety guard.
-                $occurrence     = $firstDue->copy();
-                $count          = 0;
-                $maxOccurrences = 500;
-
-                while ($occurrence->lte($windowEnd) && $count < $maxOccurrences) {
-                    if ($occurrence->gte($windowStart)) {
-                        $dateStr  = $occurrence->toDateString();
-                        $events[] = array_merge($baseEvent, [
-                            // Keep id as the plain public_id so the click
-                            // handler can navigate to the schedule details.
-                            'id'              => $schedule->public_id,
-                            'start'           => $dateStr,
-                            'end'             => $dateStr,
-                            'occurrence_date' => $dateStr,
-                        ]);
-                    }
-                    $occurrence->add($intervalValue . ' ' . $intervalUnit);
-                    $count++;
-                }
-            } else {
-                // --- One-off schedule: emit only if it falls in the window ---
-                if ($firstDue->between($windowStart, $windowEnd)) {
-                    $dateStr  = $firstDue->toDateString();
-                    $events[] = array_merge($baseEvent, [
-                        'start' => $dateStr,
-                        'end'   => $dateStr,
-                    ]);
-                }
+    protected function recurringCalendarEvents(object $schedule, array $baseEvent, Carbon $firstDue, Carbon $windowStart, Carbon $windowEnd, int $intervalValue, string $intervalUnit): array
+    {
+        $events         = [];
+        $occurrence     = $firstDue->copy();
+        $count          = 0;
+        $maxOccurrences = 500;
+
+        while ($occurrence->lte($windowEnd) && $count < $maxOccurrences) {
+            if ($occurrence->gte($windowStart)) {
+                $dateStr  = $occurrence->toDateString();
+                $events[] = array_merge($baseEvent, [
+                    // Keep id as the plain public_id so the click handler can navigate to the schedule details.
+                    'id'              => $schedule->public_id,
+                    'start'           => $dateStr,
+                    'end'             => $dateStr,
+                    'occurrence_date' => $dateStr,
+                ]);
             }
+            $occurrence->add($intervalValue . ' ' . $intervalUnit);
+            $count++;
         }
 
-        return response()->json(['events' => $events]);
+        return $events;
     }
 
     /**
@@ -247,10 +239,7 @@ class MaintenanceScheduleController extends FleetOpsController
      */
     public function ical(string $id): Response
     {
-        $schedule = MaintenanceSchedule::where('uuid', $id)
-            ->orWhere('public_id', $id)
-            ->with(['subject', 'defaultAssignee'])
-            ->firstOrFail();
+        $schedule = $this->findScheduleWithRelations($id, ['subject', 'defaultAssignee']);
 
         $assetName = $schedule->subject?->name
             ?? $schedule->subject?->display_name
@@ -300,16 +289,71 @@ class MaintenanceScheduleController extends FleetOpsController
 
         $filename = 'maintenance-' . $schedule->public_id . '.ics';
 
-        return response($calendar->get(), 200, [
+        return $this->icalResponse($calendar->get(), [
             'Content-Type'        => 'text/calendar; charset=utf-8',
             'Content-Disposition' => 'attachment; filename="' . $filename . '"',
         ]);
     }
 
+    protected function findSchedule(string $id): MaintenanceSchedule
+    {
+        return MaintenanceSchedule::where('uuid', $id)
+            ->orWhere('public_id', $id)
+            ->firstOrFail();
+    }
+
+    protected function findScheduleWithRelations(string $id, array $relations): MaintenanceSchedule
+    {
+        return MaintenanceSchedule::where('uuid', $id)
+            ->orWhere('public_id', $id)
+            ->with($relations)
+            ->firstOrFail();
+    }
+
+    protected function activeCalendarSchedules(Carbon $windowEnd): iterable
+    {
+        return MaintenanceSchedule::withoutGlobalScopes()
+            ->where('status', 'active')
+            ->whereNotNull('next_due_date')
+            ->where('next_due_date', '<=', $windowEnd)
+            ->whereNull('deleted_at')
+            ->with(['subject', 'defaultAssignee'])
+            ->get();
+    }
+
+    protected function createWorkOrderFromSchedule(MaintenanceSchedule $schedule): WorkOrder
+    {
+        return WorkOrder::create([
+            'company_uuid'    => $schedule->company_uuid,
+            'schedule_uuid'   => $schedule->uuid,
+            'subject'         => $schedule->name,
+            'category'        => 'preventive_maintenance',
+            'status'          => 'open',
+            'priority'        => $schedule->default_priority ?? 'normal',
+            'target_type'     => $schedule->subject_type,
+            'target_uuid'     => $schedule->subject_uuid,
+            'assignee_type'   => $schedule->default_assignee_type,
+            'assignee_uuid'   => $schedule->default_assignee_uuid,
+            'instructions'    => $schedule->instructions,
+            'due_at'          => $schedule->next_due_date,
+            'created_by_uuid' => $this->sessionUserUuid(),
+        ]);
+    }
+
+    protected function sessionUserUuid(): ?string
+    {
+        return session('user');
+    }
+
+    protected function icalResponse(string $content, array $headers): Response
+    {
+        return response($content, 200, $headers);
+    }
+
     /**
      * Map a priority string to a FullCalendar-compatible hex colour.
      */
-    private function eventColorForPriority(?string $priority): string
+    protected function eventColorForPriority(?string $priority): string
     {
         return match ($priority) {
             'critical'  => '#ef4444',

package/server/src/Http/Controllers/Internal/v1/ManifestController.php

@@ -32,8 +32,7 @@ class ManifestController extends Controller
     public function index(Request $request): JsonResponse
     {
         $companyUuid = session('company');
-        $query       = Manifest::forCompany($companyUuid)
-            ->with(['driver', 'vehicle', 'stops.place', 'stops.order.trackingNumber']);
+        $query       = $this->manifestQueryForCompany($companyUuid);
 
         if ($request->filled('status')) {
             $query->where('status', $request->input('status'));
@@ -60,8 +59,8 @@ class ManifestController extends Controller
      */
     public function show(string $id): JsonResponse
     {
-        $manifest = Manifest::where('public_id', $id)
-            ->with(['driver', 'vehicle', 'stops' => fn ($q) => $q->orderBy('sequence')->with(['place', 'order.trackingNumber', 'order.payload.dropoff'])])
+        $manifest = $this->manifestQueryByPublicId($id)
+            ->with($this->manifestShowRelations())
             ->firstOrFail();
 
         return response()->json(['manifest' => $manifest]);
@@ -74,7 +73,7 @@ class ManifestController extends Controller
      */
     public function cancel(string $id): JsonResponse
     {
-        $manifest = Manifest::where('public_id', $id)->firstOrFail();
+        $manifest = $this->manifestQueryByPublicId($id)->firstOrFail();
         $manifest->cancel();
 
         return response()->json(['status' => 'cancelled', 'manifest' => $manifest]);
@@ -87,7 +86,7 @@ class ManifestController extends Controller
      */
     public function destroy(string $id): JsonResponse
     {
-        $manifest = Manifest::where('public_id', $id)->firstOrFail();
+        $manifest = $this->manifestQueryByPublicId($id)->firstOrFail();
         $manifest->delete();
 
         return response()->json(['deleted' => true]);
@@ -100,7 +99,7 @@ class ManifestController extends Controller
      */
     public function showStop(string $id): JsonResponse
     {
-        $stop = ManifestStop::where('public_id', $id)
+        $stop = $this->manifestStopQueryByPublicId($id)
             ->with(['place', 'order.trackingNumber', 'order.payload.dropoff', 'waypoint'])
             ->firstOrFail();
 
@@ -116,7 +115,7 @@ class ManifestController extends Controller
      */
     public function updateStop(Request $request, string $id): JsonResponse
     {
-        $stop = ManifestStop::where('public_id', $id)->firstOrFail();
+        $stop = $this->manifestStopQueryByPublicId($id)->firstOrFail();
 
         $allowed = ['status', 'sequence', 'actual_arrival', 'meta'];
         $data    = $request->only($allowed);
@@ -135,4 +134,25 @@ class ManifestController extends Controller
 
         return response()->json(['stop' => $stop->fresh(['place', 'order.trackingNumber'])]);
     }
+
+    protected function manifestQueryForCompany(?string $companyUuid)
+    {
+        return Manifest::forCompany($companyUuid)
+            ->with(['driver', 'vehicle', 'stops.place', 'stops.order.trackingNumber']);
+    }
+
+    protected function manifestQueryByPublicId(string $id)
+    {
+        return Manifest::where('public_id', $id);
+    }
+
+    protected function manifestStopQueryByPublicId(string $id)
+    {
+        return ManifestStop::where('public_id', $id);
+    }
+
+    protected function manifestShowRelations(): array
+    {
+        return ['driver', 'vehicle', 'stops' => fn ($q) => $q->orderBy('sequence')->with(['place', 'order.trackingNumber', 'order.payload.dropoff'])];
+    }
 }