[P] Remove uncessecary empty line

MapView/datasource.py

@@ -9,6 +9,7 @@ from config import STORE_HOST, STORE_PORT
 
 # Pydantic models
 class ProcessedAgentData(BaseModel):
+    id: int
     road_state: str
     user_id: int
     x: float
@@ -32,9 +33,9 @@ class ProcessedAgentData(BaseModel):
 
 
 class Datasource:
-    def __init__(self, user_id: int):
+    def __init__(self):
+        self.websocket: Connection | None = None
         self.index = 0
-        self.user_id = user_id
         self.connection_status = None
         self._new_points = []
         self._active_markers = []
@@ -47,11 +48,12 @@ class Datasource:
         return points
 
     async def connect_to_server(self):
-        uri = f"ws://{STORE_HOST}:{STORE_PORT}/ws/{self.user_id}"
+        uri = f"ws://{STORE_HOST}:{STORE_PORT}/ws"
         while True:
             Logger.debug("CONNECT TO SERVER")
             async with websockets.connect(uri) as websocket:
                 self.connection_status = "Connected"
+                self.websocket = websocket 
                 try:
                     while True:
                         data = await websocket.recv()
@@ -61,8 +63,14 @@ class Datasource:
                     self.connection_status = "Disconnected"
                     Logger.debug("SERVER DISCONNECT")
 
-    def map_lat_lon_to_ProcessedAgentData(self, lat: float, lon: float) -> ProcessedAgentData | None:
+    def update_db_record_visibility(self, record_id):
-        distances = tuple((abs(lon - marker.latitude) ** 2 + abs(lat - marker.longitude) ** 2) ** 0.5 for marker in self._active_markers)
+        if self.websocket:
+            data = json.dumps({"id": record_id})
+            asyncio.ensure_future(self.websocket.send(data))
+
+    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
+                          self._active_markers)
 
         if len(distances) == 0:
             return None

MapView/main.py

@@ -33,7 +33,7 @@ class MapViewApp(App):
         super().__init__(**kwargs)
 
         self.mapview: MapView | None = None
-        self.datasource = Datasource(user_id=1)
+        self.datasource = Datasource()
         self.line_layers = dict()
         self.car_markers = dict()
 
@@ -63,7 +63,7 @@ class MapViewApp(App):
 
             # Оновлює лінію маршрута
             if user_id not in self.line_layers:
-                self.line_layers[user_id] = LineMapLayer(color = line_layer_colors[user_id % len(line_layer_colors)])
+                self.line_layers[user_id] = LineMapLayer(color=line_layer_colors[user_id % len(line_layer_colors)])
                 self.mapview.add_layer(self.line_layers[user_id])
 
             self.line_layers[user_id].add_point((lat, lon))
@@ -109,7 +109,7 @@ class MapViewApp(App):
 
         try:
             return next(flt)
-        except StopIteration as e:
+        except StopIteration:
             return None
 
     def set_pothole_marker(self, point):
@@ -145,14 +145,14 @@ class MapViewApp(App):
         if lat is None or lon is None:
             return
 
-        clicked_marker_data = self.datasource.map_lat_lon_to_ProcessedAgentData(lat, lon)
+        clicked_marker_data = self.datasource.map_lat_lon_to_processed_agent_data(lat, lon)
 
         if not clicked_marker_data:
             return
 
         clicked_marker = self.map_lat_lon_to_marker(clicked_marker_data.latitude, clicked_marker_data.longitude)
 
-        if clicked_marker == None:
+        if clicked_marker is None:
             return
 
         self.mapview.remove_marker(clicked_marker)
@@ -162,13 +162,14 @@ 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)
+
     def on_touch_down(self, widget, touch):
         if touch.button == "right":
             coordinate = self.mapview.get_latlon_at(touch.x, touch.y, self.mapview.zoom)
             self.delete_pothole_marker(coordinate)
             return True
 
-
     def build(self):
         """
         Ініціалізує мапу MapView(zoom, lat, lon)
@@ -180,7 +181,7 @@ class MapViewApp(App):
             lon=30.5234
         )
 
-        self.mapview.bind(on_touch_down = self.on_touch_down)
+        self.mapview.bind(on_touch_down=self.on_touch_down)
 
         return self.mapview
 

store/main.py

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

store/test_db.py

@@ -15,7 +15,7 @@ def test_create_processed_agent_data():
         "user_id": 123,
         "data": [
             {
-                "road_state": "normal",
+                "road_state": "good",
                 "agent_data": {
                     "user_id": 999, 
                     "accelerometer": {