Integrate querying by user_id into existing usage endpoint

this removes rendundancy

Author: eikek

components/renku_data_services/resource_usage/api.spec.yaml

@@ -10,51 +10,15 @@ servers:
   - url: /api/data
 paths:
   /resource_pools/{resource_pool_id}/usage:
-    get:
-      summary: "Get usage and limits of the supplied pool. If a `start_date` is not given, the usage of the current week is returned."
-      parameters:
-        - in: path
-          name: resource_pool_id
-          required: true
-          schema:
-            type: integer
-        - in: query
-          name: start_date
-          required: false
-          schema:
-            type: string
-            format: date
-        - in: query
-          name: end_date
-          required: false
-          schema:
-            type: string
-            format: date
-      responses:
-        "200":
-          description: "Return the pool limits and current usage."
-          content:
-            "application/json":
-              schema:
-                $ref: "#/components/schemas/ResourcePoolUsage"
-        "404":
-          description: "The resource pool doesn't exist."
-          content:
-            "application/json":
-              schema:
-                $ref: "#/components/schemas/ErrorResponse"
-        default:
-          $ref: "#/components/responses/Error"
-      tags:
-        - resource-usage
-
-  /resource_pools/{resource_pool_id}/admin_usage:
     get:
       summary: |
         Get usage and limits of the supplied pool. If a `start_date`
-        is not given, the usage of the current week is returned. This
-        endpoint is only available to admins and it allows to specify
-        a user_id query parameter to check usages for any user.
+        is not given, the usage of the current week is returned.
+
+        A query parameter `user_id` can be specified and the current
+        user is used if this is not present. This endpoint requires
+        admin privileges, if the `user_id` query parameter is not the
+        current user.
       parameters:
         - in: path
           name: resource_pool_id

components/renku_data_services/resource_usage/apispec.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2026-03-04T10:36:46+00:00
+#   timestamp: 2026-03-13T14:07:21+00:00
 
 from __future__ import annotations
 
@@ -87,6 +87,7 @@ class Ulid(RootModel[str]):
 class ResourcePoolsResourcePoolIdUsageGetParametersQuery(BaseAPISpec):
     start_date: Optional[date] = None
     end_date: Optional[date] = None
+    user_id: Optional[str] = None
 
 
 class ResourcePoolUsage(BaseAPISpec):

components/renku_data_services/resource_usage/blueprints.py

@@ -144,53 +144,19 @@ def get_pool_usage(self) -> BlueprintFactoryResponse:
 
         @authenticate(self.authenticator)
         @validate_db_ids
-        async def _get(req: Request, user: base_models.APIUser, resource_pool_id: int) -> HTTPResponse:
-            start_date = self._extract_date(req, "start_date")
-            end_date = self._extract_date(req, "end_date")
-            result: model.ResourcePoolUsage | None = None
-            if start_date:
-                result = await self.rr_svc.get_for_date(resource_pool_id, user.id or "", start_date, end_date)
-            else:
-                result = await self.rr_svc.get_running_week(resource_pool_id, user.id or "")
-            if result:
-                output = apispec.ResourcePoolUsage(
-                    total_usage=apispec.ResourceUsageSummary(
-                        runtime=result.total_usage.runtime_hours, cost=result.total_usage.cost.value
-                    ),
-                    pool_limits=apispec.ResourcePoolLimits(
-                        pool_id=result.pool_limits.pool_id,
-                        total_limit=result.pool_limits.total_limit.value,
-                        user_limit=result.pool_limits.user_limit.value,
-                    ),
-                    user_usage=apispec.ResourceUsageSummary(
-                        runtime=result.user_usage.runtime_hours, cost=result.user_usage.cost.value
-                    ),
-                )
-                return validated_json(
-                    apispec.ResourcePoolUsage,
-                    output,
-                )
-            else:
-                raise errors.MissingResourceError()
-
-        return "/resource_pools/<resource_pool_id>/usage", ["GET"], _get
-
-    def get_admin_pool_usage(self) -> BlueprintFactoryResponse:
-        """Get usage of a pool."""
-
-        @authenticate(self.authenticator)
-        @only_admins
-        @validate_db_ids
         async def _get(req: Request, user: base_models.APIUser, resource_pool_id: int) -> HTTPResponse:
             start_date = self._extract_date(req, "start_date")
             end_date = self._extract_date(req, "end_date")
             user_id = req.args.get("user_id")
-            uid = str(user_id) if user_id else user.id or ""
+            user_id = str(user_id) if user_id else user.id
+            if user_id != user.id and (user.access_token is None or not user.is_admin):
+                raise errors.ForbiddenError(message="You do not have the required permissions for this operation.")
+
             result: model.ResourcePoolUsage | None = None
             if start_date:
-                result = await self.rr_svc.get_for_date(resource_pool_id, uid, start_date, end_date)
+                result = await self.rr_svc.get_for_date(resource_pool_id, user_id or "", start_date, end_date)
             else:
-                result = await self.rr_svc.get_running_week(resource_pool_id, uid)
+                result = await self.rr_svc.get_running_week(resource_pool_id, user_id or "")
             if result:
                 output = apispec.ResourcePoolUsage(
                     total_usage=apispec.ResourceUsageSummary(
@@ -212,4 +178,4 @@ async def _get(req: Request, user: base_models.APIUser, resource_pool_id: int) -
             else:
                 raise errors.MissingResourceError()
 
-        return "/resource_pools/<resource_pool_id>/admin_usage", ["GET"], _get
+        return "/resource_pools/<resource_pool_id>/usage", ["GET"], _get

test/bases/renku_data_services/data_api/test_resource_usage.py

@@ -0,0 +1,76 @@
+from copy import deepcopy
+
+import pytest
+from sanic_testing.testing import SanicASGITestClient
+
+from test.bases.renku_data_services.data_api.utils import create_rp
+from test.utils import KindCluster
+
+resource_pool_payload = {
+    "name": "test-name",
+    "classes": [
+        {
+            "cpu": 1.0,
+            "memory": 10,
+            "gpu": 0,
+            "name": "test-class-name",
+            "max_storage": 100,
+            "default_storage": 1,
+            "default": True,
+            "node_affinities": [],
+            "tolerations": [],
+        }
+    ],
+    "quota": {"cpu": 100, "memory": 100, "gpu": 0},
+    "default": False,
+    "public": True,
+    "idle_threshold": 86400,
+    "hibernation_threshold": 99999,
+    "hibernation_warning_period": 888,
+}
+
+
+async def create_resource_pool(sanic_client: SanicASGITestClient) -> int:
+    payload = deepcopy(resource_pool_payload)
+    _, res = await create_rp(payload, sanic_client)
+    assert res.status_code == 201, res.text
+    assert res.json is not None
+    return res.json["id"]
+
+
+@pytest.mark.asyncio
+@pytest.mark.xdist_group("sessions")  # Needs to run on the same worker as the rest of the sessions tests
+async def test_resource_usage_for_user(
+    sanic_client: SanicASGITestClient,
+    cluster: KindCluster,
+) -> None:
+    rp_id = await create_resource_pool(sanic_client)
+    _, res = await sanic_client.get(
+        f"/api/data/resource_pools/{rp_id}/usage",
+        headers={"Authorization": 'Bearer {"is_admin": false}'},
+    )
+
+    assert "total_usage" in res.json
+    assert "user_usage" in res.json
+
+
+@pytest.mark.asyncio
+@pytest.mark.xdist_group("sessions")  # Needs to run on the same worker as the rest of the sessions tests
+async def test_resource_usage_for_admin(
+    sanic_client: SanicASGITestClient,
+    cluster: KindCluster,
+) -> None:
+    rp_id = await create_resource_pool(sanic_client)
+    _, res = await sanic_client.get(
+        f"/api/data/resource_pools/{rp_id}/usage?user_id=123",
+        headers={"Authorization": 'Bearer {"is_admin": false}'},
+    )
+
+    assert res.status_code == 403, res.text
+
+    _, res = await sanic_client.get(
+        f"/api/data/resource_pools/{rp_id}/usage?user_id=123",
+        headers={"Authorization": 'Bearer {"is_admin": true}'},
+    )
+
+    assert res.status_code == 200, res.text