refactor(server): file_management_service: move all method without owner check into private, add folder_ports

src/application/ports/file_ports.rs

@@ -254,58 +254,34 @@ pub trait FileRetrievalUseCase: Send + Sync + 'static {
     }
 }
 
-// ─────────────────────────────────────────────────────
-// Management port (delete, move)
-// ─────────────────────────────────────────────────────
-
 /// Primary port for file management operations
 pub trait FileManagementUseCase: Send + Sync + 'static {
-    /// Moves a file to another folder (system/internal — no ownership check).
-    async fn move_file(
-        &self,
-        file_id: &str,
-        folder_id: Option<String>,
-    ) -> Result<FileDto, DomainError>;
-
     /// Moves a file, enforcing that `caller_id` is the owner.
-    async fn move_file_owned(
+    async fn move_file_with_perms(
         &self,
         file_id: &str,
         caller_id: Uuid,
         folder_id: Option<String>,
     ) -> Result<FileDto, DomainError>;
 
-    /// Copies a file to another folder (zero-copy with dedup).
-    async fn copy_file(
-        &self,
-        file_id: &str,
-        target_folder_id: Option<String>,
-    ) -> Result<FileDto, DomainError>;
-
     /// Copies a file, enforcing that `caller_id` is the owner.
-    async fn copy_file_owned(
+    async fn copy_file_with_perms(
         &self,
         file_id: &str,
         caller_id: Uuid,
         target_folder_id: Option<String>,
     ) -> Result<FileDto, DomainError>;
 
-    /// Renames a file (system/internal — no ownership check).
-    async fn rename_file(&self, file_id: &str, new_name: &str) -> Result<FileDto, DomainError>;
-
     /// Renames a file, enforcing that `caller_id` is the owner.
-    async fn rename_file_owned(
+    async fn rename_file_with_perms(
         &self,
         file_id: &str,
         caller_id: Uuid,
         new_name: &str,
     ) -> Result<FileDto, DomainError>;
 
-    /// Deletes a file (system/internal — no ownership check).
-    async fn delete_file(&self, id: &str) -> Result<(), DomainError>;
-
     /// Deletes a file, enforcing that `caller_id` is the owner.
-    async fn delete_file_owned(&self, id: &str, caller_id: Uuid) -> Result<(), DomainError>;
+    async fn delete_file_with_perms(&self, id: &str, caller_id: Uuid) -> Result<(), DomainError>;
 
     /// Smart delete: trash-first with dedup reference cleanup.
     ///
@@ -314,30 +290,22 @@ pub trait FileManagementUseCase: Send + Sync + 'static {
     /// 3. Decrements the dedup reference count for the content hash.
     ///
     /// Returns `Ok(true)` when trashed, `Ok(false)` when permanently deleted.
-    async fn delete_with_cleanup(&self, id: &str, user_id: Uuid) -> Result<bool, DomainError>;
+    async fn delete_and_cleanup_with_perms(
+        &self,
+        id: &str,
+        user_id: Uuid,
+    ) -> Result<bool, DomainError>;
 
     /// Copies an entire folder subtree atomically (WebDAV COPY Depth: infinity).
+    /// enforcing that `caller_id` owns both the source folder
+    /// and the target parent folder.
     ///
     /// Creates a copy of `source_folder_id` (with optional name override) under
     /// `target_parent_id`, including ALL sub-folders and files. Files are
     /// zero-copy (blob ref_counts incremented in batch).
     ///
     /// Default: returns error (only available with PostgreSQL backend).
-    async fn copy_folder_tree(
-        &self,
-        _source_folder_id: &str,
-        _target_parent_id: Option<String>,
-        _dest_name: Option<String>,
-    ) -> Result<CopyFolderTreeResult, DomainError> {
-        Err(DomainError::internal_error(
-            "FileManagement",
-            "copy_folder_tree not implemented",
-        ))
-    }
-
-    /// Copies a folder tree, enforcing that `caller_id` owns both the source folder
-    /// and the target parent folder.
-    async fn copy_folder_tree_owned(
+    async fn copy_folder_tree_with_perms(
         &self,
         source_folder_id: &str,
         caller_id: Uuid,

src/application/ports/folder_ports.rs

@@ -0,0 +1,94 @@
+/// Primary port for folder operations
+use uuid::Uuid;
+
+use crate::application::dtos::folder_dto::{
+    CreateFolderDto, FolderDto, MoveFolderDto, RenameFolderDto,
+};
+
+use crate::common::errors::DomainError;
+
+pub trait FolderUseCase: Send + Sync + 'static {
+    /// Creates a new folder
+    async fn create_folder_with_perms(
+        &self,
+        dto: CreateFolderDto,
+        caller_id: Uuid,
+    ) -> Result<FolderDto, DomainError>;
+
+    /// Gets a folder by its ID
+    async fn get_folder(&self, id: &str) -> Result<FolderDto, DomainError>;
+
+    /// Gets a folder by its ID, enforcing that `caller_id` is the owner.
+    ///
+    /// Returns `NotFound` if the folder does not exist **or** belongs to
+    /// another user.  All user-facing handlers should use this method.
+    async fn get_folder_with_perms(
+        &self,
+        id: &str,
+        caller_id: Uuid,
+    ) -> Result<FolderDto, DomainError>;
+
+    /// Gets a folder by its path
+    async fn get_folder_by_path(&self, path: &str) -> Result<FolderDto, DomainError>;
+
+    /// Lists folders within a parent folder
+    async fn list_folders(&self, parent_id: Option<&str>) -> Result<Vec<FolderDto>, DomainError>;
+
+    /// Lists folders scoped to a specific owner (for user-facing endpoints).
+    /// At root level, only returns folders belonging to this user.
+    async fn list_folders_for_owner(
+        &self,
+        parent_id: Option<&str>,
+        owner_id: Uuid,
+    ) -> Result<Vec<FolderDto>, DomainError>;
+
+    /// Lists folders with pagination
+    async fn list_folders_paginated(
+        &self,
+        parent_id: Option<&str>,
+        pagination: &crate::application::dtos::pagination::PaginationRequestDto,
+    ) -> Result<crate::application::dtos::pagination::PaginatedResponseDto<FolderDto>, DomainError>;
+
+    /// Lists folders with pagination, scoped to a specific owner.
+    async fn list_folders_for_owner_paginated(
+        &self,
+        parent_id: Option<&str>,
+        owner_id: Uuid,
+        pagination: &crate::application::dtos::pagination::PaginationRequestDto,
+    ) -> Result<crate::application::dtos::pagination::PaginatedResponseDto<FolderDto>, DomainError>;
+
+    /// Renames a folder (ownership verified against caller_id)
+    async fn rename_folder_with_perms(
+        &self,
+        id: &str,
+        dto: RenameFolderDto,
+        caller_id: Uuid,
+    ) -> Result<FolderDto, DomainError>;
+
+    /// Moves a folder to another parent (ownership verified against caller_id)
+    async fn move_folder_with_perms(
+        &self,
+        id: &str,
+        dto: MoveFolderDto,
+        caller_id: Uuid,
+    ) -> Result<FolderDto, DomainError>;
+
+    /// Deletes a folder (ownership verified against caller_id)
+    async fn delete_folder_with_perms(&self, id: &str, caller_id: Uuid) -> Result<(), DomainError>;
+
+    /// Creates a root-level home folder for a user during registration.
+    async fn create_home_folder(
+        &self,
+        user_id: Uuid,
+        name: String,
+    ) -> Result<FolderDto, DomainError>;
+
+    /// Lists every folder in a subtree rooted at `folder_id` (inclusive),
+    /// ordered by path.  Uses ltree `<@` — single GiST-indexed query.
+    ///
+    /// Default: returns an empty vec (stubs / mocks).
+    async fn list_subtree_folders(&self, folder_id: &str) -> Result<Vec<FolderDto>, DomainError> {
+        let _ = folder_id;
+        Ok(Vec::new())
+    }
+}

src/application/ports/inbound.rs

@@ -2,97 +2,11 @@ use std::sync::Arc;
 
 use uuid::Uuid;
 
-use crate::application::dtos::folder_dto::{
-    CreateFolderDto, FolderDto, MoveFolderDto, RenameFolderDto,
-};
 use crate::application::dtos::search_dto::{
     SearchCriteriaDto, SearchResultsDto, SearchSuggestionsDto,
 };
 use crate::common::errors::DomainError;
 
-/// Primary port for folder operations
-pub trait FolderUseCase: Send + Sync + 'static {
-    /// Creates a new folder
-    async fn create_folder(
-        &self,
-        dto: CreateFolderDto,
-        caller_id: Uuid,
-    ) -> Result<FolderDto, DomainError>;
-
-    /// Gets a folder by its ID
-    async fn get_folder(&self, id: &str) -> Result<FolderDto, DomainError>;
-
-    /// Gets a folder by its ID, enforcing that `caller_id` is the owner.
-    ///
-    /// Returns `NotFound` if the folder does not exist **or** belongs to
-    /// another user.  All user-facing handlers should use this method.
-    async fn get_folder_owned(&self, id: &str, caller_id: Uuid) -> Result<FolderDto, DomainError>;
-
-    /// Gets a folder by its path
-    async fn get_folder_by_path(&self, path: &str) -> Result<FolderDto, DomainError>;
-
-    /// Lists folders within a parent folder
-    async fn list_folders(&self, parent_id: Option<&str>) -> Result<Vec<FolderDto>, DomainError>;
-
-    /// Lists folders scoped to a specific owner (for user-facing endpoints).
-    /// At root level, only returns folders belonging to this user.
-    async fn list_folders_for_owner(
-        &self,
-        parent_id: Option<&str>,
-        owner_id: Uuid,
-    ) -> Result<Vec<FolderDto>, DomainError>;
-
-    /// Lists folders with pagination
-    async fn list_folders_paginated(
-        &self,
-        parent_id: Option<&str>,
-        pagination: &crate::application::dtos::pagination::PaginationRequestDto,
-    ) -> Result<crate::application::dtos::pagination::PaginatedResponseDto<FolderDto>, DomainError>;
-
-    /// Lists folders with pagination, scoped to a specific owner.
-    async fn list_folders_for_owner_paginated(
-        &self,
-        parent_id: Option<&str>,
-        owner_id: Uuid,
-        pagination: &crate::application::dtos::pagination::PaginationRequestDto,
-    ) -> Result<crate::application::dtos::pagination::PaginatedResponseDto<FolderDto>, DomainError>;
-
-    /// Renames a folder (ownership verified against caller_id)
-    async fn rename_folder(
-        &self,
-        id: &str,
-        dto: RenameFolderDto,
-        caller_id: Uuid,
-    ) -> Result<FolderDto, DomainError>;
-
-    /// Moves a folder to another parent (ownership verified against caller_id)
-    async fn move_folder(
-        &self,
-        id: &str,
-        dto: MoveFolderDto,
-        caller_id: Uuid,
-    ) -> Result<FolderDto, DomainError>;
-
-    /// Deletes a folder (ownership verified against caller_id)
-    async fn delete_folder(&self, id: &str, caller_id: Uuid) -> Result<(), DomainError>;
-
-    /// Creates a root-level home folder for a user during registration.
-    async fn create_home_folder(
-        &self,
-        user_id: Uuid,
-        name: String,
-    ) -> Result<FolderDto, DomainError>;
-
-    /// Lists every folder in a subtree rooted at `folder_id` (inclusive),
-    /// ordered by path.  Uses ltree `<@` — single GiST-indexed query.
-    ///
-    /// Default: returns an empty vec (stubs / mocks).
-    async fn list_subtree_folders(&self, folder_id: &str) -> Result<Vec<FolderDto>, DomainError> {
-        let _ = folder_id;
-        Ok(Vec::new())
-    }
-}
-
 /**
  * Primary port for file and folder search.
  *

src/application/ports/mod.rs

@@ -10,6 +10,7 @@ pub mod dedup_ports;
 pub mod favorites_ports;
 pub mod file_lifecycle;
 pub mod file_ports;
+pub mod folder_ports;
 pub mod inbound;
 pub mod music_ports;
 pub mod outbound;