forked from Mirrors/jsonapi
handle single relation, and make included unique
This commit is contained in:
parent
b321aa831e
commit
e039cc4394
26
jsonapi.go
26
jsonapi.go
|
@ -20,7 +20,7 @@ type JsonApiNode struct {
|
|||
|
||||
type JsonApiResponse struct {
|
||||
Data *JsonApiNode `json:"data"`
|
||||
Included []*JsonApiNode `json:"included"`
|
||||
Included []*JsonApiNode `json:"included,omitempty"`
|
||||
}
|
||||
|
||||
func CreateJsonApiResponse(model interface{}) (*JsonApiResponse, error) {
|
||||
|
@ -30,8 +30,19 @@ func CreateJsonApiResponse(model interface{}) (*JsonApiResponse, error) {
|
|||
}
|
||||
|
||||
resp := &JsonApiResponse{Data: rootNode}
|
||||
|
||||
uniqueIncluded := make(map[string]*JsonApiNode)
|
||||
|
||||
for i, n := range included {
|
||||
k := fmt.Sprintf("%s,%s", n.Type, n.Id)
|
||||
if uniqueIncluded[k] == nil {
|
||||
uniqueIncluded[k] = n
|
||||
} else {
|
||||
included = append(included[:i], included[i+1:]...)
|
||||
}
|
||||
}
|
||||
|
||||
resp.Included = included
|
||||
// TODO make Included unique
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
@ -96,6 +107,17 @@ func visitModelNode(model interface{}) (*JsonApiNode, []*JsonApiNode, error) {
|
|||
err = err
|
||||
}
|
||||
} else {
|
||||
relationship, _, err := visitModelNode(fieldValue.Interface())
|
||||
if err == nil {
|
||||
shallowNode := *relationship
|
||||
shallowNode.Attributes = nil
|
||||
|
||||
included = append(included, relationship)
|
||||
|
||||
node.Relationships[args[1]] = &shallowNode
|
||||
} else {
|
||||
err = err
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
|
|
|
@ -17,6 +17,7 @@ type Blog struct {
|
|||
Id int `jsonapi:"primary,blogs"`
|
||||
Title string `jsonapi:"attr,title"`
|
||||
Posts []Post `jsonapi:"relation,posts"`
|
||||
CurrentPost Post `jsonapi:"relation,current_post"`
|
||||
}
|
||||
|
||||
func TestHasPrimaryAnnotation(t *testing.T) {
|
||||
|
@ -35,6 +36,11 @@ func TestHasPrimaryAnnotation(t *testing.T) {
|
|||
Body: "Bas",
|
||||
},
|
||||
},
|
||||
CurrentPost: Post{
|
||||
Id: 1,
|
||||
Title: "Foo",
|
||||
Body: "Bar",
|
||||
},
|
||||
}
|
||||
|
||||
resp, err := CreateJsonApiResponse(testModel)
|
||||
|
|
Loading…
Reference in New Issue