Recursively marshal included structs

The included structs of already included structs were not checked and
marshaled as well

Author: wwwdata

jsonapi/fixtures_test.go

@@ -25,8 +25,10 @@ func (m MagicID) String() string {
 }
 
 type Comment struct {
-	ID   int    `json:"-"`
-	Text string `json:"text"`
+	ID               int       `json:"-"`
+	Text             string    `json:"text"`
+	SubComments      []Comment `json:"-"`
+	SubCommentsEmpty bool      `json:"-"`
 }
 
 func (c Comment) GetID() string {
@@ -44,6 +46,37 @@ func (c *Comment) SetID(stringID string) error {
 	return nil
 }
 
+func (c Comment) GetReferences() []Reference {
+	return []Reference{
+		{
+			Type:        "comments",
+			Name:        "comments",
+			IsNotLoaded: c.SubCommentsEmpty,
+		},
+	}
+}
+
+func (c Comment) GetReferencedIDs() []ReferenceID {
+	result := []ReferenceID{}
+
+	for _, comment := range c.SubComments {
+		commentID := ReferenceID{Type: "comments", Name: "comments", ID: comment.GetID()}
+		result = append(result, commentID)
+	}
+
+	return result
+}
+
+func (c Comment) GetReferencedStructs() []MarshalIdentifier {
+	result := []MarshalIdentifier{}
+
+	for _, comment := range c.SubComments {
+		result = append(result, comment)
+	}
+
+	return result
+}
+
 type User struct {
 	ID       int    `json:"-"`
 	Name     string `json:"name"`

jsonapi/marshal.go

@@ -136,6 +136,27 @@ func MarshalToStruct(data interface{}, information ServerInformation) (*Document
 	}
 }
 
+func recursivelyEmbedIncludes(input []MarshalIdentifier) []MarshalIdentifier {
+	var referencedStructs []MarshalIdentifier
+
+	for _, referencedStruct := range input {
+		included, ok := referencedStruct.(MarshalIncludedRelations)
+		if ok {
+			referencedStructs = append(referencedStructs, included.GetReferencedStructs()...)
+		}
+	}
+
+	if len(referencedStructs) == 0 {
+		return input
+	}
+
+	childStructs := recursivelyEmbedIncludes(referencedStructs)
+	referencedStructs = append(referencedStructs, childStructs...)
+	referencedStructs = append(input, referencedStructs...)
+
+	return referencedStructs
+}
+
 func marshalSlice(data interface{}, information ServerInformation) (*Document, error) {
 	result := &Document{}
 
@@ -161,7 +182,8 @@ func marshalSlice(data interface{}, information ServerInformation) (*Document, e
 		}
 	}
 
-	includedElements, err := filterDuplicates(referencedStructs, information)
+	allReferencedStructs := recursivelyEmbedIncludes(referencedStructs)
+	includedElements, err := filterDuplicates(allReferencedStructs, information)
 	if err != nil {
 		return nil, err
 	}
@@ -395,7 +417,7 @@ func marshalStruct(data MarshalIdentifier, information ServerInformation) (*Docu
 
 	included, ok := data.(MarshalIncludedRelations)
 	if ok {
-		included, err := filterDuplicates(included.GetReferencedStructs(), information)
+		included, err := filterDuplicates(recursivelyEmbedIncludes(included.GetReferencedStructs()), information)
 		if err != nil {
 			return nil, err
 		}