deploy: ban fields on Positions

backend/models.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from typing import Optional, List, Union
+from typing import Optional, List, Union, Any
 
 
 class CategoryBase(BaseModel):
@@ -93,6 +93,8 @@ class Street(BaseModel):
     district_id: Optional[int] = None
     city_id: Optional[int] = None
     positions: Optional[list] = None
+    toll: Optional[bool] = None
+    flooding: Optional[bool] = None
     created_at: Optional[str] = None
 
     class Config:
@@ -121,6 +123,9 @@ class StreetUpdate(BaseModel):
     type: Optional[str] = None
     district_id: Optional[int] = None
     city_id: Optional[int] = None
+    positions: Optional[list] = None
+    toll: Optional[bool] = None
+    flooding: Optional[bool] = None
 
 
 # ==================== POSITIONS MODEL ====================
@@ -137,7 +142,10 @@ class Position(BaseModel):
     lane: Optional[int] = None
     tool: Optional[int] = None
     flooding: Optional[bool] = None
-    created_at: Optional[str] = None
+    ban_turn: Optional[Any] = None      # cấm rẽ
+    ban_vehicle: Optional[Any] = None   # cấm phương tiện
+    ban_hours: Optional[Any] = None     # cấm giờ
+    ban_weight: Optional[Any] = None    # cấm tải trọng
 
     class Config:
         from_attributes = True
@@ -153,6 +161,10 @@ class PositionCreate(BaseModel):
     lane: Optional[int] = None
     tool: Optional[int] = None
     flooding: Optional[bool] = None
+    ban_turn: Optional[Any] = None
+    ban_vehicle: Optional[Any] = None
+    ban_hours: Optional[Any] = None
+    ban_weight: Optional[Any] = None
 
 
 class PositionUpdate(BaseModel):
@@ -165,6 +177,10 @@ class PositionUpdate(BaseModel):
     lane: Optional[int] = None
     tool: Optional[int] = None
     flooding: Optional[bool] = None
+    ban_turn: Optional[Any] = None
+    ban_vehicle: Optional[Any] = None
+    ban_hours: Optional[Any] = None
+    ban_weight: Optional[Any] = None
 
 
 # ==================== GROUPS MODEL ====================

backend/services/maps_service.py

@@ -33,7 +33,10 @@ class MapsService:
             'tool': item.get('tool'),
             'flooding': item.get('flooding'),
             'streets': item.get('streets'),
-            'created_at': item.get('created_at')
+            'ban_turn': item.get('ban_turn'),
+            'ban_vehicle': item.get('ban_vehicle'),
+            'ban_hours': item.get('ban_hours'),
+            'ban_weight': item.get('ban_weight'),
         }
     @staticmethod
     async def get_all_cities() -> List[City]:
@@ -208,7 +211,7 @@ class MapsService:
     @staticmethod
     async def get_street_by_id(street_id: int) -> Optional[Street]:
         try:
-            result = supabase.table("Streets").select("id, name, type, district_id, city_id").eq("id", street_id).execute()
+            result = supabase.table("Streets").select("*").eq("id", street_id).execute()
             return Street(**result.data[0]) if result.data else None
         except Exception as e:
             raise Exception(f"Failed to fetch street: {str(e)}")
@@ -216,8 +219,16 @@ class MapsService:
     @staticmethod
     async def update_street(street_id: int, data: StreetUpdate) -> Street:
         try:
-            payload = {k: v for k, v in data.model_dump().items() if v is not None}
-            result = supabase.table("Streets").update(payload).eq("id", street_id).execute()
+            raw = {k: v for k, v in data.model_dump().items() if v is not None}
+            optional = {"toll", "flooding"}
+            core = {k: v for k, v in raw.items() if k not in optional}
+            try:
+                result = supabase.table("Streets").update(raw).eq("id", street_id).execute()
+            except Exception:
+                # toll/flooding columns may not exist yet → save core fields only
+                result = supabase.table("Streets").update(core or raw).eq("id", street_id).execute()
+            if not result.data:
+                raise Exception(f"Street #{street_id} not found or update failed")
             return Street(**result.data[0])
         except Exception as e:
             raise Exception(f"Failed to update street: {str(e)}")
@@ -415,7 +426,8 @@ class MapsService:
             # include streets JSON if provided on model
             if getattr(data, 'street_id', None):
                 payload['streets'] = [data.street_id]
-            for field in ("ban", "speed", "park", "lane", "tool", "flooding"):
+            for field in ("ban", "speed", "park", "lane", "tool", "flooding",
+                          "ban_turn", "ban_vehicle", "ban_hours", "ban_weight"):
                 val = getattr(data, field)
                 if val is not None:
                     payload[field] = val
@@ -473,6 +485,8 @@ class MapsService:
                 lon     = float(pt.get('lon'))
                 streets = [int(s) for s in (pt.get('streets') or [])]
                 pos_id  = pt.get('pos_id')
+                # Optional ban fields (only written when the key is present in payload)
+                ban_fields = {k: pt[k] for k in ("ban_turn", "ban_vehicle", "ban_hours", "ban_weight") if k in pt}
 
                 if pos_id:
                     # ── UPDATE existing position ──────────────────────────────────
@@ -481,7 +495,7 @@ class MapsService:
                     existing_pos = supabase.table("Positions").select("streets").eq("id", pos_id).limit(1).execute()
                     old_streets = list((existing_pos.data[0].get('streets') or []) if existing_pos.data else [])
 
-                    result = supabase.table("Positions").update({"long": lon, "lat": lat, "streets": streets}).eq("id", pos_id).execute()
+                    result = supabase.table("Positions").update({"long": lon, "lat": lat, "streets": streets, **ban_fields}).eq("id", pos_id).execute()
                     if result.data:
                         created.append(result.data[0])
 
@@ -510,7 +524,7 @@ class MapsService:
                 else:
                     # ── INSERT new position ───────────────────────────────────────
                     next_id = _next_id("Positions")
-                    payload = {"id": next_id, "long": lon, "lat": lat, "streets": streets}
+                    payload = {"id": next_id, "long": lon, "lat": lat, "streets": streets, **ban_fields}
                     result = supabase.table("Positions").insert(payload).execute()
                     if not result.data:
                         raise Exception("Failed to insert position")