fix(activity): restore app-level window stream on rdp host

2026-05-27 11:36:58 +03:00
parent 51cb43666a
commit 524ab33f63
4 changed files with 190 additions and 11 deletions
@@ -30,6 +30,73 @@ class WorktimeUiBridgeTests(unittest.TestCase):
        with mock.patch.object(MODULE, "get_latest_bucket_event_ts", return_value=stale):
            self.assertTrue(MODULE.bucket_needs_fallback("aw-watcher-afk_SHARKON2025", now, 600))

+    def test_get_latest_foreground_context_uses_recent_collector_health(self):
+        now = datetime(2026, 5, 27, 8, 0, 0, tzinfo=timezone.utc)
+        recent_events = [
+            {
+                "timestamp": "2026-05-27T07:59:30Z",
+                "data": {
+                    "signalType": "collector_health",
+                    "foregroundProcess": "totalcmd",
+                    "foregroundTitle": "Total Commander 6.01 - HARVEST",
+                },
+            }
+        ]
+        with mock.patch.object(MODULE, "_req", return_value=recent_events):
+            ctx = MODULE.get_latest_foreground_context(now)
+        self.assertEqual(ctx["app"], "totalcmd.exe")
+        self.assertEqual(ctx["title"], "Total Commander 6.01 - HARVEST")
+
+    def test_transform_uses_foreground_context_for_active_sessions(self):
+        events = [
+            {
+                "timestamp": "2026-05-27T07:59:30Z",
+                "duration": 0,
+                "data": {
+                    "username": "user5",
+                    "state": "Активно",
+                    "sessionId": 3,
+                    "sessionName": "rdp-tcp#0",
+                },
+            }
+        ]
+        afk_events, win_events, last_ts = MODULE.transform(
+            events,
+            foreground_context={"app": "totalcmd.exe", "title": "Total Commander 6.01 - HARVEST"},
+        )
+        self.assertEqual(afk_events[0]["data"]["status"], "not-afk")
+        self.assertEqual(win_events[0]["data"]["app"], "totalcmd.exe")
+        self.assertEqual(win_events[0]["data"]["title"], "Total Commander 6.01 - HARVEST")
+        self.assertEqual(last_ts, "2026-05-27T07:59:30Z")
+
+    def test_watcher_window_needs_bridge_sync_for_generic_bridge_rdp(self):
+        now = datetime(2026, 5, 27, 8, 5, 0, tzinfo=timezone.utc)
+        latest_event = {
+            "timestamp": "2026-05-27T08:04:40Z",
+            "data": {
+                "app": "RDP",
+                "title": "RDP active (2): user5, администратор",
+                "source": "aw-worktime-ui-bridge",
+            },
+        }
+        with mock.patch.object(MODULE, "get_latest_bucket_event", return_value=latest_event), \
+             mock.patch.object(MODULE, "get_latest_bucket_event_ts", return_value=datetime(2026, 5, 27, 8, 4, 40, tzinfo=timezone.utc)):
+            self.assertTrue(MODULE.watcher_window_needs_bridge_sync(now))
+
+    def test_watcher_window_does_not_override_real_watcher_stream(self):
+        now = datetime(2026, 5, 27, 8, 5, 0, tzinfo=timezone.utc)
+        latest_event = {
+            "timestamp": "2026-05-27T08:04:40Z",
+            "data": {
+                "app": "notepad.exe",
+                "title": "Безымянный — Блокнот",
+                "source": "aw-watcher-window",
+            },
+        }
+        with mock.patch.object(MODULE, "get_latest_bucket_event", return_value=latest_event), \
+             mock.patch.object(MODULE, "get_latest_bucket_event_ts", return_value=datetime(2026, 5, 27, 8, 4, 40, tzinfo=timezone.utc)):
+            self.assertFalse(MODULE.watcher_window_needs_bridge_sync(now))
+

 if __name__ == "__main__":
    unittest.main()