[P] Add database update after marker deletion.

MapView/datasource.py

@@ -4,12 +4,13 @@ from datetime import datetime
 import websockets
 from kivy import Logger
 from pydantic import BaseModel, field_validator
+from websockets.asyncio.connection import Connection
+
 from config import STORE_HOST, STORE_PORT
 
 
 # Pydantic models
 class ProcessedAgentData(BaseModel):
-    id: int
     road_state: str
     user_id: int
     x: float
@@ -33,9 +34,10 @@ class ProcessedAgentData(BaseModel):
 
 
 class Datasource:
-    def __init__(self):
+    def __init__(self, user_id: int):
         self.websocket: Connection | None = None
         self.index = 0
+        self.user_id = user_id
         self.connection_status = None
         self._new_points = []
         self._active_markers = []
@@ -48,7 +50,7 @@ class Datasource:
         return points
 
     async def connect_to_server(self):
-        uri = f"ws://{STORE_HOST}:{STORE_PORT}/ws"
+        uri = f"ws://{STORE_HOST}:{STORE_PORT}/ws/{self.user_id}"
         while True:
             Logger.debug("CONNECT TO SERVER")
             async with websockets.connect(uri) as websocket:
@@ -63,10 +65,10 @@ class Datasource:
                     self.connection_status = "Disconnected"
                     Logger.debug("SERVER DISCONNECT")
 
-    def update_db_record_visibility(self, record_id):
+    async def update_db_records(self):
         if self.websocket:
-            data = json.dumps({"id": record_id})
+            data = json.dumps({"id": self.user_id})
-            asyncio.ensure_future(self.websocket.send(data))
+            await self.websocket.send(data, True)
 
     def map_lat_lon_to_processed_agent_data(self, lat: float, lon: float) -> ProcessedAgentData | None:
         distances = tuple((abs(lon - marker.latitude) ** 2 + abs(lat - marker.longitude) ** 2) ** 0.5 for marker in

MapView/main.py

@@ -33,7 +33,7 @@ class MapViewApp(App):
         super().__init__(**kwargs)
 
         self.mapview: MapView | None = None
-        self.datasource = Datasource()
+        self.datasource = Datasource(user_id=1)
         self.line_layers = dict()
         self.car_markers = dict()
 
@@ -162,7 +162,7 @@ class MapViewApp(App):
         elif clicked_marker in self.bump_markers:
             self.bump_markers.pop(self.bump_markers.index(clicked_marker))
 
-        self.datasource.update_db_record_visibility(clicked_marker_data.id)
+        self.datasource.update_db_records()
 
     def on_touch_down(self, widget, touch):
         if touch.button == "right":

store/main.py

@@ -39,18 +39,15 @@ subscriptions: Set[WebSocket] = set()
 
 
 # FastAPI WebSocket endpoint
-@app.websocket("/ws")
+@app.websocket("/ws/{user_id}")
-async def websocket_endpoint(websocket: WebSocket):
+async def websocket_endpoint(websocket: WebSocket, user_id: int):
     await websocket.accept()
 
     subscriptions.add(websocket)
 
     try:
         # send already available data
-        r = processed_agent_data.select() \
+        r = processed_agent_data.select().order_by(processed_agent_data.c.timestamp)
-                                .where(processed_agent_data.c.visible == True) \
-                                .order_by(processed_agent_data.c.timestamp)
-
         session = SessionLocal()
         stored_data = session.execute(r).fetchall()
         session.close()