avoid situation where the linkage data could be partially calculated

(cherry picked from commit 49c8bc6)

Author: barelyknown

lib/jsonapi/resource_serializer.rb

@@ -247,24 +247,22 @@ def related_link(source, relationship)
     end
 
     def to_one_linkage(source, relationship)
-      linkage = {}
-      linkage_id = foreign_key_value(source, relationship)
-
-      if linkage_id
-        linkage[:type] = format_key(relationship.type_for_source(source))
-        linkage[:id] = linkage_id
-      else
-        linkage = nil
-      end
-      linkage
+      return unless linkage_id = foreign_key_value(source, relationship)
+      return unless linkage_type = format_key(relationship.type_for_source(source))
+      {
+        type: linkage_type,
+        id: linkage_id,
+      }
     end
 
     def to_many_linkage(source, relationship)
       linkage = []
       linkage_types_and_values = foreign_key_types_and_values(source, relationship)
 
       linkage_types_and_values.each do |type, value|
-        linkage.append({type: format_key(type), id: value})
+        if type && value
+          linkage.append({type: format_key(type), id: @id_formatter.format(value)})
+        end
       end
       linkage
     end