Skip to content

Commit 990ad67

Browse files
committed
test handlers green
1 parent 3605c4a commit 990ad67

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ async def complete_upload_file(
287287

288288
@router.post(
289289
"/locations/{location_id}/files/{file_id:path}:complete/futures/{future_id}",
290-
response_model=FileUploadCompleteFutureResponse,
290+
response_model=Envelope[FileUploadCompleteFutureResponse],
291291
)
292292
async def is_completed_upload_file(
293293
query_params: Annotated[StorageQueryParamsBase, Depends()],
@@ -315,16 +315,18 @@ async def is_completed_upload_file(
315315
response = FileUploadCompleteFutureResponse(
316316
state=FileUploadCompleteState.NOK
317317
)
318-
return response
318+
return Envelope[FileUploadCompleteFutureResponse](data=response)
319319
# there is no task, either wrong call or storage was restarted
320320
# we try to get the file to see if it exists in S3
321321
dsm = get_dsm_provider(request.app).get(location_id)
322322
if fmd := await dsm.get_file(
323323
user_id=query_params.user_id,
324324
file_id=file_id,
325325
):
326-
return FileUploadCompleteFutureResponse(
327-
state=FileUploadCompleteState.OK, e_tag=fmd.entity_tag
326+
return Envelope[FileUploadCompleteFutureResponse](
327+
data=FileUploadCompleteFutureResponse(
328+
state=FileUploadCompleteState.OK, e_tag=fmd.entity_tag
329+
)
328330
)
329331
raise HTTPException(
330332
status.HTTP_404_NOT_FOUND,

services/storage/src/simcore_service_storage/core/application.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
9696

9797
app.add_middleware(GZipMiddleware)
9898

99+
app.add_middleware(BaseHTTPMiddleware, dispatch=timing_middleware.log_request)
100+
99101
if settings.STORAGE_TRACING:
100102
setup_tracing(app, settings.STORAGE_TRACING, APP_NAME)
101103
if settings.STORAGE_MONITORING_ENABLED:

services/storage/src/simcore_service_storage/utils/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def is_file_entry_valid(file_metadata: FileMetaData | FileMetaDataAtDB) -> bool:
6868

6969

7070
def create_upload_completion_task_name(user_id: UserID, file_id: StorageFileID) -> str:
71-
return f"upload_complete_task_{user_id}_{urllib.parse.quote(file_id, safe='')}"
71+
return f"upload_complete_task_{user_id}_{urllib.parse.quote(file_id.replace('/', '_'), safe='')}"
7272

7373

7474
def is_valid_managed_multipart_upload(upload_id: UploadID | None) -> bool:

0 commit comments

Comments
 (0)