Delete event v2

src/services/file_service.rs

@@ -599,9 +599,78 @@ impl FileService {
                 );
 
                 if is_deleted {
-                    info!("File is already deleted: file_id={}", file_id);
-                    // Treat as success if already deleted
-                    return Ok(());
+                    warn!(
+                        "⚠️ Client requested deletion of already-deleted file_id={}, checking for actual active file",
+                        file_id
+                    );
+
+                    // Try to find actual active file by path/name
+                    // This handles the case where client has wrong file_id (from previous deleted file)
+                    // revision=0 means get the latest active file
+                    match self
+                        .storage
+                        .find_file_by_path_and_name(
+                            &file_info.account_hash,
+                            &file_info.file_path,
+                            &file_info.filename,
+                            0, // revision=0: get latest active file (highest revision, not deleted)
+                        )
+                        .await
+                    {
+                        Ok(Some(active_file)) => {
+                            warn!(
+                                "🔄 Found actual active file: old_file_id={}, new_file_id={}, path={}",
+                                file_id, active_file.file_id, file_info.file_path
+                            );
+                            // Delete the actual active file instead
+                            match self
+                                .storage
+                                .delete_file(&active_file.account_hash, active_file.file_id)
+                                .await
+                            {
+                                Ok(_) => {
+                                    self.files.lock().await.remove(&active_file.file_id);
+                                    info!(
+                                        "✅ Successfully deleted actual active file: file_id={}, path={}",
+                                        active_file.file_id, file_info.file_path
+                                    );
+
+                                    // Send notification for the actual deleted file
+                                    if let Some(nm) = &self.notification_manager {
+                                        let notification = FileUpdateNotification {
+                                            account_hash: active_file.account_hash.clone(),
+                                            device_hash: active_file.device_hash.clone(),
+                                            file_info: Some(active_file.to_sync_file()),
+                                            update_type: crate::sync::file_update_notification::UpdateType::Deleted as i32,
+                                            timestamp: chrono::Utc::now().timestamp(),
+                                            rename_info: None,
+                                        };
+                                        let _ = nm.broadcast_file_update(notification).await;
+                                    }
+
+                                    return Ok(());
+                                }
+                                Err(e) => {
+                                    error!(
+                                        "Failed to delete actual active file: file_id={}, error={}",
+                                        active_file.file_id, e
+                                    );
+                                    return Err(e);
+                                }
+                            }
+                        }
+                        Ok(None) => {
+                            info!("No active file found with same path, file is truly deleted: file_id={}", file_id);
+                            return Ok(());
+                        }
+                        Err(e) => {
+                            warn!(
+                                "Error searching for active file: {}, treating as already deleted",
+                                e
+                            );
+                            return Ok(());
+                        }
+                    }
                 }
 
                 // Handle file deletion

src/storage/mysql_file.rs

@@ -767,7 +767,7 @@ impl MySqlFileExt for MySqlStorage {
         // Check if file exists and belongs to the user
         // Use Vec<u8> for VARBINARY columns (file_path, filename)
         let row_opt = sqlx::query(
-            r#"SELECT file_id, revision, file_path, filename, device_hash, group_id, watcher_id
+            r#"SELECT file_id, revision, file_path, filename, device_hash, group_id, watcher_id, server_group_id, server_watcher_id
                FROM files WHERE file_id = ? AND account_hash = ?"#,
         )
         .bind(file_id)
@@ -800,6 +800,8 @@ impl MySqlFileExt for MySqlStorage {
         let device_hash: String = row.try_get("device_hash").unwrap_or_default();
         let group_id: i32 = row.try_get("group_id").unwrap_or(0);
         let watcher_id: i32 = row.try_get("watcher_id").unwrap_or(0);
+        let server_group_id: i32 = row.try_get("server_group_id").unwrap_or(0);
+        let server_watcher_id: i32 = row.try_get("server_watcher_id").unwrap_or(0);
 
         let new_revision = current_revision + 1;
 
@@ -859,8 +861,8 @@ impl MySqlFileExt for MySqlStorage {
         // Use Vec<u8> for VARBINARY columns to avoid type mismatch
         sqlx::query(
             r#"INSERT INTO files
-            (file_id, account_hash, device_hash, file_path, filename, file_hash, size, unix_permissions)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?)"#,
+            (file_id, account_hash, device_hash, file_path, filename, file_hash, size, unix_permissions, server_group_id, server_watcher_id)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
         )
         .bind(new_file_id)
         .bind(account_hash)
@@ -870,6 +872,8 @@ impl MySqlFileExt for MySqlStorage {
         .bind(&file_path_bytes) // file_hash uses file_path_bytes
         .bind(0i64)
         .bind(None::<u32>)
+        .bind(server_group_id)
+        .bind(server_watcher_id)
         .execute(&mut *tx)
         .await
         .map_err(|e| StorageError::Database(format!("Deletion history addition failed (step 1, schema/VARBINARY type mismatch): {}", e)))?;