Allow data_summary to filter by station id

server/app/managers/aiq_manager.py

@@ -156,27 +156,21 @@ async def get_sensor_data_by_id(session_maker: AsyncSessionMaker, id: int) -> Op
         return result.scalar_one_or_none()
 
     @staticmethod
-    async def get_summary(session_maker: AsyncSessionMaker) -> str:
-        query = select(StationData).order_by(StationData.id.desc()).limit(1)
-        async with session_maker() as session:
-            result = (await session.scalars(query)).first()
-            if not result:
-                return "Database is empty"
-            count = await session.scalar(select(func.count()).select_from(StationData))
-
-        return _render_summary_template(result, count or 0)
+    async def get_summary(session_maker: AsyncSessionMaker, station_id: Optional[int] = None) -> str:
+        query = select(StationData)
 
-    @staticmethod
-    async def get_summary_by_station_id(session_maker: AsyncSessionMaker, station_id: int) -> str:
-        query = select(StationData).where(StationData.station_id == station_id).order_by(StationData.id.desc()).limit(1)
+        if station_id is not None:
+            query = query.where(StationData.station_id == station_id)
 
+        query = query.order_by(StationData.id.desc()).limit(1)
         async with session_maker() as session:
             result = (await session.scalars(query)).first()
-
             if not result:
-                return f"Results for sensor {station_id}  not found"
+                return "Database is empty" if station_id is None else f"Results for sensor {station_id}  not found"
 
-        return _render_summary_template(result, 1)
+            count = await session.scalar(select(func.count()).select_from(StationData))
+
+        return _render_summary_template(result, count or 0)
 
     @staticmethod
     async def truncate_db(session_maker: AsyncSessionMaker) -> str:

server/app/telegram/bot.py

@@ -96,8 +96,23 @@ async def command_summary_handler(message: Message, command: CommandObject):
         await message.answer("Command not supported")
 
     callback = ManagementBot.get_command(command.command)
+
+    station_id: Optional[int] = None
+
+    if command.args:
+        cmd_args = command.args.split()
+        if len(cmd_args) > 1:
+            await message.answer("Incorrect number of arguments, only station_id is needed")
+            return
+
+        try:
+            station_id = int(cmd_args[0])
+        except TypeError:
+            await message.answer(f"station_id: {station_id} is not a valid int")
+            return
+
     try:
-        result = await callback()
+        result = await callback(station_id)
     except Exception:
         trace = traceback.format_exc()
         await message.answer(f"An error occurred in summary:\n {trace}")

server/tests/managers/aiq_manager_test.py

@@ -46,11 +46,11 @@ async def test_get_summary_with_full_data(main_db_session: AsyncSessionMaker, fu
 
 
 @pytest.mark.asyncio
-async def test_get_summary_by_station_id(main_db_session: AsyncSessionMaker, scd41_data_from_station: AiqDataFromStation):
+async def test_get_summary_by_station_with_station_id(main_db_session: AsyncSessionMaker, scd41_data_from_station: AiqDataFromStation):
     await AiqDataManager.save_sensor_data(main_db_session, scd41_data_from_station)
-    null_summary = await AiqDataManager.get_summary_by_station_id(main_db_session, -1)
+    null_summary = await AiqDataManager.get_summary(main_db_session, -1)
     assert "not found" in null_summary
-    summary = await AiqDataManager.get_summary_by_station_id(
+    summary = await AiqDataManager.get_summary(
         main_db_session,
         scd41_data_from_station.station_id,
     )

server/tests/resources/station_data_forwarder_test.py

@@ -29,7 +29,7 @@ async def test_render_put_in_br_from_end_device_no_backups(
 
     assert result.code == CHANGED
 
-    summary_backup = await AiqDataManager.get_summary_by_station_id(backup_db_session, mock_station_id)
+    summary_backup = await AiqDataManager.get_summary(backup_db_session, mock_station_id)
 
     assert "not found" in summary_backup
 
@@ -56,6 +56,6 @@ async def test_render_put_in_br_from_end_device_with_backup(
     )
     assert result.code == CHANGED
 
-    summary_main = await AiqDataManager.get_summary_by_station_id(backup_db_session, mock_station_id)
+    summary_main = await AiqDataManager.get_summary(backup_db_session, mock_station_id)
 
     assert "not found" not in summary_main

server/tests/resources/station_data_storage_test.py

@@ -27,11 +27,11 @@ async def test_render_put_in_main_server_from_br(
 
     assert result.code == CHANGED
 
-    summary_main = await AiqDataManager.get_summary_by_station_id(main_db_session, mock_station_id)
+    summary_main = await AiqDataManager.get_summary(main_db_session, mock_station_id)
 
     assert "not found" not in summary_main
 
-    summary_backup = await AiqDataManager.get_summary_by_station_id(backup_db_session, mock_station_id)
+    summary_backup = await AiqDataManager.get_summary(backup_db_session, mock_station_id)
 
     assert "not found" not in summary_backup
 
@@ -55,10 +55,10 @@ async def test_render_put_in_main_server_from_end_device(
 
     assert result.code == CHANGED
 
-    summary_main = await AiqDataManager.get_summary_by_station_id(main_db_session, mock_station_id)
+    summary_main = await AiqDataManager.get_summary(main_db_session, mock_station_id)
 
     assert "not found" not in summary_main
 
-    summary_backup = await AiqDataManager.get_summary_by_station_id(backup_db_session, mock_station_id)
+    summary_backup = await AiqDataManager.get_summary(backup_db_session, mock_station_id)
 
     assert "not found" not in summary_backup