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

Fix infos returned by SharePoint file info query

Jan Sandbrink8e2be39a2c88
diff --git a/modules/storages/app/common/storages/adapters/providers/sharepoint/queries/files_info_query.rb b/modules/storages/app/common/storages/adapters/providers/sharepoint/queries/files_info_query.rb
index 415147f9859..84f5c457b1a 100644
--- a/modules/storages/app/common/storages/adapters/providers/sharepoint/queries/files_info_query.rb
+++ b/modules/storages/app/common/storages/adapters/providers/sharepoint/queries/files_info_query.rb
@@ -55,10 +55,8 @@ module Storages
private
def wrap_storage_file_error(file_id, query_result)
- split_identifier(file_id) => { location: }
-
Results::StorageFileInfo.new(
- id: location.path,
+ id: file_id,
status: query_result.code,
status_code: Rack::Utils::SYMBOL_TO_STATUS_CODE[query_result.code] || 500
)
diff --git a/modules/storages/app/common/storages/adapters/providers/sharepoint/storage_file_transformer.rb b/modules/storages/app/common/storages/adapters/providers/sharepoint/storage_file_transformer.rb
index 44744f283e8..e04ab4116e4 100644
--- a/modules/storages/app/common/storages/adapters/providers/sharepoint/storage_file_transformer.rb
+++ b/modules/storages/app/common/storages/adapters/providers/sharepoint/storage_file_transformer.rb
@@ -76,7 +76,7 @@ module Storages
Results::StorageFileInfo.build(
status: json[:status],
status_code: json[:status_code],
- id: json[:id],
+ id: compose_id(json),
name: json[:name],
mime_type: mime_type(json),
size: json[:size],
diff --git a/modules/storages/app/services/storages/file_link_sync_service.rb b/modules/storages/app/services/storages/file_link_sync_service.rb
index b1042864a7b..1badb4087a2 100644
--- a/modules/storages/app/services/storages/file_link_sync_service.rb
+++ b/modules/storages/app/services/storages/file_link_sync_service.rb
@@ -92,7 +92,7 @@ module Storages
:error
end
- file_link.save
+ file_link.save!
file_link
end
end
diff --git a/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/file_info_query_spec.rb b/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/file_info_query_spec.rb
index fb75018308e..6d731d8bda5 100644
--- a/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/file_info_query_spec.rb
+++ b/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/file_info_query_spec.rb
@@ -51,7 +51,7 @@ module Storages
let(:file_id) { "#{drive_id}:01ANJ53W5UJK2CQO6IY5HLBVYBVNJ4TKHZ" }
let(:file_info) do
Results::StorageFileInfo.new(
- id: "01ANJ53W5UJK2CQO6IY5HLBVYBVNJ4TKHZ",
+ id: file_id,
status: "ok",
status_code: 200,
name: "release_meme.jpg",
@@ -75,7 +75,7 @@ module Storages
let(:file_id) { "#{drive_id}:01ANJ53WYP6TBC6T4G2RHIU4SVNEYGL6MF" }
let(:file_info) do
Results::StorageFileInfo.new(
- id: "01ANJ53WYP6TBC6T4G2RHIU4SVNEYGL6MF",
+ id: file_id,
status: "ok",
status_code: 200,
name: "Ümlæûts",
@@ -100,7 +100,7 @@ module Storages
let(:file_id) { "#{drive_id}:01ANJ53W7BT4LBZ3PNORCYAXKILWJBLEBV" }
let(:file_info) do
Results::StorageFileInfo.new(
- id: "01ANJ53W7BT4LBZ3PNORCYAXKILWJBLEBV",
+ id: file_id,
status: "ok",
status_code: 200,
name: "written_in_stone.webp",
diff --git a/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/files_info_query_spec.rb b/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/files_info_query_spec.rb
index 884c4551d49..0e7f8453865 100644
--- a/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/files_info_query_spec.rb
+++ b/modules/storages/spec/common/storages/adapters/providers/sharepoint/queries/files_info_query_spec.rb
@@ -65,7 +65,7 @@ module Storages
Results::StorageFileInfo.new(
status: "ok",
status_code: 200,
- id: "01ANJ53WYLXAJW5PXSCJB2CFCD42UPDKMI",
+ id: "#{drive_id}:01ANJ53WYLXAJW5PXSCJB2CFCD42UPDKMI",
name: "Folder",
size: 232311,
mime_type: "application/x-op-directory",
@@ -80,7 +80,7 @@ module Storages
Results::StorageFileInfo.new(
status: "ok",
status_code: 200,
- id: "01ANJ53W4ELLSQL3JZHNA2MHKKHKAUQWNS",
+ id: "#{drive_id}:01ANJ53W4ELLSQL3JZHNA2MHKKHKAUQWNS",
name: "authurl.txt",
size: 144,
mime_type: "text/plain",
@@ -95,7 +95,7 @@ module Storages
Results::StorageFileInfo.new(
status: "ok",
status_code: 200,
- id: "01ANJ53W5UJK2CQO6IY5HLBVYBVNJ4TKHZ",
+ id: "#{drive_id}:01ANJ53W5UJK2CQO6IY5HLBVYBVNJ4TKHZ",
name: "release_meme.jpg",
size: 46264,
mime_type: "image/jpeg",
@@ -121,7 +121,7 @@ module Storages
Results::StorageFileInfo.new(
status: "ok",
status_code: 200,
- id: "01ANJ53W4ELLSQL3JZHNA2MHKKHKAUQWNS",
+ id: "#{drive_id}:01ANJ53W4ELLSQL3JZHNA2MHKKHKAUQWNS",
name: "authurl.txt",
size: 144,
mime_type: "text/plain",
@@ -136,7 +136,7 @@ module Storages
Results::StorageFileInfo.new(
status: :not_found,
status_code: 404,
- id: "not_existent"
+ id: "#{drive_id}:not_existent"
)
]
end