Merge pull request #112 from tristanbudd/fix-deploy

Fix deploy error

Author: tristanbudd

.github/workflows/ci.yml

@@ -18,13 +18,11 @@ jobs:
 
             - name: Setup pnpm
               uses: pnpm/action-setup@v4
-              with:
-                  version: 9
 
             - name: Setup Node.js
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: pnpm
 
             - name: Install dependencies

Dockerfile

@@ -3,7 +3,7 @@ WORKDIR /app
 COPY composer.json composer.lock ./
 RUN composer install --no-dev --prefer-dist --no-interaction --no-scripts --optimize-autoloader
 
-FROM node:20-alpine AS frontend_build
+FROM node:22-alpine AS frontend_build
 WORKDIR /app
 COPY package.json pnpm-lock.yaml ./
 RUN corepack enable && pnpm install --frozen-lockfile

app/Http/Controllers/Api/VesselController.php

@@ -495,7 +495,7 @@ public function sanctionedList(Request $request): JsonResponse
         $search = strtolower($request->input('search', ''));
         $limit = min((int) $request->input('limit', 100), 500);
 
-        $sanctioned = [];
+        $sanctionedData = [];
         $count = 0;
 
         foreach ($vessels as $vessel) {
@@ -505,6 +505,34 @@ public function sanctionedList(Request $request): JsonResponse
                 continue;
             }
 
+            $sanctionedData[] = $vessel;
+
+            $count++;
+            if ($count >= $limit) {
+                break;
+            }
+        }
+
+        if (empty($sanctionedData)) {
+            return response()->json([
+                'message' => 'No sanctioned vessels found in the current records.',
+            ], 404);
+        }
+
+        // Pre-fetch local vessel data to cross-reference ONLY for the limited result set
+        $mmsis = collect($sanctionedData)->pluck('mmsi')->filter()->toArray();
+        $imos = collect($sanctionedData)->pluck('imo')->filter()->toArray();
+
+        $localVessels = Vessel::whereIn('mmsi', $mmsis)
+            ->orWhereIn('imo', $imos)
+            ->get(['mmsi', 'imo', 'last_seen_at']);
+
+        $localByMmsi = $localVessels->whereNotNull('mmsi')->keyBy('mmsi');
+        $localByImo = $localVessels->whereNotNull('imo')->keyBy('imo');
+
+        $sanctioned = [];
+        foreach ($sanctionedData as $vessel) {
+            $name = $vessel['name'] ?? '';
             $sanctioners = $vessel['sanctioners'] ?? [];
             $sanctions_count = is_array($sanctioners) ? count($sanctioners) : 0;
 
@@ -515,32 +543,33 @@ public function sanctionedList(Request $request): JsonResponse
                 $risk_level = 'low';
             }
 
+            $mmsi = isset($vessel['mmsi']) ? (int) $vessel['mmsi'] : null;
+            $imo = isset($vessel['imo']) ? (int) $vessel['imo'] : null;
+
+            $localMatch = null;
+            if ($mmsi && isset($localByMmsi[$mmsi])) {
+                $localMatch = $localByMmsi[$mmsi];
+            } elseif ($imo && isset($localByImo[$imo])) {
+                $localMatch = $localByImo[$imo];
+            }
+
             // Using fleetleaks data to construct standardized response
             $sanctioned[] = [
                 'id' => $vessel['id'] ?? null,
-                'mmsi' => isset($vessel['mmsi']) ? (int) $vessel['mmsi'] : (int) ($vessel['imo'] ?? 0), // fallback for matching
-                'imo' => isset($vessel['imo']) ? (int) $vessel['imo'] : null,
+                'mmsi' => $mmsi ?: (int) ($vessel['imo'] ?? 0), // fallback for matching
+                'imo' => $imo,
                 'name' => $name,
                 'lat' => (float) ($vessel['latitude'] ?? 0),
                 'lng' => (float) ($vessel['longitude'] ?? 0),
                 'course' => (float) ($vessel['course_degrees'] ?? 0),
-                'last_seen_at' => $vessel['location_last_updated'] ?? now()->toIso8601String(),
+                'last_seen_at' => $vessel['location_last_updated'] ?? null,
+                'sist_last_seen_at' => $localMatch ? $localMatch->last_seen_at?->toIso8601String() : null,
+                'in_sist' => ! is_null($localMatch),
                 'is_sanctioned' => true,
                 'risk_level' => $risk_level,
                 'sanctions_count' => $sanctions_count,
                 'sanctioners' => $sanctioners,
             ];
-
-            $count++;
-            if ($count >= $limit) {
-                break;
-            }
-        }
-
-        if (empty($sanctioned)) {
-            return response()->json([
-                'message' => 'No sanctioned vessels found in the current records.',
-            ], 404);
         }
 
         return response()->json(['data' => $sanctioned]);

package.json

@@ -7,6 +7,7 @@
     "license": "MIT",
     "private": true,
     "type": "module",
+    "packageManager": "pnpm@10.30.3",
     "repository": {
         "type": "git",
         "url": "https://github.com/tristanbudd/sist.git"