From 54bdcac14ada70209344f755cde71ca8214c219a Mon Sep 17 00:00:00 2001
From: Viktor Barzin <viktorbarzin@meta.com>
Date: Sun, 8 Feb 2026 18:50:13 +0000
Subject: [PATCH] Run alembic migrations on startup, fix User model, add POI
 travel sorting and streaming options

---
 Dockerfile                                |  2 +-
 frontend/src/components/ListView.tsx      | 32 ++++++++++++++++++-----
 frontend/src/services/streamingService.ts |  6 ++++-
 frontend/tsconfig.app.tsbuildinfo         |  2 +-
 models/user.py                            |  2 +-
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 570190e..465d0b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,4 +42,4 @@ ENV PATH="/app/.venv/bin:$PATH"
 COPY . .
 
 EXPOSE 5001
-CMD ["uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "5001"]
+CMD ["sh", "-c", "alembic upgrade head && uvicorn api.app:app --host 0.0.0.0 --port 5001"]
diff --git a/frontend/src/components/ListView.tsx b/frontend/src/components/ListView.tsx
index 790146a..69f8151 100644
--- a/frontend/src/components/ListView.tsx
+++ b/frontend/src/components/ListView.tsx
@@ -3,15 +3,16 @@ import { ArrowUpDown, ArrowUp, ArrowDown } from 'lucide-react';
 import { Virtuoso } from 'react-virtuoso';
 import { Button } from './ui/button';
 import { PropertyCard } from './PropertyCard';
-import type { GeoJSONFeatureCollection, PropertyFeature, PropertyProperties } from '@/types';
+import type { GeoJSONFeatureCollection, PropertyFeature, PropertyProperties, POIDistanceInfo } from '@/types';
 
-type SortField = 'total_price' | 'qmprice' | 'qm' | 'rooms' | 'last_seen';
+type SortField = 'total_price' | 'qmprice' | 'qm' | 'rooms' | 'last_seen' | 'poi_travel';
 type SortOrder = 'asc' | 'desc';
 
 interface ListViewProps {
     listingData: GeoJSONFeatureCollection;
     onPropertyClick?: (property: PropertyProperties, coordinates: [number, number]) => void;
     highlightedPropertyUrl?: string | null;
+    poiMetricSelection?: { poiId: number; travelMode: string } | null;
 }
 
 interface SortConfig {
@@ -19,7 +20,7 @@ interface SortConfig {
     order: SortOrder;
 }
 
-const SORT_OPTIONS: { field: SortField; label: string }[] = [
+const BASE_SORT_OPTIONS: { field: SortField; label: string }[] = [
     { field: 'total_price', label: 'Price' },
     { field: 'qmprice', label: '£/m²' },
     { field: 'qm', label: 'Size' },
@@ -27,7 +28,7 @@ const SORT_OPTIONS: { field: SortField; label: string }[] = [
     { field: 'last_seen', label: 'Last Seen' },
 ];
 
-export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl }: ListViewProps) {
+export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl, poiMetricSelection }: ListViewProps) {
     const [sortConfig, setSortConfig] = useState<SortConfig>({ field: 'qmprice', order: 'asc' });
 
     // Calculate average price per sqm for "good deal" indicator
@@ -40,6 +41,13 @@ export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl
             : 0;
     }, [listingData]);
 
+    const sortOptions = useMemo(() => {
+        if (poiMetricSelection) {
+            return [...BASE_SORT_OPTIONS, { field: 'poi_travel' as SortField, label: 'Travel' }];
+        }
+        return BASE_SORT_OPTIONS;
+    }, [poiMetricSelection]);
+
     // Sort features
     const sortedFeatures = useMemo(() => {
         const features = [...listingData.features];
@@ -69,6 +77,18 @@ export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl
                     aValue = new Date(a.properties.last_seen).getTime();
                     bValue = new Date(b.properties.last_seen).getTime();
                     break;
+                case 'poi_travel': {
+                    const getTravel = (f: PropertyFeature): number => {
+                        if (!poiMetricSelection) return Infinity;
+                        const match = f.properties.poi_distances?.find(
+                            (d: POIDistanceInfo) => d.poi_id === poiMetricSelection.poiId && d.travel_mode === poiMetricSelection.travelMode,
+                        );
+                        return match?.duration_seconds ?? Infinity;
+                    };
+                    aValue = getTravel(a);
+                    bValue = getTravel(b);
+                    break;
+                }
                 default:
                     return 0;
             }
@@ -80,7 +100,7 @@ export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl
         });
 
         return features;
-    }, [listingData.features, sortConfig]);
+    }, [listingData.features, sortConfig, poiMetricSelection]);
 
     const handleSort = (field: SortField) => {
         setSortConfig((prev) => ({
@@ -109,7 +129,7 @@ export function ListView({ listingData, onPropertyClick, highlightedPropertyUrl
             {/* Sort controls */}
             <div className="flex items-center gap-1 p-2 border-b overflow-x-auto">
                 <span className="text-xs text-muted-foreground mr-1 shrink-0">Sort:</span>
-                {SORT_OPTIONS.map((option) => (
+                {sortOptions.map((option) => (
                     <Button
                         key={option.field}
                         variant={sortConfig.field === option.field ? 'secondary' : 'ghost'}
diff --git a/frontend/src/services/streamingService.ts b/frontend/src/services/streamingService.ts
index 2da291c..337054b 100644
--- a/frontend/src/services/streamingService.ts
+++ b/frontend/src/services/streamingService.ts
@@ -67,9 +67,13 @@ export interface StreamingProgress {
 export async function* streamListingGeoJSON(
   user: AuthUser,
   parameters: ParameterValues,
-  onProgress?: (progress: StreamingProgress) => void
+  onProgress?: (progress: StreamingProgress) => void,
+  options?: { includePoiDistances?: boolean },
 ): AsyncGenerator<PropertyFeature[], void, unknown> {
   const params = buildListingParams(parameters);
+  if (options?.includePoiDistances) {
+    params.include_poi_distances = 'true';
+  }
   const queryString = buildQueryString(params);
   const url = queryString
     ? `${API_ENDPOINTS.LISTING_GEOJSON_STREAM}?${queryString}`
diff --git a/frontend/tsconfig.app.tsbuildinfo b/frontend/tsconfig.app.tsbuildinfo
index 3b48792..57eac88 100644
--- a/frontend/tsconfig.app.tsbuildinfo
+++ b/frontend/tsconfig.app.tsbuildinfo
@@ -1 +1 @@
-{"root":["./src/app.tsx","./src/appsidebar.tsx","./src/main.tsx","./src/vite-env.d.ts","./src/auth/authservice.ts","./src/auth/config.ts","./src/auth/errors.ts","./src/auth/passkeyservice.ts","./src/auth/types.ts","./src/components/activequery.tsx","./src/components/alerterror.tsx","./src/components/authcallback.tsx","./src/components/filterpanel.tsx","./src/components/header.tsx","./src/components/healthindicator.tsx","./src/components/listview.tsx","./src/components/loginmodal.tsx","./src/components/map.tsx","./src/components/parameters.tsx","./src/components/propertycard.tsx","./src/components/spinner.tsx","./src/components/statsbar.tsx","./src/components/streamingprogressbar.tsx","./src/components/taskindicator.tsx","./src/components/taskprogressdrawer.tsx","./src/components/ui/datepicker.tsx","./src/components/ui/accordion.tsx","./src/components/ui/alert-dialog.tsx","./src/components/ui/breadcrumb.tsx","./src/components/ui/button.tsx","./src/components/ui/calendar.tsx","./src/components/ui/checkbox.tsx","./src/components/ui/dialog.tsx","./src/components/ui/form.tsx","./src/components/ui/hover-card.tsx","./src/components/ui/input.tsx","./src/components/ui/label.tsx","./src/components/ui/popover.tsx","./src/components/ui/progress.tsx","./src/components/ui/scroll-area.tsx","./src/components/ui/select.tsx","./src/components/ui/separator.tsx","./src/components/ui/sheet.tsx","./src/components/ui/sidebar.tsx","./src/components/ui/skeleton.tsx","./src/components/ui/slider.tsx","./src/components/ui/tabs.tsx","./src/components/ui/tooltip.tsx","./src/constants/colorschemes.ts","./src/constants/index.ts","./src/hooks/use-mobile.ts","./src/lib/utils.ts","./src/services/apiclient.ts","./src/services/healthservice.ts","./src/services/index.ts","./src/services/listingservice.ts","./src/services/streamingservice.ts","./src/services/taskservice.ts","./src/types/index.ts","./src/utils/maputils.ts"],"version":"5.8.3"}
\ No newline at end of file
+{"root":["./src/app.tsx","./src/appsidebar.tsx","./src/main.tsx","./src/vite-env.d.ts","./src/auth/authservice.ts","./src/auth/config.ts","./src/auth/errors.ts","./src/auth/passkeyservice.ts","./src/auth/types.ts","./src/components/activequery.tsx","./src/components/alerterror.tsx","./src/components/authcallback.tsx","./src/components/filterpanel.tsx","./src/components/header.tsx","./src/components/healthindicator.tsx","./src/components/listview.tsx","./src/components/loginmodal.tsx","./src/components/map.tsx","./src/components/poimanager.tsx","./src/components/propertycard.tsx","./src/components/spinner.tsx","./src/components/statsbar.tsx","./src/components/streamingprogressbar.tsx","./src/components/taskindicator.tsx","./src/components/taskprogressdrawer.tsx","./src/components/visualizationcard.tsx","./src/components/ui/datepicker.tsx","./src/components/ui/accordion.tsx","./src/components/ui/alert-dialog.tsx","./src/components/ui/breadcrumb.tsx","./src/components/ui/button.tsx","./src/components/ui/calendar.tsx","./src/components/ui/checkbox.tsx","./src/components/ui/dialog.tsx","./src/components/ui/form.tsx","./src/components/ui/hover-card.tsx","./src/components/ui/input.tsx","./src/components/ui/label.tsx","./src/components/ui/popover.tsx","./src/components/ui/progress.tsx","./src/components/ui/range-slider-field.tsx","./src/components/ui/scroll-area.tsx","./src/components/ui/select.tsx","./src/components/ui/separator.tsx","./src/components/ui/sheet.tsx","./src/components/ui/sidebar.tsx","./src/components/ui/skeleton.tsx","./src/components/ui/slider.tsx","./src/components/ui/tabs.tsx","./src/components/ui/tooltip.tsx","./src/constants/colorschemes.ts","./src/constants/index.ts","./src/hooks/use-mobile.ts","./src/lib/utils.ts","./src/services/apiclient.ts","./src/services/healthservice.ts","./src/services/index.ts","./src/services/listingservice.ts","./src/services/poiservice.ts","./src/services/streamingservice.ts","./src/services/taskservice.ts","./src/types/index.ts","./src/utils/maputils.ts","./src/utils/poiutils.ts"],"version":"5.8.3"}
\ No newline at end of file
diff --git a/models/user.py b/models/user.py
index 278e91d..91ff797 100644
--- a/models/user.py
+++ b/models/user.py
@@ -5,7 +5,7 @@ from sqlmodel import SQLModel, Field
 
 
 class User(SQLModel, table=True):
-    id: int = Field(primary_key=True)
+    id: int | None = Field(default=None, primary_key=True)
     email: EmailStr = Field(index=True, unique=True)
     password: str | None = Field(default=None, nullable=True)
     created_at: datetime = Field(default_factory=datetime.utcnow)