fix file deletion

Author: giancarloromeo

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -499,6 +499,18 @@ async def __get_link(
 
         return link
 
+    def find_enclosing(self, file_id: str, kwnown_file_ids: list[str]) -> str | None:
+        current_path = Path(file_id)
+        kwnon_file_paths = [Path(file_id) for file_id in kwnown_file_ids]
+
+        while current_path and current_path != Path(current_path).parent:
+            if current_path in kwnon_file_paths:
+                return f"{current_path}"
+
+            current_path = Path(current_path).parent
+
+        return None
+
     async def delete_file(
         self,
         user_id: UserID,
@@ -523,22 +535,33 @@ async def delete_file(
                 if not can.delete:
                     raise FileAccessRightError(access_right="delete", file_id=file_id)
 
-        with suppress(FileMetaDataNotFoundError):
-            # NOTE: deleting might be slow, so better ensure we release the connection
-            async with self.engine.acquire() as conn:
-                file: FileMetaDataAtDB = await db_file_meta_data.get(
-                    conn, TypeAdapter(SimcoreS3FileID).validate_python(file_id)
-                )
+        # NOTE: deleting might be slow, so better ensure we release the connection
+        async with self.engine.acquire() as conn:
+            enclosing_file_id = self.find_enclosing(
+                file_id,
+                [
+                    known_file.file_id
+                    for known_file in await db_file_meta_data.list_fmds(
+                        conn, user_id=user_id
+                    )
+                ],
+            )
+
+            enclosing_file = await db_file_meta_data.get(
+                conn, TypeAdapter(SimcoreS3FileID).validate_python(enclosing_file_id)
+            )
+
+            if await db_file_meta_data.exists(conn, file_id):
+                await db_file_meta_data.delete(conn, [file_id])
+
             await get_s3_client(self.app).delete_objects_recursively(
-                bucket=file.bucket_name,
+                bucket=enclosing_file.bucket_name,
                 prefix=(
-                    ensure_ends_with(file.file_id, "/")
-                    if file.is_directory
-                    else file.file_id
+                    ensure_ends_with(enclosing_file.file_id, "/")
+                    if enclosing_file.is_directory and enclosing_file_id == file_id
+                    else file_id
                 ),
             )
-            async with self.engine.acquire() as conn:
-                await db_file_meta_data.delete(conn, [file.file_id])
 
     async def delete_project_simcore_s3(
         self, user_id: UserID, project_id: ProjectID, node_id: NodeID | None = None

services/storage/tests/unit/test_handlers_files.py

@@ -1386,6 +1386,27 @@ async def test_upload_file_is_directory_and_remove_content(
     )
     assert len(list_of_files) == SUBDIR_COUNT * FILE_COUNT
 
+    # DELETE ONE FILE FROM THE DIRECTORY
+
+    assert client.app
+    delete_url = (
+        client.app.router["delete_file"]
+        .url_for(
+            location_id=f"{location_id}",
+            file_id=urllib.parse.quote(list_of_files[0].file_id, safe=""),
+        )
+        .with_query(user_id=user_id)
+    )
+    response = await client.delete(f"{delete_url}")
+    _, error = await assert_status(response, status.HTTP_204_NO_CONTENT)
+    assert error is None
+
+    list_of_files: list[FileMetaDataGet] = await _list_files_legacy(
+        client, user_id, location_id, directory_file_upload
+    )
+
+    assert len(list_of_files) == SUBDIR_COUNT * FILE_COUNT - 1
+
     # DIRECTORY REMOVAL
 
     await delete_directory(directory_file_upload=directory_file_upload)