Merge pull request #78 from ggicci/fix/77-default-bug

fix: decode with default directive only works the first time

default.go

@@ -12,14 +12,13 @@ func defaultValueSetter(ctx *DirectiveRuntime) error {
 
 	// Transform:
 	// 1. ctx.Argv -> input values
-	// 2. ["default"] -> ctx.Argv
+	// 2. ["default"] -> keys
 	extractor := &extractor{
 		Form: multipart.Form{
 			Value: map[string][]string{
 				"default": ctx.Directive.Argv,
 			},
 		},
 	}
-	ctx.Directive.Argv = []string{"default"}
-	return extractor.Execute(ctx)
+	return extractor.Execute(ctx, "default")
 }

default_test.go

@@ -73,3 +73,31 @@ func TestDirectiveDefault_PatchField(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, expected, got)
 }
+
+// FIX: https://github.com/ggicci/httpin/issues/77
+// Decode parameter struct with default values only works the first time
+func TestDirectiveDeafult_Decode_twice(t *testing.T) {
+	type ThingWithDefaultValues struct {
+		Id      uint `in:"query=id;required"`
+		Page    int  `in:"query=page;default=1"`
+		PerPage int  `in:"query=page_size;default=127"`
+	}
+
+	r, _ := http.NewRequest("GET", "/?id=123", nil)
+	expected := &ThingWithDefaultValues{
+		Id:      123,
+		Page:    1,
+		PerPage: 127,
+	}
+
+	// First decode works as expected
+	xxx := ThingWithDefaultValues{}
+	err := Decode(r, &xxx)
+	assert.NoError(t, err)
+	assert.Equal(t, expected, &xxx)
+
+	// Second decode generates eror
+	err = Decode(r, &xxx)
+	assert.NoError(t, err)
+	assert.Equal(t, expected, &xxx)
+}

extractor.go

@@ -29,8 +29,11 @@ func newExtractor(r *http.Request) *extractor {
 	}
 }
 
-func (e *extractor) Execute(ctx *DirectiveRuntime) error {
-	for _, key := range ctx.Directive.Argv {
+func (e *extractor) Execute(ctx *DirectiveRuntime, keys ...string) error {
+	if len(keys) == 0 {
+		keys = ctx.Directive.Argv
+	}
+	for _, key := range keys {
 		if e.KeyNormalizer != nil {
 			key = e.KeyNormalizer(key)
 		}