Fix validator not called in id fields during resource path lookup

Author: rs

rest/resource_path.go

@@ -49,13 +49,24 @@ func (p *ResourcePath) Prepend(rsrc *resource.Resource, field string, value inte
 	*p = append(ResourcePath{rp}, *p...)
 }
 
-func (p *ResourcePath) append(rsrc *resource.Resource, field string, value interface{}, name string) {
+func (p *ResourcePath) append(rsrc *resource.Resource, field string, value interface{}, name string) (err error) {
+	if field != "" && value != nil {
+		if f, found := rsrc.Schema().Fields["id"]; found {
+			if f.Validator != nil {
+				value, err = f.Validator.Validate(value)
+				if err != nil {
+					return
+				}
+			}
+		}
+	}
 	rp := resourcePathComponentPool.Get().(*ResourcePathComponent)
 	rp.Name = name
 	rp.Field = field
 	rp.Value = value
 	rp.Resource = rsrc
 	*p = append(*p, rp)
+	return
 }
 
 func (p *ResourcePath) clear() {

rest/resource_path_test.go

@@ -3,6 +3,9 @@ package rest
 import (
 	"testing"
 
+	mem "github.com/rs/rest-layer-mem"
+	"github.com/rs/rest-layer/resource"
+	"github.com/rs/rest-layer/schema"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -22,6 +25,37 @@ func TestResourcePathValues(t *testing.T) {
 	assert.Equal(t, map[string]interface{}{"id": "123", "user": "john"}, p.Values())
 }
 
+func TestResourcePathAppend(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{}
+	err := p.append(users, "user", 123, "users")
+	assert.EqualError(t, err, "not a string")
+	err = p.append(users, "user", "john", "users")
+	assert.NoError(t, err)
+	err = p.append(posts, "id", "123", "posts")
+	assert.EqualError(t, err, "not an integer")
+	err = p.append(posts, "id", 123, "posts")
+	assert.Equal(t, map[string]interface{}{"id": 123, "user": "john"}, p.Values())
+
+}
+
 func TestResourcePathPrepend(t *testing.T) {
 	p := ResourcePath{
 		&ResourcePathComponent{

rest/routing.go

@@ -102,7 +102,9 @@ func findRoute(path string, index resource.Index, route *RouteMatch) error {
 				subResourcePath := resourcePath + "." + subPathComp
 				if subResource, found := index.GetResource(subResourcePath, nil); found {
 					// Append the intermediate resource path
-					route.ResourcePath.append(rsrc, subResource.ParentField(), id, name)
+					if err := route.ResourcePath.append(rsrc, subResource.ParentField(), id, name); err != nil {
+						return err
+					}
 					// Recurse to match the sub-path
 					if err := findRoute(path, index, route); err != nil {
 						return err
@@ -124,13 +126,11 @@ func findRoute(path string, index resource.Index, route *RouteMatch) error {
 				}
 			} else {
 				// Set the id route field
-				route.ResourcePath.append(rsrc, "id", id, name)
-				return nil
+				return route.ResourcePath.append(rsrc, "id", id, name)
 			}
 		}
 		// Set the collection resource
-		route.ResourcePath.append(rsrc, "", nil, name)
-		return nil
+		return route.ResourcePath.append(rsrc, "", nil, name)
 	}
 	route.ResourcePath.clear()
 	return errResourceNotFound