From e8da6ae8bcc3f63cea5c2146e4da93d8a727d559 Mon Sep 17 00:00:00 2001 From: Shana Moore Date: Wed, 24 Jan 2024 11:44:03 -0800 Subject: [PATCH] :broom: correct camel case to constant notation for easier referencing Co-Authored-By: LaRita Robinson --- .../bulkrax/valkyrie_object_factory.rb | 8 ++--- app/transactions/bulkrax/container.rb | 36 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/app/factories/bulkrax/valkyrie_object_factory.rb b/app/factories/bulkrax/valkyrie_object_factory.rb index eddbfe42..634bca14 100644 --- a/app/factories/bulkrax/valkyrie_object_factory.rb +++ b/app/factories/bulkrax/valkyrie_object_factory.rb @@ -53,7 +53,7 @@ def create result = transaction .with_step_args( # "work_resource.add_to_parent" => {parent_id: @related_parents_parsed_mapping, user: @user}, - "work_resource.#{Bulkrax::Container::AddBulkraxFiles}" => { files: get_s3_files(remote_files: attributes["remote_files"]), user: @user }, + "work_resource.#{Bulkrax::Container::ADD_BULKRAX_FILES}" => { files: get_s3_files(remote_files: attributes["remote_files"]), user: @user }, "change_set.set_user_as_depositor" => { user: @user }, "work_resource.change_depositor" => { user: @user }, 'work_resource.save_acl' => { permissions_params: [attrs.try('visibility') || 'open'].compact } @@ -83,7 +83,7 @@ def update result = update_transaction .with_step_args( - "work_resource.#{Bulkrax::Container::AddBulkraxFiles}" => { files: get_s3_files(remote_files: attributes["remote_files"]), user: @user } + "work_resource.#{Bulkrax::Container::ADD_BULKRAX_FILES}" => { files: get_s3_files(remote_files: attributes["remote_files"]), user: @user } # TODO: uncomment when we upgrade Hyrax 4.x # 'work_resource.save_acl' => { permissions_params: [attrs.try('visibility') || 'open'].compact } @@ -165,12 +165,12 @@ def destroy_existing_files private def transaction - Hyrax::Transactions::Container["work_resource.#{Bulkrax::Container::CreateWithBulkBehavior}"] + Hyrax::Transactions::Container["work_resource.#{Bulkrax::Container::CREATE_WITH_BULK_BEHAVIOR}"] end # Customize Hyrax::Transactions::WorkUpdate transaction with bulkrax def update_transaction - Hyrax::Transactions::Container["work_resource.#{Bulkrax::Container::UpdateWithBulkBehavior}"] + Hyrax::Transactions::Container["work_resource.#{Bulkrax::Container::UPDATE_WITH_BULK_BEHAVIOR}"] end # Query child FileSet in the resource/object diff --git a/app/transactions/bulkrax/container.rb b/app/transactions/bulkrax/container.rb index 75c79b38..09053544 100644 --- a/app/transactions/bulkrax/container.rb +++ b/app/transactions/bulkrax/container.rb @@ -4,24 +4,28 @@ module Bulkrax class Container extend Dry::Container::Mixin - - CreateWithBulkBehavior = 'create_with_bulk_behavior'.freeze - UpdateWithBulkBehavior = 'update_with_bulk_behavior'.freeze - AddBulkraxFiles = 'add_bulkrax_files'.freeze - namespace "work_resource" do |ops| - ops.register CreateWithBulkBehavior do - steps = Hyrax::Transactions::WorkCreate::DEFAULT_STEPS.dup - steps[steps.index("work_resource.add_file_sets")] = "work_resource.#{Bulkrax::Container::AddBulkraxFiles}" + ADD_BULKRAX_FILES = 'add_bulkrax_files' + CREATE_WITH_BULK_BEHAVIOR = 'create_with_bulk_behavior' + CREATE_WITH_BULK_BEHAVIOR_STEPS = begin + steps = Hyrax::Transactions::WorkCreate::DEFAULT_STEPS.dup + steps[steps.index("work_resource.add_file_sets")] = "work_resource.#{Bulkrax::Container::ADD_BULKRAX_FILES}" + steps + end.freeze + UPDATE_WITH_BULK_BEHAVIOR = 'update_with_bulk_behavior' + UPDATE_WITH_BULK_BEHAVIOR_STEPS = begin + steps = Hyrax::Transactions::WorkUpdate::DEFAULT_STEPS.dup + steps[steps.index("work_resource.add_file_sets")] = "work_resource.#{Bulkrax::Container::ADD_BULKRAX_FILES}" + steps + end.freeze - Hyrax::Transactions::WorkCreate.new(steps: steps) + namespace "work_resource" do |ops| + ops.register CREATE_WITH_BULK_BEHAVIOR do + Hyrax::Transactions::WorkCreate.new(steps: CREATE_WITH_BULK_BEHAVIOR_STEPS) end - ops.register UpdateWithBulkBehavior do - steps = Hyrax::Transactions::WorkUpdate::DEFAULT_STEPS.dup - steps[steps.index("work_resource.add_file_sets")] = "work_resource.#{Bulkrax::Container::AddBulkraxFiles}" - - Hyrax::Transactions::WorkUpdate.new(steps: steps) + ops.register UPDATE_WITH_BULK_BEHAVIOR do + Hyrax::Transactions::WorkUpdate.new(steps: UPDATE_WITH_BULK_BEHAVIOR_STEPS) end # TODO: uninitialized constant Bulkrax::Container::InlineUploadHandler @@ -29,10 +33,10 @@ class Container # Hyrax::Transactions::Steps::AddFileSets.new(handler: InlineUploadHandler) # end - ops.register AddBulkraxFiles do + ops.register ADD_BULKRAX_FILES do Bulkrax::Steps::AddFiles.new end end end end -Hyrax::Transactions::Container.merge(Bulkrax::Container) \ No newline at end of file +Hyrax::Transactions::Container.merge(Bulkrax::Container)