enhance implementation

Author: giancarloromeo

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -79,11 +79,7 @@
 from .s3 import get_s3_client
 from .s3_utils import S3TransferDataCB, update_task_progress
 from .settings import Settings
-from .simcore_s3_dsm_utils import (
-    expand_directory,
-    find_enclosing_file,
-    get_directory_file_id,
-)
+from .simcore_s3_dsm_utils import expand_directory, get_directory_file_id, get_fmd
 from .utils import (
     convert_db_to_model,
     download_to_file_or_raise,
@@ -527,19 +523,23 @@ async def delete_file(
                 if not can.delete:
                     raise FileAccessRightError(access_right="delete", file_id=file_id)
 
-            enclosing_file = await find_enclosing_file(conn, user_id, file_id)
-            if enclosing_file:
-                if enclosing_file.file_id == file_id:
-                    await db_file_meta_data.delete(conn, [file_id])
-                else:
-                    enclosing_file.file_size = UNDEFINED_SIZE_TYPE
-                    await db_file_meta_data.upsert(conn, enclosing_file)
-
         await get_s3_client(self.app).delete_objects_recursively(
             bucket=self.simcore_bucket_name,
             prefix=file_id,
         )
 
+        async with self.engine.acquire() as conn:
+            file_fmd = await get_fmd(conn, file_id)
+            if file_fmd and not file_fmd.is_directory:
+                enclosing_dir_file_id = await get_directory_file_id(conn, file_id)
+                if enclosing_dir_file_id:
+                    enclosing_dir_fmd = await db_file_meta_data.get(
+                        conn, enclosing_dir_file_id
+                    )
+                    enclosing_dir_fmd.file_size = -1
+                    await db_file_meta_data.upsert(conn, enclosing_dir_fmd)
+            await db_file_meta_data.delete(conn, [file_id])
+
     async def delete_project_simcore_s3(
         self, user_id: UserID, project_id: ProjectID, node_id: NodeID | None = None
     ) -> None:

services/storage/src/simcore_service_storage/simcore_s3_dsm_utils.py

@@ -14,7 +14,7 @@
 
 from . import db_file_meta_data
 from .exceptions import FileMetaDataNotFoundError
-from .models import FileMetaData, FileMetaDataAtDB, UserID
+from .models import FileMetaData, FileMetaDataAtDB
 from .utils import convert_db_to_model
 
 
@@ -78,6 +78,16 @@ async def expand_directory(
     return result
 
 
+async def get_fmd(
+    conn: SAConnection, s3_file_id: StorageFileID
+) -> FileMetaDataAtDB | None:
+    with suppress(FileMetaDataNotFoundError):
+        return await db_file_meta_data.get(
+            conn, TypeAdapter(SimcoreS3FileID).validate_python(s3_file_id)
+        )
+    return None
+
+
 def get_simcore_directory(file_id: SimcoreS3FileID) -> str:
     try:
         directory_id = SimcoreS3DirectoryID.from_simcore_s3_object(file_id)
@@ -94,16 +104,7 @@ async def get_directory_file_id(
     in the `file_meta_data` table
     """
 
-    async def _get_fmd(
-        conn: SAConnection, s3_file_id: StorageFileID
-    ) -> FileMetaDataAtDB | None:
-        with suppress(FileMetaDataNotFoundError):
-            return await db_file_meta_data.get(
-                conn, TypeAdapter(SimcoreS3FileID).validate_python(s3_file_id)
-            )
-        return None
-
-    provided_file_id_fmd = await _get_fmd(conn, file_id)
+    provided_file_id_fmd = await get_fmd(conn, file_id)
     if provided_file_id_fmd:
         # file_meta_data exists it is not a directory
         return None
@@ -116,23 +117,6 @@ async def _get_fmd(
     directory_file_id = TypeAdapter(SimcoreS3FileID).validate_python(
         directory_file_id_str
     )
-    directory_file_id_fmd = await _get_fmd(conn, directory_file_id)
+    directory_file_id_fmd = await get_fmd(conn, directory_file_id)
 
     return directory_file_id if directory_file_id_fmd else None
-
-
-async def find_enclosing_file(
-    conn: SAConnection, user_id: UserID, file_id: SimcoreS3FileID
-) -> FileMetaDataAtDB | None:
-    known_files = {
-        Path(known_file.file_id): known_file
-        for known_file in await db_file_meta_data.list_fmds(conn, user_id=user_id)
-    }
-    current_path = Path(file_id)
-    while current_path and current_path != Path(current_path).parent:
-        if current_path in known_files:
-            return known_files.get(current_path)
-
-        current_path = Path(current_path).parent
-
-    return None