Skip to content

Commit

Permalink
support validate minLength minimum maxmum
Browse files Browse the repository at this point in the history
  • Loading branch information
@wenzuochao @peze
wenzuochao authored and peze committed May 13, 2020
1 parent d3a7dc9 commit 4c13582
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 18 deletions.
80 changes: 79 additions & 1 deletion tea/tea.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ var basicTypes = []string{
}

// Verify whether the parameters meet the requirements
var validateParams = []string{"require", "pattern", "maxLength"}
var validateParams = []string{"require", "pattern", "maxLength", "minLength", "maximum", "minimum"}

// CastError is used for cast type fails
type CastError struct {
Expand Down Expand Up @@ -837,6 +837,27 @@ func validatePtr(elementValue reflect.Value, containsregexpTag bool, tag, tagNam
return err
}
}

if tagName == "minLength" {
err := checkMinLength(elementValue.Elem(), tag)
if err != nil {
return err
}
}

if tagName == "maximum" {
err := checkMaximum(elementValue.Elem(), tag)
if err != nil {
return err
}
}

if tagName == "minimum" {
err := checkMinimum(elementValue.Elem(), tag)
if err != nil {
return err
}
}
}
} else {
err := validate(elementValue)
Expand Down Expand Up @@ -883,6 +904,63 @@ func checkMaxLength(valueField reflect.Value, tag string) error {
return nil
}

func checkMinLength(valueField reflect.Value, tag string) error {
if valueField.IsValid() {
minLength, err := strconv.Atoi(tag)
if err != nil {
return err
}
length := valueField.Len()
if valueField.Kind().String() == "string" {
length = strings.Count(valueField.String(), "") - 1
}
if minLength > length {
errMsg := fmt.Sprintf("Length of %s is less than %d", valueField.String(), minLength)
return errors.New(errMsg)
}
}
return nil
}

func checkMaximum(valueField reflect.Value, tag string) error {
if valueField.IsValid() && valueField.String() != "" {
maximum, err := strconv.ParseFloat(tag, 64)
if err != nil {
return err
}
byt, _ := json.Marshal(valueField.Interface())
num, err := strconv.ParseFloat(string(byt), 64)
if err != nil {
return err
}
if maximum < num {
errMsg := fmt.Sprintf("%f is greater than %f", num, maximum)
return errors.New(errMsg)
}
}
return nil
}

func checkMinimum(valueField reflect.Value, tag string) error {
if valueField.IsValid() && valueField.String() != "" {
minimum, err := strconv.ParseFloat(tag, 64)
if err != nil {
return err
}

byt, _ := json.Marshal(valueField.Interface())
num, err := strconv.ParseFloat(string(byt), 64)
if err != nil {
return err
}
if minimum > num {
errMsg := fmt.Sprintf("%f is less than %f", num, minimum)
return errors.New(errMsg)
}
}
return nil
}

// Determines whether realType is in filterTypes
func isFilterType(realType string, filterTypes []string) bool {
for _, value := range filterTypes {
Expand Down
93 changes: 76 additions & 17 deletions tea/tea_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,32 @@ var runtimeObj = map[string]interface{}{
}

type validateTest struct {
Num *int `json:"num" require:"true"`
Name *string `json:"name" maxLength:"4"`
Str *string `json:"str" pattern:"^[a-d]*$" maxLength:"4"`
Test *errLength `json:"test"`
List []*string `json:"list" pattern:"^[a-d]*$" maxLength:"4"`
Num1 *int `json:"num1" require:"true" minimum:"2"`
Num2 *int `json:"num2" maximum:"6"`
Name1 *string `json:"name1" maxLength:"4"`
Name2 *string `json:"name2" minLength:"2"`
Str *string `json:"str" pattern:"^[a-d]*$" maxLength:"4"`
MaxLength *errMaxLength `json:"MaxLength"`
MinLength *errMinLength `json:"MinLength"`
Maximum *errMaximum `json:"Maximum"`
Minimum *errMinimum `json:"Minimum"`
List []*string `json:"list" pattern:"^[a-d]*$" maxLength:"4"`
}

type errMaxLength struct {
Num *int `json:"num" maxLength:"a"`
}

type errLength struct {
Num *int `json:"num" maxLength:"a"`
type errMinLength struct {
Num *int `json:"num" minLength:"a"`
}

type errMaximum struct {
Num *int `json:"num" maximum:"a"`
}

type errMinimum struct {
Num *int `json:"num" minimum:"a"`
}

type Progresstest struct {
Expand Down Expand Up @@ -528,9 +545,9 @@ func Test_ToString(t *testing.T) {
}

func Test_Validate(t *testing.T) {
num := 1
num := 3
config := &validateTest{
Num: &num,
Num1: &num,
}
err := Validate(config)
utils.AssertNil(t, err)
Expand All @@ -541,10 +558,11 @@ func Test_validate(t *testing.T) {
err := validate(reflect.ValueOf(test))
utils.AssertNil(t, err)

num := 1
num := 3
str0, str1 := "abc", "abcddd"
val := &validateTest{
Num: &num,
Num1: &num,
Num2: &num,
Str: &str0,
List: []*string{&str0},
}
Expand All @@ -556,15 +574,15 @@ func Test_validate(t *testing.T) {
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, "Length of abcddd is more than 4", err.Error())

val.Num = nil
val.Num1 = nil
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, "num should be setted", err.Error())
utils.AssertEqual(t, "num1 should be setted", err.Error())

val.Name = String("最大长度")
val.Name1 = String("最大长度")
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, "num should be setted", err.Error())
utils.AssertEqual(t, "num1 should be setted", err.Error())

val.Num = &num
val.Num1 = &num
val.Str = &str0
val.List = []*string{&str1}
err = validate(reflect.ValueOf(val))
Expand All @@ -581,11 +599,52 @@ func Test_validate(t *testing.T) {

val.Str = &str0
val.List = []*string{&str0}
val.Test = &errLength{
val.MaxLength = &errMaxLength{
Num: &num,
}
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `strconv.Atoi: parsing "a": invalid syntax`, err.Error())

val.MaxLength = nil
val.MinLength = &errMinLength{
Num: &num,
}
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `strconv.Atoi: parsing "a": invalid syntax`, err.Error())

val.MinLength = nil
val.Maximum = &errMaximum{
Num: &num,
}
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `strconv.ParseFloat: parsing "a": invalid syntax`, err.Error())

val.Maximum = nil
val.Minimum = &errMinimum{
Num: &num,
}
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `strconv.ParseFloat: parsing "a": invalid syntax`, err.Error())

val.Minimum = nil
val.Num2 = Int(10)
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `10.000000 is greater than 6.000000`, err.Error())

val.Num2 = nil
val.Name1 = String("maxLengthTouch")
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `Length of maxLengthTouch is more than 4`, err.Error())

val.Name1 = nil
val.Name2 = String("")
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `Length of is less than 2`, err.Error())

val.Name2 = nil
val.Num1 = Int(0)
err = validate(reflect.ValueOf(val))
utils.AssertEqual(t, `0.000000 is less than 2.000000`, err.Error())
}

func Test_Prettify(t *testing.T) {
Expand Down

0 comments on commit 4c13582

Please sign in to comment.