[P] Integrate additional store testing into CI pipeline

.gitea/workflows/tests.yaml

@@ -28,6 +28,10 @@ jobs:
       - name: Clone repository
         run: git clone --revision ${{ gitea.sha }} --depth 1 ${{ gitea.server_url }}/${{ gitea.repository }}
 
+      - name: Start postgres_db container for testing
+        working-directory: IoT-Systems
+        run: docker-compose up -d postgres_db
+
       - name: Build Store testing container
         working-directory: IoT-Systems
         run: docker build -t local/store/${{gitea.sha}} -f store/Dockerfile-test .
@@ -40,6 +44,11 @@ jobs:
         if: ${{always()}}
         run: docker image rm local/store/${{gitea.sha}}
 
+      - name: Clean up docker-compose
+        if: ${{always()}}
+        working-directory: IoT-Systems
+        run: docker-compose down -v --remove-orphans
+
   integration-smoke-test:
     name: Integration smoke testing
     runs-on: host-arch-x86_64

MapView/datasource.py

@@ -9,7 +9,6 @@ from config import STORE_HOST, STORE_PORT
 
 # Pydantic models
 class ProcessedAgentData(BaseModel):
-    id: int
     road_state: str
     user_id: int
     x: float
@@ -33,12 +32,11 @@ 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 = []
         asyncio.ensure_future(self.connect_to_server())
 
     def get_new_points(self):
@@ -48,12 +46,11 @@ 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:
                 self.connection_status = "Connected"
-                self.websocket = websocket
                 try:
                     while True:
                         data = await websocket.recv()
@@ -63,26 +60,6 @@ class Datasource:
                     self.connection_status = "Disconnected"
                     Logger.debug("SERVER DISCONNECT")
 
-    def update_db_record_visibility(self, record_id):
-        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
-
-        min_distance = min(distances)
-        marker = self._active_markers[distances.index(min_distance)]
-
-        if min_distance < 0.005:
-            return marker
-        else:
-            return None
-
     def handle_received_data(self, data):
         # Update your UI or perform actions with received data here
         Logger.debug(f"Received data: {data}")
@@ -93,9 +70,6 @@ class Datasource:
             ],
             key=lambda v: v.timestamp,
         )
-
-        self._active_markers += [i for i in processed_agent_data_list if i.road_state != 'normal']
-
         new_points = [
             (
                 processed_agent_data.longitude,

MapView/main.py

@@ -15,31 +15,18 @@ line_layer_colors = [
     [1, 0, 1, 1],
 ]
 
-
-def get_lat_lon(point: dict[str, float] | list[float] | tuple[float, float]) -> tuple[float, float] | None:
-    if isinstance(point, dict):
-        lat = point.get("lat")
-        lon = point.get("lon")
-    else:
-        lat, lon = point
-
-    if lat is None or lon is None:
-        return None
-    return lat, lon
-
-
 class MapViewApp(App):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-        self.mapview: MapView | None = None
+        self.mapview = None
-        self.datasource = Datasource()
+        self.datasource = Datasource(user_id=1)
         self.line_layers = dict()
         self.car_markers = dict()
 
         # додати необхідні змінні
-        self.bump_markers: list[MapMarker] = []
+        self.bump_markers = []
-        self.pothole_markers: list[MapMarker] = []
+        self.pothole_markers = []
 
     def on_start(self):
         """
@@ -63,7 +50,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))
@@ -104,16 +91,13 @@ class MapViewApp(App):
         if user_id == config.TRACK_ID:
             self.mapview.center_on(lat, lon)
 
-    def map_lat_lon_to_marker(self, lat: float, lon: float) -> MapMarker | None:
-        flt = filter(lambda marker: lon == marker.lat and lat == marker.lon, self.pothole_markers + self.bump_markers)
-
-        try:
-            return next(flt)
-        except StopIteration:
-            return None
-
     def set_pothole_marker(self, point):
-        lat, lon = get_lat_lon(point)
+        if isinstance(point, dict):
+            lat = point.get("lat")
+            lon = point.get("lon")
+        else:
+            lat, lon = point
+
         if lat is None or lon is None:
             return
 
@@ -127,48 +111,24 @@ class MapViewApp(App):
         self.pothole_markers.append(marker)
 
     def set_bump_marker(self, point):
-        lat, lon = get_lat_lon(point)
+        if isinstance(point, dict):
+            lat = point.get("lat")
+            lon = point.get("lon")
+        else:
+            lat, lon = point
+
         if lat is None or lon is None:
             return
-
+        
         marker = MapMarker(
             lat=lat,
             lon=lon,
-            source="images/bump.png"
+            source="images/bump.png"  
         )
 
         self.mapview.add_marker(marker)
         self.bump_markers.append(marker)
 
-    def delete_pothole_marker(self, point):
-        lat, lon = get_lat_lon(point)
-        if lat is None or lon is None:
-            return
-
-        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 is None:
-            return
-
-        self.mapview.remove_marker(clicked_marker)
-
-        if clicked_marker in self.pothole_markers:
-            self.pothole_markers.pop(self.pothole_markers.index(clicked_marker))
-        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):
         """
@@ -181,8 +141,6 @@ class MapViewApp(App):
             lon=30.5234
         )
 
-        self.mapview.bind(on_touch_down=self.on_touch_down)
-
         return self.mapview
 
 

store/Dockerfile-test

@@ -6,6 +6,7 @@ WORKDIR /app
 COPY store/requirements.txt .
 
 RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --root-user-action ignore --no-cache-dir pytest httpx
 # Copy the entire application into the container
 COPY store/. .
 # Run the main.py script inside the container when it starts

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() 

store/test-entry.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
 
 PYTHONPATH=$PWD python3 test/main_test.py
+PYTHONPATH=$PWD python3 -m pytest test_db.py