Switch to a query builder approach for the annotation counts

This allows to reuse the same code for multiple cases. Introduce the h_userids filter which with the new approach is available in all queries.
hypothesis · Jun 17, 2024 · a9127b3 · a9127b3
1 parent 57d3b62
commit a9127b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/h/routes.py b/h/routes.py
@@ -136,12 +136,7 @@ def includeme(config):  # pylint: disable=too-many-statements
     config.add_route("api.bulk.group", "/api/bulk/group", request_method="POST")
 
     config.add_route(
-        "api.bulk.stats.users", "/api/bulk/stats/users", request_method="POST"
-    )
-    config.add_route(
-        "api.bulk.stats.assignments",
-        "/api/bulk/stats/assignments",
-        request_method="POST",
+        "api.bulk.lms.annotations", "/api/bulk/lms/annotations", request_method="POST"
     )
 
     config.add_route("api.groups", "/api/groups", factory="h.traversal.GroupRoot")

diff --git a/h/security/policy/_basic_http_auth.py b/h/security/policy/_basic_http_auth.py
@@ -40,8 +40,7 @@ class AuthClientPolicy(IdentityBasedPolicy):
         ("api.bulk.action", "POST"),
         ("api.bulk.annotation", "POST"),
         ("api.bulk.group", "POST"),
-        ("api.bulk.stats.assignments", "POST"),
-        ("api.bulk.stats.users", "POST"),
+        ("api.bulk.lms.annotations", "POST"),
     ]
 
     @classmethod

diff --git a/h/views/api/bulk/stats.py b/h/views/api/bulk/stats.py
@@ -17,10 +17,10 @@ class AssignmentStatsSchema(JSONSchema):
 
 @api_config(
     versions=["v1", "v2"],
-    route_name="api.bulk.stats.users",
+    route_name="api.bulk.lms.annotations",
     request_method="POST",
-    description="Retrieve stats grouped by user",
-    link_name="bulk.stats.assignment",
+    description="Retrieve annotations for LMS metrics",
+    link_name="bulk.lms.annotations",
     subtype="x-ndjson",
     permission=Permission.API.BULK_ACTION,
 )

diff --git a/tests/unit/h/routes_test.py b/tests/unit/h/routes_test.py
@@ -128,13 +128,8 @@ def test_includeme():
         call("api.bulk.annotation", "/api/bulk/annotation", request_method="POST"),
         call("api.bulk.group", "/api/bulk/group", request_method="POST"),
         call(
-            "api.bulk.stats.users",
-            "/api/bulk/stats/users",
-            request_method="POST",
-        ),
-        call(
-            "api.bulk.stats.assignments",
-            "/api/bulk/stats/assignments",
+            "api.bulk.lms.annotations",
+            "/api/bulk/lms/annotations",
             request_method="POST",
         ),
         call("api.groups", "/api/groups", factory="h.traversal.GroupRoot"),