fix complete upload test

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/services_http/storage.py

@@ -18,6 +18,7 @@
 )
 from models_library.api_schemas_storage.storage_schemas import (
     FileUploadCompleteFutureResponse,
+    FileUploadCompleteResponse,
     FileUploadCompleteState,
     FileUploadSchema,
     LinkType,
@@ -30,7 +31,6 @@
 from settings_library.tracing import TracingSettings
 from simcore_service_api_server.models.schemas.files import UserFile
 from simcore_service_api_server.models.schemas.jobs import UserFileToProgramJob
-from simcore_service_storage.api.rest._files import FileUploadCompleteResponse
 from starlette.datastructures import URL
 from tenacity import (
     AsyncRetrying,
@@ -208,7 +208,7 @@ async def complete_file_upload(self, *, user_id: int, file: File) -> ETag:
         response.raise_for_status()
         file_upload_complete_response = Envelope[
             FileUploadCompleteResponse
-        ].model_validate_json(await response.json())
+        ].model_validate_json(response.text)
         assert file_upload_complete_response.data  # nosec
         state_url = f"{file_upload_complete_response.data.links.state}"
         async for attempt in AsyncRetrying(
@@ -223,7 +223,7 @@ async def complete_file_upload(self, *, user_id: int, file: File) -> ETag:
                 resp.raise_for_status()
                 future_enveloped = Envelope[
                     FileUploadCompleteFutureResponse
-                ].model_validate_json(await resp.json())
+                ].model_validate_json(resp.text)
                 assert future_enveloped.data  # nosec
                 if future_enveloped.data.state == FileUploadCompleteState.NOK:
                     msg = "upload not ready yet"

services/api-server/tests/unit/conftest.py

@@ -12,6 +12,7 @@
 from pathlib import Path
 from typing import Any
 from unittest.mock import MagicMock
+from urllib.parse import urlparse, urlunparse
 
 import aiohttp.test_utils
 import httpx
@@ -22,13 +23,16 @@
 from faker import Faker
 from fastapi import FastAPI, status
 from fastapi.encoders import jsonable_encoder
-from httpx import ASGITransport
+from httpx import ASGITransport, Request, Response
 from models_library.api_schemas_long_running_tasks.tasks import (
     TaskGet,
     TaskProgress,
     TaskStatus,
 )
 from models_library.api_schemas_storage.storage_schemas import (
+    FileUploadCompleteFutureResponse,
+    FileUploadCompleteResponse,
+    FileUploadCompleteState,
     FileUploadSchema,
     HealthCheck,
 )
@@ -443,15 +447,51 @@ def mocked_storage_rest_api_base(
         )
 
         # Add mocks for completion and abort endpoints
+        def generate_future_link(request: Request, **kwargs):
+            parsed_url = urlparse(f"{request.url}")
+            stripped_url = urlunparse(
+                (parsed_url.scheme, parsed_url.netloc, parsed_url.path, "", "", "")
+            )
+
+            payload = FileUploadCompleteResponse.model_validate(
+                {
+                    "links": {
+                        "state": stripped_url
+                        + ":complete/futures/"
+                        + str(faker.uuid4())
+                    },
+                },
+            )
+            return Response(
+                status_code=status.HTTP_200_OK,
+                json=jsonable_encoder(
+                    Envelope[FileUploadCompleteResponse](data=payload)
+                ),
+            )
+
         respx_mock.post(
             re.compile(
-                r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files/.+complete"
+                r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files/.+complete(?:\?.*)?$"
             ),
             name="complete_upload_file_v0_locations__location_id__files__file_id__complete_post",
+        ).side_effect = generate_future_link
+
+        respx_mock.post(
+            re.compile(
+                r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files/.+complete/futures/.+"
+            )
         ).respond(
-            status.HTTP_202_ACCEPTED,
-            json=Envelope[dict](data={"state": "ok"}).model_dump(mode="json"),
+            status_code=status.HTTP_200_OK,
+            json=jsonable_encoder(
+                Envelope[FileUploadCompleteFutureResponse](
+                    data=FileUploadCompleteFutureResponse(
+                        state=FileUploadCompleteState.OK,
+                        e_tag="07d1c1a4-b073-4be7-b022-f405d90e99aa",
+                    )
+                )
+            ),
         )
+
         respx_mock.post(
             re.compile(
                 r"^http://[a-z\-_]*storage:[0-9]+/v0/locations/[0-9]+/files/.+:abort$"

services/api-server/tests/unit/test_api_files.py

@@ -236,12 +236,10 @@ async def test_get_upload_links(
     follow_up_request: str,
     client: AsyncClient,
     auth: httpx.BasicAuth,
-    storage_v0_service_mock: AioResponsesMock,
+    mocked_storage_rest_api_base: MockRouter,
 ):
     """Test that we can get data needed for performing multipart upload directly to S3"""
 
-    assert storage_v0_service_mock  # nosec
-
     msg = {
         "filename": DummyFileData.file().filename,
         "filesize": DummyFileData.file_size(),