test coming up

Author: sanderegg

services/storage/src/simcore_service_storage/api/rest/_files.py

@@ -3,8 +3,8 @@
 from typing import Annotated, cast
 
 from fastapi import APIRouter, Depends, Header, HTTPException, Request
-from fastapi_pagination import create_page
-from fastapi_pagination.links import Page
+from fastapi_pagination import LimitOffsetPage, create_page
+from fastapi_pagination.limit_offset import LimitOffsetParams
 from models_library.api_schemas_storage import (
     FileMetaDataGet,
     FileMetaDataGetv010,
@@ -53,21 +53,20 @@
 
 @router.get(
     "/locations/{location_id}/paths",
-    response_model=Page[FileMetaDataGet],
+    response_model=LimitOffsetPage[FileMetaDataGet],
 )
 async def list_paths(
-    location_id: LocationID,
     query_params: Annotated[ListPathsQueryParams, Depends()],
+    page_params: Annotated[LimitOffsetParams, Depends()],
     dsm: Annotated[BaseDataManager, Depends(get_data_manager)],
 ):
-    assert location_id  # nosec
-    data: list[FileMetaData] = await dsm.list_files_paginated(
+    data = await dsm.list_files_paginated(
         user_id=query_params.user_id,
         file_filter=query_params.file_filter,
-        limit=20,
-        offset=0,
+        limit=page_params.limit,
+        offset=page_params.offset,
     )
-    return create_page(data, total=20)
+    return create_page(data, total=20, params=page_params)
 
 
 @router.get(

services/storage/tests/unit/test_handlers_files.py

@@ -26,6 +26,7 @@
 from aws_library.s3._constants import MULTIPART_UPLOADS_MIN_TOTAL_SIZE
 from faker import Faker
 from fastapi import FastAPI
+from fastapi_pagination import LimitOffsetPage
 from models_library.api_schemas_storage import (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
@@ -1533,4 +1534,21 @@ async def test_list_paths(
     location_id: LocationID,
     user_id: UserID,
 ):
-    ...
+    query = {
+        "user_id": user_id,
+        "file_filter": None,
+    }
+    url = url_from_operation_id(
+        client, initialized_app, "list_paths", location_id=f"{location_id}"
+    ).with_query(**{k: v for k, v in query.items() if v is not None})
+    response = await client.get(f"{url}")
+
+    page_of_files, _ = assert_status(
+        response,
+        status.HTTP_200_OK,
+        LimitOffsetPage[FileMetaDataGet],
+        expect_envelope=False,
+    )
+    assert page_of_files
+    assert page_of_files.items == []
+    assert page_of_files.total == 0