Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[#66221] NoMethodError on Storages::CopyProjectFoldersJob#perform

Pavel Balashou0ae987f0ddbb
diff --git a/modules/storages/app/services/storages/file_links/copy_file_links_service.rb b/modules/storages/app/services/storages/file_links/copy_file_links_service.rb
index 2b1ec6b4c70..a78021ebe06 100644
--- a/modules/storages/app/services/storages/file_links/copy_file_links_service.rb
+++ b/modules/storages/app/services/storages/file_links/copy_file_links_service.rb
@@ -111,11 +111,13 @@ module Storages
# We need this due to inconsistencies of how we represent the File Path
target_location_map.transform_keys! { |key| key.starts_with?("/") ? key : "/#{key}" }
- source_files.to_h do |info|
- target = info.clean_location.gsub(@source.managed_project_folder_path, @target.managed_project_folder_path)
+ source_files.filter_map do |info|
+ # in case file has been deleted location is nil
+ next nil if info.location.blank?
+ target = info.clean_location.gsub(@source.managed_project_folder_path, @target.managed_project_folder_path)
[info.id.to_s, target_location_map[target]&.id || id]
- end
+ end.to_h
end
def auth_strategy
diff --git a/modules/storages/spec/services/storages/file_links/copy_file_links_service_spec.rb b/modules/storages/spec/services/storages/file_links/copy_file_links_service_spec.rb
index 98fd56e8e47..56105b732a2 100644
--- a/modules/storages/spec/services/storages/file_links/copy_file_links_service_spec.rb
+++ b/modules/storages/spec/services/storages/file_links/copy_file_links_service_spec.rb
@@ -74,7 +74,10 @@ RSpec.describe Storages::FileLinks::CopyFileLinksService, :webmock do
let(:remote_source_info) do
source_links.map do |link|
- Storages::StorageFileInfo.new(status: "ok", status_code: 200, id: link.origin_id, name: link.origin_name,
+ Storages::StorageFileInfo.new(status: "ok",
+ status_code: 200,
+ id: link.origin_id,
+ name: link.origin_name,
location: File.join(source_storage.managed_project_folder_path, link.origin_name))
end
end
@@ -100,7 +103,7 @@ RSpec.describe Storages::FileLinks::CopyFileLinksService, :webmock do
.and_return(Success(path_to_ids))
end
- it "create links to the newly copied files" do
+ it "creates links to the newly copied files" do
expect { service.call }.to change(Storages::FileLink, :count).by(5)
Storages::FileLink.last(5).each do |link|
@@ -108,5 +111,27 @@ RSpec.describe Storages::FileLinks::CopyFileLinksService, :webmock do
expect(link.storage_id).to eq(target.id)
end
end
+
+ context "when one file_link points to a deleted file" do
+ before do
+ link = source_links[-1]
+ remote_source_info[-1] = Storages::StorageFileInfo.new(status: "Forbidden",
+ status_code: 403,
+ id: link.origin_id,
+ name: nil,
+ location: nil)
+
+ path_to_ids.delete(File.join(target_storage.managed_project_folder_path, link.origin_name))
+ end
+
+ it "creates links for only copied files" do
+ expect { service.call }.to change(Storages::FileLink, :count).by(4)
+
+ Storages::FileLink.last(4).each do |link|
+ expect(link.origin_id).to match /_target$/
+ expect(link.storage_id).to eq(target.id)
+ end
+ end
+ end
end
end