Merge task t-rWbMpxaBk: Metrics view in Admin dashboard

1 files changed, 43 insertions, 12 deletions

diff --git a/Biz/PodcastItLater/Web.py b/Biz/PodcastItLater/Web.py
index 4d03f6a..06145d9 100644
--- a/Biz/PodcastItLater/Web.py
+++ b/Biz/PodcastItLater/Web.py
@@ -1868,7 +1868,7 @@ def add_episode_to_feed(request: Request, episode_id: int) -> Response:
     Core.Database.add_episode_to_user(user_id, episode_id)
 
     # Track the "added" event
-    Core.Database.track_episode_metric(episode_id, "added", user_id)
+    Core.Database.track_episode_event(episode_id, "added", user_id)
 
     # Reload the current page to show updated button state
     # Check referer to determine where to redirect
@@ -1899,7 +1899,7 @@ def track_episode(
     user_id = request.session.get("user_id")
 
     # Track the event
-    Core.Database.track_episode_metric(episode_id, event_type, user_id)
+    Core.Database.track_episode_event(episode_id, event_type, user_id)
 
     return Response("", status_code=200)
 
@@ -2416,7 +2416,7 @@ class TestMetricsDashboard(BaseWebTest):
         self.client.post("/login", data={"email": "user@example.com"})
 
         # Try to access metrics
-        response = self.client.get("/admin/metrics")
+        response = self.client.get("/admin/metrics", follow_redirects=False)
 
         # Should redirect
         self.assertEqual(response.status_code, 302)
@@ -2426,7 +2426,7 @@ class TestMetricsDashboard(BaseWebTest):
         """Verify unauthenticated users are redirected."""
         self.client.get("/logout")
 
-        response = self.client.get("/admin/metrics")
+        response = self.client.get("/admin/metrics", follow_redirects=False)
 
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.headers["Location"], "/")
@@ -2443,10 +2443,10 @@ class TestMetricsDashboard(BaseWebTest):
         Core.Database.add_episode_to_user(self.user_id, episode_id)
 
         # Track some events
-        Core.Database.track_episode_metric(episode_id, "played")
-        Core.Database.track_episode_metric(episode_id, "played")
-        Core.Database.track_episode_metric(episode_id, "downloaded")
-        Core.Database.track_episode_metric(episode_id, "added", self.user_id)
+        Core.Database.track_episode_event(episode_id, "played")
+        Core.Database.track_episode_event(episode_id, "played")
+        Core.Database.track_episode_event(episode_id, "downloaded")
+        Core.Database.track_episode_event(episode_id, "added", self.user_id)
 
         # Get metrics page
         response = self.client.get("/admin/metrics")
@@ -2455,6 +2455,37 @@ class TestMetricsDashboard(BaseWebTest):
         self.assertIn("Episode Metrics", response.text)
         self.assertIn("Total Episodes", response.text)
         self.assertIn("Total Plays", response.text)
+
+    def test_growth_metrics_display(self) -> None:
+        """Verify growth and usage metrics are displayed."""
+        # Create an active subscriber
+        user2_id, _ = Core.Database.create_user("active@example.com")
+        Core.Database.update_user_subscription(
+            user2_id,
+            subscription_id="sub_test",
+            status="active",
+            period_start=datetime.now(timezone.utc),
+            period_end=datetime.now(timezone.utc),
+            tier="paid",
+            cancel_at_period_end=False,
+        )
+
+        # Create a queue item
+        Core.Database.add_to_queue(
+            "https://example.com/new",
+            "active@example.com",
+            user2_id,
+        )
+
+        # Get metrics page
+        response = self.client.get("/admin/metrics")
+
+        self.assertEqual(response.status_code, 200)
+        self.assertIn("Growth & Usage", response.text)
+        self.assertIn("Total Users", response.text)
+        self.assertIn("Active Subs", response.text)
+        self.assertIn("Submissions (24h)", response.text)
+
         self.assertIn("Total Downloads", response.text)
         self.assertIn("Total Adds", response.text)
 
@@ -2480,13 +2511,13 @@ class TestMetricsDashboard(BaseWebTest):
 
         # Track events - more for episode1
         for _ in range(5):
-            Core.Database.track_episode_metric(episode1, "played")
+            Core.Database.track_episode_event(episode1, "played")
         for _ in range(2):
-            Core.Database.track_episode_metric(episode2, "played")
+            Core.Database.track_episode_event(episode2, "played")
 
         for _ in range(3):
-            Core.Database.track_episode_metric(episode1, "downloaded")
-        Core.Database.track_episode_metric(episode2, "downloaded")
+            Core.Database.track_episode_event(episode1, "downloaded")
+        Core.Database.track_episode_event(episode2, "downloaded")
 
         # Get metrics page
         response = self.client.get("/admin/metrics")