From 48ffce6ac72f299f22d1e3bc976198a5608a3897 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Thu, 4 Nov 2021 21:32:05 -0400 Subject: [PATCH 1/2] remove send from put_resource and patch_resource --- app/controllers/api/base_controller/manager.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/base_controller/manager.rb b/app/controllers/api/base_controller/manager.rb index d3546cceff..8d3a3ec5aa 100644 --- a/app/controllers/api/base_controller/manager.rb +++ b/app/controllers/api/base_controller/manager.rb @@ -2,8 +2,11 @@ module Api class BaseController module Manager def update_collection(type, id) - if @req.method == :put || @req.method == :patch - return send("#{@req.method}_resource", type, id) + case @req.method + when :put + return edit_resource(type, id, @req.json_body) + when :patch + return patch_resource(type, id) end unless id || @req.subcollection? || @req.json_body.key?("resources") @@ -32,10 +35,6 @@ def collection_class(type) @collection_klasses[type.to_sym] || collection_config.klass(type) end - def put_resource(type, id) - edit_resource(type, id, @req.json_body) - end - # # Patching a resource, post syntax # From 9867870f46f8c4e3e0042c5e61b032fdf7d545b5 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Thu, 4 Nov 2021 21:49:02 -0400 Subject: [PATCH 2/2] collapse get_and_update_collection --- app/controllers/api/base_controller/manager.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/controllers/api/base_controller/manager.rb b/app/controllers/api/base_controller/manager.rb index 8d3a3ec5aa..9d754ccae2 100644 --- a/app/controllers/api/base_controller/manager.rb +++ b/app/controllers/api/base_controller/manager.rb @@ -20,9 +20,9 @@ def update_collection(type, id) "Unimplemented Action #{action} for #{type} resources" unless respond_to?(target) if id - get_and_update_one_collection(@req.subcollection?, target, type, id) + update_one_collection(@req.subcollection?, target, type, id, @req.resource) else - get_and_update_multiple_collections(@req.subcollection?, target, type) + update_multiple_collections(@req.subcollection?, target, type, @req.resources) end end @@ -92,14 +92,6 @@ def target_resource_method(type, action) end end - def get_and_update_one_collection(is_subcollection, target, type, id) - update_one_collection(is_subcollection, target, type, id, @req.resource) - end - - def get_and_update_multiple_collections(is_subcollection, target, type) - update_multiple_collections(is_subcollection, target, type, @req.resources) - end - def update_one_collection(is_subcollection, target, type, id, resource) id = id.to_i if id.kind_of?(String) && id =~ /\A\d+\z/ parent_resource = parent_resource_obj if is_subcollection