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

[#67233] Update CreateFolderService to handle sharepoint (#20309)

Marcello Rochafb0e2d4756b5
diff --git a/modules/storages/app/common/storages/peripherals/service_result_refinements.rb b/modules/storages/app/common/storages/peripherals/service_result_refinements.rb
index 13a62dcfabb..361c3b14a90 100644
--- a/modules/storages/app/common/storages/peripherals/service_result_refinements.rb
+++ b/modules/storages/app/common/storages/peripherals/service_result_refinements.rb
@@ -91,6 +91,11 @@ module Storages
self.success = false
self
end
+
+ def to_monad
+ match(on_success: ->(result) { Dry::Monads::Success(result) },
+ on_failure: ->(error) { Dry::Monads::Failure(error) })
+ end
end
end
end
diff --git a/modules/storages/app/services/storages/create_folder_service.rb b/modules/storages/app/services/storages/create_folder_service.rb
index 4bf8c88af1e..691216c42cf 100644
--- a/modules/storages/app/services/storages/create_folder_service.rb
+++ b/modules/storages/app/services/storages/create_folder_service.rb
@@ -32,8 +32,8 @@ module Storages
class CreateFolderService < BaseService
using Peripherals::ServiceResultRefinements
- def self.call(storage:, user:, name:, parent_id:)
- new(storage).call(user:, name:, parent_id:)
+ def self.call(storage:, user:, folder_name:, parent_id:)
+ new(storage).call(user:, folder_name:, parent_id:)
end
def initialize(storage)
@@ -41,19 +41,19 @@ module Storages
@storage = storage
end
- def call(user:, name:, parent_id:)
- auth_strategy = Adapters::Registry.resolve("#{@storage}.authentication.user_bound").call(user, @storage)
- parent_location = parent_path(parent_id, user).on_failure { return add_error(:base, it.errors) }.result
-
- input_data = Adapters::Input::CreateFolder.build(folder_name: name, parent_location:)
- .value_or { return add_validation_error(it) }
-
- storage_folder = Adapters::Registry.resolve("#{@storage}.commands.create_folder")
- .call(storage: @storage, auth_strategy:, input_data:)
- .value_or { return add_error(:base, it, options: input_data.to_h) }
+ def call(user:, folder_name:, parent_id:)
+ error = parent_path(parent_id, user).bind do |parent_location|
+ input_data = Adapters::Input::CreateFolder.build(folder_name:, parent_location:).value_or { return add_validation_error(it) }
+ Adapters::Registry["#{@storage}.commands.create_folder"]
+ .call(storage: @storage,
+ auth_strategy: Adapters::Registry["#{@storage}.authentication.user_bound"].call(user, @storage),
+ input_data:).bind do |created_folder|
+ @result.result = created_folder
+ return @result
+ end
+ end
- @result.result = storage_folder
- @result
+ add_error(:base, error.failure)
end
private
@@ -62,18 +62,16 @@ module Storages
case @storage.short_provider_type
when "nextcloud"
location_from_file_info(parent_id, user)
- when "one_drive"
- ServiceResult.success(result: parent_id)
+ when "one_drive", "sharepoint"
+ Success(parent_id)
else
raise "Unknown Storage Type"
end
end
def location_from_file_info(parent_id, user)
- StorageFileService.call(storage: @storage, user:, file_id: parent_id).on_success do |success|
- path = URI.decode_uri_component(success.result.location)
- return ServiceResult.success(result: path)
- end
+ StorageFileService.call(storage: @storage, user:, file_id: parent_id)
+ .to_monad.fmap { URI.decode_uri_component(it.location) }
end
end
end
diff --git a/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb b/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb
index 876eee27b93..6ef1d8e0033 100644
--- a/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb
+++ b/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb
@@ -46,7 +46,7 @@ module API
::Storages::CreateFolderService.call(
storage: @storage,
user: current_user,
- name: params["name"],
+ folder_name: params["name"],
parent_id: params["parent_id"]
).match(
on_success: ->(storage_folder) {
diff --git a/modules/storages/spec/services/storages/create_folder_service_spec.rb b/modules/storages/spec/services/storages/create_folder_service_spec.rb
index f465485854f..319531730a1 100644
--- a/modules/storages/spec/services/storages/create_folder_service_spec.rb
+++ b/modules/storages/spec/services/storages/create_folder_service_spec.rb
@@ -34,7 +34,7 @@ require_module_spec_helper
module Storages
RSpec.describe CreateFolderService do
let(:user) { create(:admin) }
- let(:file_info) do
+ let(:parent_file_info) do
Adapters::Results::StorageFileInfo.build(
status: "OK",
status_code: 200,
@@ -44,66 +44,68 @@ module Storages
).value!
end
- let(:name) { "TestFolderName" }
+ let(:folder_name) { "TestFolderName" }
+ let(:parent_id) { parent_file_info.id }
let(:auth_strategy) { Adapters::Registry["#{storage}.authentication.user_bound"].call(user, storage) }
+ let(:create_folder_input) do
+ Adapters::Input::CreateFolder.build(folder_name:, parent_location: parent_file_info.id).value!
+ end
+
subject(:service) { described_class.new(storage) }
before do
- allow(StorageFileService).to receive(:call).with(storage:, user:, file_id: parent_id)
- .and_return(ServiceResult.success(result: file_info))
+ Adapters::Registry.stub("#{storage}.commands.create_folder", create_folder_command)
+ allow(create_folder_command).to receive(:call).and_return(Success("AwesomeFolderInfo"))
end
context "when storage is nextcloud" do
let(:storage) { create(:nextcloud_storage) }
- let(:parent_id) { file_info.id }
+
+ let(:create_folder_input) do
+ # FIXME: Nextcloud uses the path and not the parent ID as the location. This is prime target for refactor.
+ Adapters::Input::CreateFolder.build(folder_name:, parent_location: parent_file_info.location).value!
+ end
let(:create_folder_command) { class_double(Adapters::Providers::Nextcloud::Commands::CreateFolderCommand) }
before do
- allow(create_folder_command).to receive(:call).and_return(Success())
- Adapters::Registry.stub("nextcloud.commands.create_folder", create_folder_command)
+ allow(StorageFileService)
+ .to receive(:call).with(storage:, user:, file_id: parent_id)
+ .and_return(ServiceResult.success(result: parent_file_info))
end
it "calls the appropriate command with the expected parameters" do
- service.call(user:, name:, parent_id:)
+ service.call(user:, folder_name:, parent_id:)
- expect(create_folder_command).to have_received(:call).with(
- storage:,
- auth_strategy:,
- input_data: Adapters::Input::CreateFolder.build(folder_name: name, parent_location: file_info.location).value!
- ).once
+ expect(create_folder_command)
+ .to have_received(:call).with(storage:, auth_strategy:, input_data: create_folder_input).once
end
end
context "when storage is one_drive" do
let(:storage) { create(:one_drive_storage) }
- let(:parent_id) { file_info.id }
-
- let(:file_info) do
- Adapters::Results::StorageFileInfo.build(
- status: "OK",
- status_code: 200,
- id: "/Path/To/Parent/One",
- name: "/"
- ).value!
- end
-
+ let(:parent_id) { parent_file_info.id }
let(:create_folder_command) { class_double(Adapters::Providers::OneDrive::Commands::CreateFolderCommand) }
- before do
- allow(create_folder_command).to receive(:call).and_return(Success())
- Adapters::Registry.stub("one_drive.commands.create_folder", create_folder_command)
+ it "calls the appropriate command with the expected parameters" do
+ service.call(user:, folder_name:, parent_id:)
+
+ expect(create_folder_command)
+ .to have_received(:call).with(storage:, auth_strategy:, input_data: create_folder_input).once
end
+ end
+
+ context "when storage is sharepoint" do
+ let(:storage) { create(:sharepoint_storage) }
+ let(:parent_id) { parent_file_info.id }
+ let(:create_folder_command) { class_double(Adapters::Providers::Sharepoint::Commands::CreateFolderCommand) }
it "calls the appropriate command with the expected parameters" do
- service.call(user:, name:, parent_id:)
+ service.call(user:, folder_name:, parent_id:)
- expect(create_folder_command).to have_received(:call).with(
- storage:,
- auth_strategy:,
- input_data: Adapters::Input::CreateFolder.build(folder_name: name, parent_location: file_info.id).value!
- ).once
+ expect(create_folder_command)
+ .to have_received(:call).with(storage:, auth_strategy:, input_data: create_folder_input).once
end
end
end