Improve AR adapters

Author: Lee Richmond

lib/jsonapi_compliable/adapters/active_record_sideloading.rb

@@ -58,7 +58,7 @@ def has_one(association_name, scope:, resource:, foreign_key:, primary_key: :id,
               parent.association(association_name).loaded!
               relevant_child = children.find { |c| c.send(foreign_key) == parent.send(primary_key) }
               next unless relevant_child
-              parent.send(:"#{association_name}=", relevant_child)
+              parent.association(association_name).replace(relevant_child, false)
             end
           end
 
@@ -105,7 +105,7 @@ def polymorphic_belongs_to(association_name, group_by:, groups:, &blk)
 
               assign do |parents, children|
                 parents.each do |parent|
-                  parent.send(:"#{association_name}=", children.find { |c| c.send(primary_key) == parent.dwelling_id })
+                  parent.send(:"#{association_name}=", children.find { |c| c.send(primary_key) == parent.send(foreign_key) })
                 end
               end
             end

lib/jsonapi_compliable/sideload.rb

@@ -72,7 +72,9 @@ def to_hash
     def resolve_polymorphic(parents, query)
       parents.group_by(&@grouper).each_pair do |group_type, group_members|
         sideload_for_group = @polymorphic_groups[group_type]
-        sideload_for_group.resolve(group_members, query, name)
+        if sideload_for_group
+          sideload_for_group.resolve(group_members, query, name)
+        end
       end
     end