OTUS
/
Golang_HomeWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HW09 is completed

pull/10/head
Andrey Ivanov 2020-08-20 10:41:44 +03:00 committed by Andrey Ivanov
parent c8e81106d8
commit a20db7fc16
5 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw09_generator_of_validators/go-validate/main.go
View File

@ -91,7 +91,7 @@ func iterStructFields(name string, s *ast.StructType, buf io.Writer) (bool, erro
// Рекурсивный вызов, в случае если поле является структурой
switch field.Type.(type) {
case *ast.StructType:
if _, err := iterStructFields("."+field.Names[0].Name, field.Type.(*ast.StructType), buf); err != nil {
if _, err := iterStructFields(field.Names[0].Name+".", field.Type.(*ast.StructType), buf); err != nil {
return false, err
}
}

4
hw09_generator_of_validators/go-validate/main_test.go
View File

@ -164,7 +164,7 @@ func TestIterStructFields(T *testing.T) {
}
T.Run("Fine structure", func(t *testing.T) {
buf := bytes.NewBufferString("")
err := iterStructFields(s, buf)
_, err := iterStructFields("", s, buf)
require.Equal(t, FineStructureExpcted, buf.String())
require.NoError(t, err)
})
@ -189,7 +189,7 @@ func TestIterStructFields(T *testing.T) {
}
T.Run("Wrong structure", func(t *testing.T) {
buf1 := bytes.NewBufferString("")
err := iterStructFields(s1, buf1)
_, err := iterStructFields("", s1, buf1)
require.Equal(t, WrongStructureExpcted, buf1.String())
require.NoError(t, err)
})

16
hw09_generator_of_validators/models/models.go
View File

@ -6,12 +6,16 @@ type UserRole string
// NOTE: Several struct specs in one type declaration are allowed.
type (
User struct {
ID string `json:"id" validate:"len:36"`
Name string
Age int `validate:"min:18|max:50"`
Email string `validate:"regexp:^\\w+@\\w+\\.\\w+$"`
Role UserRole `validate:"in:admin,stuff"`
Phones []string `validate:"len:11"`
ID string `json:"id" validate:"len:36"`
Name string
Age int `validate:"min:18|max:50"`
Email string `validate:"regexp:^\\w+@\\w+\\.\\w+$"`
Role UserRole `validate:"in:admin,stuff"`
Phones []string `validate:"len:11"`
Response struct {
Code int `validate:"in:200,404,500"`
Body string `json:"omitempty"`
}
}
App struct {

54
hw09_generator_of_validators/models/models_test.go
View File

@ -17,11 +17,12 @@ func TestUserValidation(t *testing.T) {
requireValidation(t, User{})
goodUser := User{
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
Response: Response{Code: 200},
}
requireNoValidationErrors(t, goodUser)
@ -61,12 +62,13 @@ func TestUserValidation(t *testing.T) {
t.Run("fail phones slice", func(t *testing.T) {
badUser := User{
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
Phones: []string{"+12dfwdf343242343", "898298741293", "fdsf"},
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
Phones: []string{"+12dfwdf343242343", "898298741293", "fdsf"},
Response: Response{Code: 404},
}
errs, err := badUser.Validate()
@ -75,16 +77,30 @@ func TestUserValidation(t *testing.T) {
})
t.Run("pass phones slice", func(t *testing.T) {
badUser := User{
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
Phones: []string{"12345678901", "qazxswedcvf", "............"},
goodUser := User{
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
Phones: []string{"12345678901", "qazxswedcvf", "..........."},
Response: Response{Code: 500},
}
requireNoValidationErrors(t, goodUser)
})
t.Run("embeded structure", func(t *testing.T) {
goodUser := User{
ID: "0a44d582-9749-11ea-a056-9ff7f30f0608",
Name: "John",
Age: 24,
Email: "john@abrams.com",
Role: "admin",
Phones: []string{"12345678901", "qazxswedcvf", "............"},
Response: Response{Code: 500},
}
errs, err := badUser.Validate()
errs, err := goodUser.Validate()
require.Nil(t, err)
requireOneFieldErr(t, errs, "Phones")
})

1
hw09_generator_of_validators/models/models_validation_generated.go
View File

@ -24,6 +24,7 @@ func (u User) Validate() ([]ValidationError, error) {
if ok, err = valRegexp([]string{string(u.Email)},`^\w+@\w+\.\w+$`); !ok { res=append(res,ValidationError{"Email",fmt.Errorf(`regexp:^\w+@\w+\.\w+$`)})}
if ok, err = valInString([]string{string(u.Role)},`admin,stuff`); !ok { res=append(res,ValidationError{"Role",fmt.Errorf(`in:admin,stuff`)})}
if ok, err = valLen(u.Phones,11); !ok { res=append(res,ValidationError{"Phones",fmt.Errorf("len:11")})}
if ok, err = valInInt([]int{int(u.Response.Code)},`200,404,500`); !ok { res=append(res,ValidationError{"Response.Code",fmt.Errorf("in:200,404,500")})}
log.Println(ok)
return res, err
}