Filter QR analytics to post-creation scans

hf_dashboard.py

@@ -118,6 +118,35 @@ def _table_select(table: str, *, query: str) -> list[dict[str, Any]]:
     return []
 
 
+def _parse_timestamp(value: Any) -> datetime | None:
+    text = str(value or "").strip()
+    if not text:
+        return None
+    if text.endswith("Z"):
+        text = text[:-1] + "+00:00"
+    if "." in text:
+        main, suffix = text.split(".", 1)
+        tz_index_plus = suffix.find("+")
+        tz_index_minus = suffix.find("-")
+        tz_index_candidates = [idx for idx in (tz_index_plus, tz_index_minus) if idx != -1]
+        tz_index = min(tz_index_candidates) if tz_index_candidates else -1
+        if tz_index != -1:
+            fraction = suffix[:tz_index]
+            timezone_part = suffix[tz_index:]
+        else:
+            fraction = suffix
+            timezone_part = ""
+        if fraction:
+            fraction = (fraction + "000000")[:6]
+            text = f"{main}.{fraction}{timezone_part}"
+    if len(text) >= 3 and text[-3] in {"+", "-"} and text[-2:].isdigit():
+        text = text + ":00"
+    try:
+        return datetime.fromisoformat(text)
+    except ValueError:
+        return None
+
+
 def _insert_row(table: str, row: Mapping[str, Any], *, upsert: bool = False) -> list[dict[str, Any]]:
     prefer = "return=representation"
     if upsert:
@@ -699,12 +728,36 @@ def get_generation_detail(request: Any | None, records: list[dict[str, Any]], in
             ),
         )
 
-    total_scans = len(scan_rows)
-    last_scanned_at = str(scan_rows[0].get("scanned_at") or "").replace("T", " ")[:19] if scan_rows else "Never"
-    unique_scans = len({str(row.get('visitor_hash') or '') for row in scan_rows if str(row.get('visitor_hash') or '').strip()})
+    created_at_dt = _parse_timestamp(record.get("created_at"))
+    filtered_scan_rows = [
+        row
+        for row in scan_rows
+        if not bool(row.get("is_bot"))
+        and not bool(row.get("is_prefetch"))
+        and (
+            created_at_dt is None
+            or (_parse_timestamp(row.get("scanned_at")) or created_at_dt) >= created_at_dt
+        )
+    ]
+
+    total_scans = len(filtered_scan_rows)
+    last_scanned_at = (
+        str(filtered_scan_rows[0].get("scanned_at") or "").replace("T", " ")[:19]
+        if filtered_scan_rows
+        else "Never"
+    )
+    unique_scans = len(
+        {
+            str(row.get("visitor_hash") or "")
+            for row in filtered_scan_rows
+            if str(row.get("visitor_hash") or "").strip()
+        }
+    )
 
-    countries = Counter(str(row.get("country_code") or "Unknown") for row in scan_rows)
-    scans_by_day = Counter(str(row.get("scanned_at") or "")[:10] for row in scan_rows if str(row.get("scanned_at") or ""))
+    countries = Counter(str(row.get("country_code") or "Unknown") for row in filtered_scan_rows)
+    scans_by_day = Counter(
+        str(row.get("scanned_at") or "")[:10] for row in filtered_scan_rows if str(row.get("scanned_at") or "")
+    )
 
     top_countries_rows = [[country, count] for country, count in countries.most_common(10)]
     scans_by_day_rows = [[day, scans_by_day[day]] for day in sorted(scans_by_day.keys())]
@@ -724,8 +777,8 @@ def get_generation_detail(request: Any | None, records: list[dict[str, Any]], in
             f"- Destination: {record.get('destination_url_original') or '—'}",
             f"- Short URL: {record.get('short_url') or '—'}",
             f"- Effective QR text: {record.get('effective_qr_text') or '—'}",
-            f"- Total scans: {total_scans}",
-            f"- Approx. unique scans: {unique_scans}",
+            f"- Total scans since this QR was created: {total_scans}",
+            f"- Approx. unique scans since creation: {unique_scans}",
             f"- Last scanned at: {last_scanned_at}",
         ]
     )

tests-unit/hf_dashboard_test.py

@@ -116,26 +116,40 @@ def test_get_generation_detail_aggregates_scan_analytics(monkeypatch) -> None:
         if table == "short_link_scan_events":
             return [
                 {
-                    "scanned_at": "2026-05-31T12:00:00+00:00",
+                    "scanned_at": "2026-05-31T14:00:00+00:00",
+                    "country_code": "US",
+                    "visitor_hash": "old-v",
+                    "is_bot": False,
+                    "is_prefetch": False,
+                },
+                {
+                    "scanned_at": "2026-05-31T15:00:00+00:00",
                     "country_code": "US",
                     "visitor_hash": "v1",
                     "is_bot": False,
                     "is_prefetch": False,
                 },
                 {
-                    "scanned_at": "2026-05-31T13:00:00+00:00",
+                    "scanned_at": "2026-05-31T16:00:00+00:00",
                     "country_code": "NL",
                     "visitor_hash": "v2",
                     "is_bot": False,
                     "is_prefetch": False,
                 },
                 {
-                    "scanned_at": "2026-05-31T14:00:00+00:00",
+                    "scanned_at": "2026-05-31T17:00:00+00:00",
                     "country_code": "US",
                     "visitor_hash": "v1",
                     "is_bot": False,
                     "is_prefetch": False,
                 },
+                {
+                    "scanned_at": "2026-05-31T18:00:00+00:00",
+                    "country_code": "US",
+                    "visitor_hash": "bot-v",
+                    "is_bot": True,
+                    "is_prefetch": False,
+                },
             ]
         raise AssertionError(f"Unexpected table: {table}")
 
@@ -144,7 +158,7 @@ def test_get_generation_detail_aggregates_scan_analytics(monkeypatch) -> None:
         {
             "id": "gen-1",
             "app_user_id": "user-1",
-            "created_at": "2026-05-31T10:00:00+00:00",
+            "created_at": "2026-05-31T14:47:47+00:00",
             "status": "completed",
             "input_type": "URL",
             "qr_mode": "standard",
@@ -159,8 +173,8 @@ def test_get_generation_detail_aggregates_scan_analytics(monkeypatch) -> None:
 
     detail = hf_dashboard.get_generation_detail(FakeRequest(oauth_info=HF_OAUTH_INFO), records, 0)
 
-    assert "Total scans: 3" in detail["detail_markdown"]
-    assert "Approx. unique scans: 2" in detail["detail_markdown"]
+    assert "Total scans since this QR was created: 3" in detail["detail_markdown"]
+    assert "Approx. unique scans since creation: 2" in detail["detail_markdown"]
     assert detail["image"] == "https://cdn.example/full.png"
     assert detail["top_countries_rows"] == [["US", 2], ["NL", 1]]
     assert detail["scans_by_day_rows"] == [["2026-05-31", 3]]