Improve migration/rollback logic for attachments

app/services/projects/hashed_storage/migrate_attachments_service.rb

@@ -22,10 +22,14 @@ module Projects
         @new_disk_path = project.disk_path
 
         result = move_folder!(origin, target)
+
+        if result
           project.save!
 
-        if result && block_given?
-          yield
+          yield if block_given?
+        else
+          # Rollback changes
+          project.rollback!
         end
 
         result

app/services/projects/hashed_storage/rollback_attachments_service.rb

@@ -17,10 +17,14 @@ module Projects
         @new_disk_path = FileUploader.base_dir(project)
 
         result = move_folder!(origin, target)
+
+        if result
           project.save!
 
-        if result && block_given?
-          yield
+          yield if block_given?
+        else
+          # Rollback changes
+          project.rollback!
         end
 
         result