Merge pull request #5 from utahta/fix-optional-in-array

Fix: tag parser
utahta · Jan 20, 2019 · 25c931e · 25c931e
2 parents b136f69 + 3627df0
commit 25c931e
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 5 deletions.
diff --git a/tag_parser.go b/tag_parser.go
@@ -101,7 +101,8 @@ loop:
 
 	if rootTagChunk.Next == nil {
 		rootTagChunk.Next = &tagChunk{
-			Tags: rootTagChunk.Tags[:],
+			Tags:     rootTagChunk.Tags[:],
+			Optional: rootTagChunk.Optional,
 		}
 	}
 	v.tagCache.Store(rawTag, &rootTagChunk)

diff --git a/tag_parser_test.go b/tag_parser_test.go
@@ -141,7 +141,8 @@ func Test_tagParse(t *testing.T) {
 				Tags:     []Tag{},
 				Optional: true,
 				Next: &tagChunk{
-					Tags: []Tag{},
+					Tags:     []Tag{},
+					Optional: true,
 				},
 			},
 		},
@@ -151,7 +152,8 @@ func Test_tagParse(t *testing.T) {
 				Tags:     []Tag{{Name: "required"}},
 				Optional: true,
 				Next: &tagChunk{
-					Tags: []Tag{{Name: "required"}},
+					Tags:     []Tag{{Name: "required"}},
+					Optional: true,
 				},
 			},
 		},
@@ -161,7 +163,8 @@ func Test_tagParse(t *testing.T) {
 				Tags:     []Tag{{Name: "required"}},
 				Optional: true,
 				Next: &tagChunk{
-					Tags: []Tag{{Name: "required"}},
+					Tags:     []Tag{{Name: "required"}},
+					Optional: true,
 				},
 			},
 		},
@@ -178,6 +181,7 @@ func Test_tagParse(t *testing.T) {
 						{Name: "len", Params: []string{"3"}},
 						{Name: "required"},
 					},
+					Optional: true,
 				},
 			},
 		},
@@ -279,7 +283,8 @@ func Test_tagParse(t *testing.T) {
 				Tags:     []Tag{{Name: "or", Params: []string{"alpha", "numeric"}}},
 				Optional: true,
 				Next: &tagChunk{
-					Tags: []Tag{{Name: "or", Params: []string{"alpha", "numeric"}}},
+					Tags:     []Tag{{Name: "or", Params: []string{"alpha", "numeric"}}},
+					Optional: true,
 				},
 			},
 		},

diff --git a/validator_test.go b/validator_test.go
@@ -160,6 +160,10 @@ func TestValidateStruct_Array(t *testing.T) {
 			S []Cat `valid:"optional ; optional"`
 		}
 
+		OptionalArrayOptionalCatTest2 struct {
+			S []Cat `valid:"optional"`
+		}
+
 		ArrayInterfaceTest struct {
 			S []interface{} `valid:"required"`
 		}
@@ -343,6 +347,36 @@ func TestValidateStruct_Array(t *testing.T) {
 			wantMessage: "S[0].Name: '123' does validate as 'alpha'",
 		},
 
+		// OptionalArrayOptionalCatTest2
+		{
+			name: "Valid OptionalArrayOptionalCatTest2 empty",
+			s: OptionalArrayOptionalCatTest2{
+				S: []Cat{},
+			},
+			wantNoErr: true,
+		},
+		{
+			name: "Valid OptionalArrayOptionalCatTest2 nil",
+			s: OptionalArrayOptionalCatTest2{
+				S: nil,
+			},
+			wantNoErr: true,
+		},
+		{
+			name: "Valid OptionalArrayOptionalCatTest2",
+			s: OptionalArrayOptionalCatTest2{
+				S: []Cat{{}},
+			},
+			wantNoErr: true,
+		},
+		{
+			name: "Invalid OptionalArrayOptionalCatTest2.S[0]",
+			s: OptionalArrayOptionalCatTest2{
+				S: []Cat{{Name: "123", Age: 5}},
+			},
+			wantMessage: "S[0].Name: '123' does validate as 'alpha'",
+		},
+
 		// ArrayInterfaceTest
 		{
 			name: "Valid ArrayInterfaceTest",
@@ -433,6 +467,10 @@ func TestValidateStruct_Map(t *testing.T) {
 			M map[string]Cat `valid:"optional ; optional"`
 		}
 
+		OptionalMapOptionalCatTest2 struct {
+			M map[string]Cat `valid:"optional"`
+		}
+
 		MapInterfaceTest struct {
 			M map[string]interface{} `valid:"required"`
 		}
@@ -628,6 +666,40 @@ func TestValidateStruct_Map(t *testing.T) {
 			wantMessage: "M[key1].Name: '123' does validate as 'alpha'",
 		},
 
+		// OptionalMapOptionalCatTest2
+		{
+			name: "Valid OptionalMapOptionalCatTest2 empty",
+			s: OptionalMapOptionalCatTest2{
+				M: map[string]Cat{},
+			},
+			wantNoErr: true,
+		},
+		{
+			name: "Valid OptionalMapOptionalCatTest2 nil",
+			s: OptionalMapOptionalCatTest2{
+				M: nil,
+			},
+			wantNoErr: true,
+		},
+		{
+			name: "Valid OptionalMapOptionalCatTest2",
+			s: OptionalMapOptionalCatTest2{
+				M: map[string]Cat{
+					"key1": {},
+				},
+			},
+			wantNoErr: true,
+		},
+		{
+			name: "Invalid OptionalMapOptionalCatTest2.M[key1]",
+			s: OptionalMapOptionalCatTest2{
+				M: map[string]Cat{
+					"key1": {Name: "123", Age: 5},
+				},
+			},
+			wantMessage: "M[key1].Name: '123' does validate as 'alpha'",
+		},
+
 		// MapInterfaceTest
 		{
 			name: "Valid MapInterfaceTest",