Skip to content

Fix Uniqueness check by there is relationship to the same object but under 2 relationships keys #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Fix Uniqueness check by there is relationship to the same object but under 2 relationships keys #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e2c0c8
Fix Uniqueness check by there is relationship to the same object but …
ecdatadog Jan 9, 2025
f9838c7
Remove panic comments
ecdatadog Jan 9, 2025
11469de
Remove embed import
ecdatadog Jan 13, 2025
6301f3b
Merge branch 'main' into ec/fix_uniqueness_relationships
zestze Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jsonapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ func (d *document) verifyResourceUniqueness() bool {
}
topLevelSeen[rid] = true

relSeen := make(map[string]bool)
for _, rel := range ro.Relationships {
relSeen := make(map[string]bool)
for _, relRo := range rel.getResourceObjectSlice() {
relRid := relRo.getIdentifier()
if relRo.ID != "" && relSeen[relRid] {
Expand Down
9 changes: 9 additions & 0 deletions jsonapi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ var (
articleRelatedCompleteBody = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"},"relationships":{"author":{"data":{"id":"1","type":"author"},"meta":{"count":10},"links":{"self":"http://example.com/articles/1/relationships/author","related":"http://example.com/articles/1/author"}},"comments":{"data":[{"id":"1","type":"comments"},{"id":"2","type":"comments"}],"links":{"self":"http://example.com/articles/1/relationships/comments","related":"http://example.com/articles/1/comments"}}}}}`
articleRelatedCompleteWithIncludeBody = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"},"relationships":{"author":{"data":{"id":"1","type":"author"}},"comments":{"data":[{"id":"1","type":"comments"},{"id":"2","type":"comments"}]}}},"included":[{"id":"1","type":"author","attributes":{"name":"A"}},{"id":"1","type":"comments","attributes":{"body":"A"}},{"id":"2","type":"comments","attributes":{"body":"B"}}]}`
articleRelatedNonuniqueLinkage = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"},"relationships":{"author":{"data":{"id":"1","type":"author"}},"comments":{"data":[{"id":"1","type":"comments"},{"id":"1","type":"comments"}]}}}}`
articleRelatedDifferentRefToSameObject = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"},"relationships":{"author":{"data":{"id":"1","type":"author"}},"contact":{"data":{"id":"1","type":"author"}},"comments":{"data":[{"id":"1","type":"comments"}]}}}}`
articleRelatedCommentsNestedWithIncludeBody = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"},"relationships":{"comments":{"data":[{"id":"1","type":"comments"}],"links":{"self":"http://example.com/articles/1/relationships/comments","related":"http://example.com/articles/1/comments"}}}},"included":[{"id":"1","type":"comments","attributes":{"body":"A"},"relationships":{"author":{"data":{"id":"1","type":"author"},"links":{"self":"http://example.com/comments/1/relationships/author","related":"http://example.com/comments/1/author"}}}},{"id":"1","type":"author","attributes":{"name":"A"}}]}`
articleWithIncludeOnlyBody = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"}},"included":[{"id":"1","type":"author","attributes":{"name":"A"}}]}`
articleRelatedAuthorLinksOnlyBody = `{"data":{"id":"1","type":"articles","attributes":{"title":"A"},"relationships":{"author":{"links":{"self":"http://example.com/articles/1/relationships/author","related":"http://example.com/articles/1/author"}}}}}`
Expand Down Expand Up @@ -442,6 +443,14 @@ type ArticleRelated struct {
Comments []*Comment `jsonapi:"relationship" json:"comments,omitempty"`
}

type ArticleRelatedWithContact struct {
ID string `jsonapi:"primary,articles"`
Title string `jsonapi:"attribute" json:"title"`
Contact *Author `jsonapi:"relationship" json:"contact,omitempty"`
Author *Author `jsonapi:"relationship" json:"author,omitempty"`
Comments []*Comment `jsonapi:"relationship" json:"comments,omitempty"`
}

func (a *ArticleRelated) LinkRelation(relation string) *Link {
return &Link{
Self: fmt.Sprintf("http://example.com/articles/%s/relationships/%s", a.ID, relation),
Expand Down
20 changes: 19 additions & 1 deletion unmarshal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,25 @@ func TestUnmarshal(t *testing.T) {
},
expect: ArticleRelated{},
expectError: ErrNonuniqueResource,
}, {
},
{
description: "ArticleRelatedWithContact (nonunique linkage)",
given: articleRelatedDifferentRefToSameObject,
do: func(body []byte) (any, error) {
var a ArticleRelatedWithContact
err := Unmarshal(body, &a)
return &a, err
},
expect: &ArticleRelatedWithContact{
ID: "1",
Title: "A",
Author: &Author{ID: "1"},
Comments: []*Comment{{ID: "1"}},
Contact: &Author{ID: "1"},
},
expectError: nil,
},
{
description: "links member only",
given: `{"links":null}`,
do: func(body []byte) (any, error) {
Expand Down
Loading