Fix creating sub-resource items deeper than 2nd level

Author: Dragomir-Ivanov

rest/resource_path.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/rs/rest-layer/resource"
+	"github.com/rs/rest-layer/schema"
 	"github.com/rs/rest-layer/schema/query"
 )
 
@@ -152,10 +153,28 @@ func (p ResourcePath) Path() string {
 
 // Values returns all the key=value pairs defined by the resource path.
 func (p ResourcePath) Values() map[string]interface{} {
+	path := p.Path()
+	d := strings.LastIndexAny(path, ".")
+	if d > 0 {
+		path = path[0:d]
+	} else {
+		path = ""
+	}
+	targetResource := p[len(p)-1].Resource
+	targetFields := targetResource.Schema().Fields
+
 	v := map[string]interface{}{}
 	for _, rp := range p {
+		include := false
 		if _, found := v[rp.Field]; !found && rp.Value != nil {
-			v[rp.Field] = rp.Value
+			if def, ok := targetFields[rp.Field]; ok {
+				if ref, ok := def.Validator.(*schema.Reference); ok && ref.Path == path {
+					include = true
+				}
+			}
+			if include == true || rp.Field == "id" {
+				v[rp.Field] = rp.Value
+			}
 		}
 	}
 	return v

rest/resource_path_test.go

@@ -10,21 +10,83 @@ import (
 )
 
 func TestResourcePathValues(t *testing.T) {
+	index := resource.NewIndex()
+	users := index.Bind("users", schema.Schema{
+		Fields: schema.Fields{
+			"id": {
+				Validator: &schema.String{},
+			},
+		},
+	}, mem.NewHandler(), resource.DefaultConf)
+	posts := users.Bind("posts", "user", schema.Schema{
+		Fields: schema.Fields{
+			"id": {
+				Validator: &schema.Integer{},
+			},
+			"user": {
+				Validator: &schema.Reference{Path: "users"},
+			},
+		},
+	}, mem.NewHandler(), resource.DefaultConf)
 	p := ResourcePath{
 		&ResourcePathComponent{
-			Name:  "users",
-			Field: "user",
-			Value: "john",
+			Name:     "users",
+			Field:    "user",
+			Value:    "john",
+			Resource: users,
 		},
 		&ResourcePathComponent{
-			Name:  "posts",
-			Field: "id",
-			Value: "123",
+			Name:     "posts",
+			Field:    "id",
+			Value:    "123",
+			Resource: posts,
 		},
 	}
 	assert.Equal(t, map[string]interface{}{"id": "123", "user": "john"}, p.Values())
 }
 
+func TestResourcePathInvalidValues(t *testing.T) {
+	index := resource.NewIndex()
+	users := index.Bind("users", schema.Schema{
+		Fields: schema.Fields{
+			"id": {
+				Validator: &schema.String{},
+			},
+		},
+	}, mem.NewHandler(), resource.DefaultConf)
+	posts := users.Bind("posts", "user", schema.Schema{
+		Fields: schema.Fields{
+			"id": {
+				Validator: &schema.Integer{},
+			},
+			"user": {
+				Validator: &schema.Reference{Path: "users"},
+			},
+		},
+	}, mem.NewHandler(), resource.DefaultConf)
+	p := ResourcePath{
+		&ResourcePathComponent{
+			Name:     "users",
+			Field:    "user",
+			Value:    "john",
+			Resource: users,
+		},
+		&ResourcePathComponent{
+			Name:     "posts",
+			Field:    "id",
+			Value:    "123",
+			Resource: posts,
+		},
+		&ResourcePathComponent{
+			Name:     "users1",
+			Field:    "user1",
+			Value:    "john1",
+			Resource: posts,
+		},
+	}
+	assert.Equal(t, map[string]interface{}{"id": "123"}, p.Values())
+}
+
 func TestResourcePathAppend(t *testing.T) {
 	index := resource.NewIndex()
 	users := index.Bind("users", schema.Schema{