Release v0.1.4

src/govoplan_files/backend/storage/transfers.py

@@ -69,17 +69,13 @@ def transfer_selection(
             if target_folder == folder_path or target_folder.startswith(f"{folder_path}/"):
                 raise FileStorageError("Cannot move a folder into itself or one of its child folders")
 
-    assets_by_id: dict[str, FileAsset] = {}
-    for file_id in file_ids:
-        asset = get_asset_for_user(
-            session,
-            tenant_id=tenant_id,
-            user_id=user_id,
-            asset_id=file_id,
-            require_write=operation == "move",
-            is_admin=is_admin,
-        )
-        assets_by_id[asset.id] = asset
+    assets_by_id = _selected_assets_for_owner(
+        session,
+        tenant_id=tenant_id,
+        owner_type=source_owner_type,
+        owner_id=source_owner_id,
+        file_ids=file_ids,
+    )
 
     folder_asset_targets: dict[str, str] = {}
     folder_target_paths: dict[str, str] = {}
@@ -297,6 +293,33 @@ def _collapse_folder_roots(folder_paths: list[str]) -> list[str]:
     return collapsed
 
 
+def _selected_assets_for_owner(
+    session: Session,
+    *,
+    tenant_id: str,
+    owner_type: str,
+    owner_id: str,
+    file_ids: list[str],
+) -> dict[str, FileAsset]:
+    selected_file_ids = list(dict.fromkeys(file_ids))
+    if not selected_file_ids:
+        return {}
+    assets = {
+        asset.id: asset
+        for asset in _asset_query_for_owner(
+            session,
+            tenant_id=tenant_id,
+            owner_type=owner_type,
+            owner_id=owner_id,
+        )
+        .filter(FileAsset.id.in_(selected_file_ids), FileAsset.deleted_at.is_(None))
+        .all()
+    }
+    if len(assets) != len(selected_file_ids):
+        raise FileStorageError("File not found")
+    return assets
+
+
 def _path_under_root(path: str, root: str) -> bool:
     normalized = normalize_logical_path(path)
     return normalized == root or normalized.startswith(f"{root}/")
@@ -349,13 +372,26 @@ def rename_selection(
     if mode == "direct" and (len(selected_file_ids) + len(selected_folder_roots)) != 1:
         raise FileStorageError("Direct rename requires exactly one selected item")
 
-    assets: dict[str, FileAsset] = {}
-    for file_id in selected_file_ids:
-        asset = get_asset_for_user(session, tenant_id=tenant_id, user_id=user_id, asset_id=file_id, require_write=True, is_admin=is_admin)
-        assets[asset.id] = asset
-
     owner_type_norm = owner_type.lower().strip() if owner_type else None
     owner_id_norm = owner_id
+    assets: dict[str, FileAsset] = {}
+    if selected_file_ids:
+        if owner_type_norm and owner_id_norm:
+            ensure_owner_access(session, tenant_id=tenant_id, owner_type=owner_type_norm, owner_id=owner_id_norm, user_id=user_id, is_admin=is_admin)
+            assets.update(
+                _selected_assets_for_owner(
+                    session,
+                    tenant_id=tenant_id,
+                    owner_type=owner_type_norm,
+                    owner_id=owner_id_norm,
+                    file_ids=selected_file_ids,
+                )
+            )
+        else:
+            for file_id in selected_file_ids:
+                asset = get_asset_for_user(session, tenant_id=tenant_id, user_id=user_id, asset_id=file_id, require_write=True, is_admin=is_admin)
+                assets[asset.id] = asset
+
     folder_rows_by_path: dict[str, FileFolder] = {}
     affected_folder_paths: set[str] = set()
     if selected_folder_roots and owner_type_norm and owner_id_norm: