[P] Remove use-case diagram

Add test for new records in DB

.gitea/workflows/reset-docker.yaml

@@ -7,10 +7,13 @@ jobs:
     name: Reset docker state
     steps:
       - name: Stop all containers
+        if: ${{always()}}
         run: docker stop $(docker ps -a | cut -d " " -f 1 | tail -n +2)
       
       - name: Remove all containers
+        if: ${{always()}}
         run: docker rm $(docker ps -a | cut -d " " -f 1 | tail -n +2)
 
       - name: Remove extra volumes
+        if: ${{always()}}
         run: docker volume rm road_vision_postgres_data road_vision_pgadmin-data

.gitea/workflows/tests.yaml

@@ -28,18 +28,27 @@ 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 .
 
       - name: Run Store tests
         working-directory: IoT-Systems
-        run: docker run --rm -it local/store/${{gitea.sha}}
+        run: docker run --network host --rm -it local/store/${{gitea.sha}}
 
       - name: Clean up containers
         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

@@ -4,13 +4,12 @@ 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
@@ -34,10 +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 = []
@@ -50,12 +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 
+                self.websocket = websocket
                 try:
                     while True:
                         data = await websocket.recv()
@@ -65,10 +63,10 @@ class Datasource:
                     self.connection_status = "Disconnected"
                     Logger.debug("SERVER DISCONNECT")
 
-    async def update_db_records(self):
+    def update_db_record_visibility(self, record_id):
         if self.websocket:
-            data = json.dumps({"id": self.user_id})
+            data = json.dumps({"id": record_id})
-            await self.websocket.send(data, True)
+            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

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()
 
@@ -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_records()
+        self.datasource.update_db_record_visibility(clicked_marker_data.id)
 
     def on_touch_down(self, widget, touch):
         if touch.button == "right":

diagrams/architecture-diagram.puml

@@ -0,0 +1,81 @@
+@startuml
+interface MQTT as mqtt1
+interface MQTT as mqtt2
+interface HTTP as http1
+interface HTTP as http2
+interface WebSocket
+
+node Agent {
+  component Accelerometer
+  component GPS
+  component CarParkingSlots
+  component "Data Aggregator" as agent_agg
+}
+
+node Edge {
+  component AgentMQTTAdapter
+  component AgentDataProcessor
+  component HubMQTTAdapter
+  component HubHTTPAdapter
+}
+
+node Hub {
+  component EdgeHTTPAdapter
+  component EdgeMQTTAdapter
+  component Aggregator
+  component StoreHTTPAdapter
+  component Redis
+}
+
+node Store {
+  component "HTTP Rest API" as store_http
+  component "SQL Adapter" as store_sql
+  component "Websocket API" as store_ws
+}
+
+node MapView {
+  component "Store Processor" as mv_sp
+  component "Input Handler" as mv_ih
+  component "Map"
+}
+
+component PostgreSQL
+
+agent_agg --> Accelerometer
+agent_agg --> GPS
+agent_agg --> CarParkingSlots
+
+agent_agg -> mqtt1
+
+mqtt1 <- AgentMQTTAdapter
+AgentMQTTAdapter -> AgentDataProcessor
+AgentDataProcessor --> HubMQTTAdapter
+AgentDataProcessor --> HubHTTPAdapter
+HubMQTTAdapter --> mqtt2
+HubHTTPAdapter --> http1
+
+mqtt2 <-- EdgeMQTTAdapter
+http1 <-- EdgeHTTPAdapter
+EdgeMQTTAdapter --> Aggregator
+EdgeHTTPAdapter --> Aggregator
+Aggregator <--> Redis
+StoreHTTPAdapter <-- Aggregator
+
+http2 <-- StoreHTTPAdapter
+store_http --> http2
+store_http -> store_sql
+store_sql <- store_ws
+store_ws --> WebSocket
+
+store_sql <--> PostgreSQL
+
+WebSocket <-- mv_sp
+mv_sp <-- mv_ih
+mv_sp --> Map
+
+actor Spectator as user
+
+Map --> user
+mv_ih <-- user
+
+@enduml

diagrams/general-sequence.puml

@@ -0,0 +1,22 @@
+@startuml
+actor Worker as worker
+participant Agent as agent
+participant "Edge" as edge
+participant "Hub" as hub
+participant "Store" as store
+participant "MapView" as mapview
+actor Spectator as spectator
+
+worker -> agent : Start agent
+agent -> edge : Send sensor data
+edge -> edge : Classify road state
+edge -> hub : Send processed data
+hub -> hub : Save processed data
+hub -> store : Send processed data batch
+store -> store : Save processed data batch
+store -> mapview : Send new rows
+mapview -> spectator : Show updated paths and markers
+spectator -> mapview : Click on markers
+mapview -> spectator : Hide clicked markers
+mapview -> store : Save display preference
+@enduml

diagrams/main-activity-diagram.puml

@@ -0,0 +1,15 @@
+@startuml
+|Користувач|
+start
+:Натискає на іконку ями;
+|Система|
+:Запитує підтвердження видалення ями;
+|Користувач|
+:Підтверджує видалення ями;
+|Система|
+:Модифікує запис про яму;
+note right #ff9999: Можлива виключна ситуація 1
+:Видаляє яму;
+|Користувач|
+stop
+@enduml

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,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-entry.sh

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