Remove building included object to BaseHandler

visualitypl · May 25, 2021 · 48b45f7 · 48b45f7
1 parent d088a2e
commit 48b45f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lib/jsonapi_parameters/default_handlers/base_handler.rb b/lib/jsonapi_parameters/default_handlers/base_handler.rb
@@ -24,6 +24,13 @@ def find_included_object(related_id:, related_type:)
             end
           end
 
+          def build_included_object(included_object, related_id)
+            { **(included_object[:attributes] || {}) }.tap do |body|
+              body[:id] = related_id unless client_generated_id?(related_id)
+              body[:relationships] = included_object[:relationships] if included_object.key?(:relationships) # Pass nested relationships
+            end
+          end
+
           def client_generated_id?(related_id)
             related_id.to_s.starts_with?(JsonApi::Parameters.client_id_prefix)
           end

diff --git a/lib/jsonapi_parameters/default_handlers/to_many_relation_handler.rb b/lib/jsonapi_parameters/default_handlers/to_many_relation_handler.rb
@@ -36,10 +36,7 @@ def prepare_relationship_vals
               @with_inclusion &= !included_object.empty?
 
               if with_inclusion
-                { **(included_object[:attributes] || {}) }.tap do |body|
-                  body[:id] = related_id unless client_generated_id?(related_id)
-                  body[:relationships] = included_object[:relationships] if included_object.key?(:relationships) # Pass nested relationships
-                end
+                build_included_object(included_object, related_id)
               else
                 relationship.dig(:id)
               end

diff --git a/lib/jsonapi_parameters/default_handlers/to_one_relation_handler.rb b/lib/jsonapi_parameters/default_handlers/to_one_relation_handler.rb
@@ -17,10 +17,7 @@ def handle
 
             return ["#{singularize(relationship_key)}_id".to_sym, related_id] if included_object.empty?
 
-            included_object = { **(included_object[:attributes] || {}) }.tap do |body|
-              body[:id] = related_id unless client_generated_id?(related_id)
-              body[:relationships] = included_object[:relationships] if included_object.key?(:relationships) # Pass nested relationships
-            end
+            included_object = build_included_object(included_object, related_id)
 
             ["#{singularize(relationship_key)}_attributes".to_sym, included_object]
           end