Adapt HAPI to talk to the refactored query-builder style H API

lms/services/h_api.py

@@ -169,32 +169,24 @@ def get_groups(
                     authority_provided_id=group["authority_provided_id"]
                 )
 
-    def get_assignment_stats(
-        self, group_authority_ids: list[str], resource_link_id: str
+    def get_annotation_counts(
+        self,
+        group_authority_ids: list[str],
+        group_by: str,
+        h_userids: list[str] | None = None,
+        resource_link_id: str | None = None,
     ):
-        response = self._api_request(
-            "POST",
-            path="bulk/stats/users",
-            body=json.dumps(
-                {
-                    "filter": {
-                        "groups": group_authority_ids,
-                        "assignment_id": resource_link_id,
-                    }
-                }
-            ),
-            headers={
-                "Content-Type": "application/vnd.hypothesis.v1+json",
-            },
-            stream=False,
-        )
-        return response.json()
+        filters = {
+            "groups": group_authority_ids,
+            "assignment_id": resource_link_id,
+        }
+        if h_userids:
+            filters["h_userids"] = h_userids
 
-    def get_course_stats(self, group_authority_ids: list[str]):
         response = self._api_request(
             "POST",
-            path="bulk/stats/assignments",
-            body=json.dumps({"filter": {"groups": group_authority_ids}}),
+            path="bulk/lms/annotations",
+            body=json.dumps({"group_by": group_by, "filter": filters}),
             headers={
                 "Content-Type": "application/vnd.hypothesis.v1+json",
             },

lms/views/dashboard/api/assignment.py

@@ -42,11 +42,11 @@ def assignment(self) -> APIAssignment:
     def assignment_stats(self) -> APIStudents:
         """Fetch the stats for one particular assignment."""
         assignment = get_request_assignment(self.request, self.assignment_service)
-        stats = self.h_api.get_assignment_stats(
+        stats = self.h_api.get_annotation_counts(
             [g.authority_provided_id for g in assignment.groupings],
-            assignment.resource_link_id,
+            group_by="user",
+            resource_link_id=assignment.resource_link_id,
         )
-
         # Organize the H stats by userid for quick access
         stats_by_user = {s["userid"]: s for s in stats}
         students: list[APIStudent] = []

lms/views/dashboard/api/course.py

@@ -8,6 +8,7 @@
     APICourses,
     CourseMetrics,
 )
+from lms.models import RoleScope, RoleType
 from lms.security import Permissions
 from lms.services.h_api import HAPI
 from lms.services.organization import OrganizationService
@@ -71,11 +72,16 @@ def course(self) -> APICourse:
     )
     def course_assignments(self) -> APIAssignments:
         course = get_request_course(self.request, self.course_service)
+        course_students = self.course_service.get_members(
+            course, role_scope=RoleScope.COURSE, role_type=RoleType.LEARNER
+        )
 
-        stats = self.h_api.get_course_stats(
-            # Annotations in the course group an any children
+        stats = self.h_api.get_annotation_counts(
+            # Annotations in the course group and any children
             [course.authority_provided_id]
-            + [child.authority_provided_id for child in course.children]
+            + [child.authority_provided_id for child in course.children],
+            group_by="assignment",
+            h_userids=[s.h_userid for s in course_students],
         )
         # Organize the H stats by assignment ID for quick access
         stats_by_assignment = {s["assignment_id"]: s for s in stats}

tests/unit/lms/services/h_api_test.py

@@ -132,37 +132,48 @@ def test_get_annotations(
         assert result == expected_result
 
     @pytest.mark.parametrize(
-        "method,url,args,payload",
+        "kwargs,payload",
         [
             (
-                "get_assignment_stats",
-                "https://h.example.com/private/api/bulk/stats/users",
-                (["group_1", "group_2"], "assignment_id"),
                 {
+                    "group_authority_ids": ["group_1", "group_2"],
+                    "group_by": "user",
+                    "resource_link_id": "assignment_id",
+                },
+                {
+                    "group_by": "user",
                     "filter": {
                         "groups": ["group_1", "group_2"],
                         "assignment_id": "assignment_id",
                     },
                 },
             ),
             (
-                "get_course_stats",
-                "https://h.example.com/private/api/bulk/stats/assignments",
-                (["group_1", "group_2"],),
                 {
-                    "filter": {"groups": ["group_1", "group_2"]},
+                    "group_authority_ids": ["group_1", "group_2"],
+                    "group_by": "user",
+                    "resource_link_id": "assignment_id",
+                    "h_userids": ["user_1", "user_2"],
+                },
+                {
+                    "group_by": "user",
+                    "filter": {
+                        "groups": ["group_1", "group_2"],
+                        "assignment_id": "assignment_id",
+                        "h_userids": ["user_1", "user_2"],
+                    },
                 },
             ),
         ],
     )
-    def test_get_stats_endpoints(self, h_api, http_service, method, url, args, payload):
+    def test_get_annotation_counts(self, h_api, http_service, kwargs, payload):
         http_service.request.return_value = factories.requests.Response(raw="{}")
 
-        getattr(h_api, method)(*args)
+        h_api.get_annotation_counts(**kwargs)
 
         http_service.request.assert_called_once_with(
             method="POST",
-            url=url,
+            url="https://h.example.com/private/api/bulk/lms/annotations",
             auth=("TEST_CLIENT_ID", "TEST_CLIENT_SECRET"),
             headers={
                 "Content-Type": "application/vnd.hypothesis.v1+json",

tests/unit/lms/views/dashboard/api/assignment_test.py

@@ -59,14 +59,15 @@ def test_assignment_stats(self, views, pyramid_request, assignment_service, h_ap
             },
         ]
 
-        h_api.get_assignment_stats.return_value = stats
+        h_api.get_annotation_counts.return_value = stats
 
         response = views.assignment_stats()
 
         assignment_service.get_by_id.assert_called_once_with(sentinel.id)
-        h_api.get_assignment_stats.assert_called_once_with(
+        h_api.get_annotation_counts.assert_called_once_with(
             [g.authority_provided_id for g in assignment.groupings],
-            assignment.resource_link_id,
+            group_by="user",
+            resource_link_id=assignment.resource_link_id,
         )
         expected = {
             "students": [

tests/unit/lms/views/dashboard/api/course_test.py

@@ -75,6 +75,7 @@ def test_course_assignments(
             assignment,
             assignment_with_no_annos,
         ]
+        course_service.get_members.return_value = factories.User.create_batch(5)
 
         db_session.flush()
 
@@ -88,12 +89,14 @@ def test_course_assignments(
             },
         ]
 
-        h_api.get_course_stats.return_value = stats
+        h_api.get_annotation_counts.return_value = stats
 
         response = views.course_assignments()
 
-        h_api.get_course_stats.assert_called_once_with(
-            [course.authority_provided_id, section.authority_provided_id]
+        h_api.get_annotation_counts.assert_called_once_with(
+            [course.authority_provided_id, section.authority_provided_id],
+            group_by="assignment",
+            h_userids=[u.h_userid for u in course_service.get_members.return_value],
         )
         assert response == {
             "assignments": [