Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Remove AddFilter method from validation facade #592

Merged
merged 2 commits into from
Aug 9, 2024
Merged

feat: Remove AddFilter method from validation facade #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eea94b4
remove AddFilter
kkumar-gcc Aug 9, 2024
42ec818
chore: update mocks
kkumar-gcc Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions contracts/validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ type Option func(map[string]any)
type Validation interface {
// Make create a new validator instance.
Make(data any, rules map[string]string, options ...Option) (Validator, error)
// AddFilter add the custom filter.
AddFilter(Filter) Validation
// AddFilters add the custom filters.
AddFilters([]Filter) Validation
AddFilters([]Filter) error
// AddRules add the custom rules.
AddRules([]Rule) error
// Rules get the custom rules.
Expand Down
62 changes: 6 additions & 56 deletions mocks/validation/Validation.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions validation/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,18 @@
return NewValidator(v, dataFace), nil
}

func (r *Validation) AddFilter(filter validatecontract.Filter) validatecontract.Validation {
r.filters = append(r.filters, filter)

return r
}

func (r *Validation) AddFilters(filters []validatecontract.Filter) validatecontract.Validation {
func (r *Validation) AddFilters(filters []validatecontract.Filter) error {
existFilterNames := r.existFilterNames()
for _, filter := range filters {
for _, existFilterName := range existFilterNames {
if existFilterName == filter.Signature() {
panic("duplicate filter name: " + filter.Signature())
return errors.New("duplicate filter name: " + filter.Signature())

Check warning on line 73 in validation/validation.go

View check run for this annotation

Codecov / codecov/patch

validation/validation.go#L73 

Added line #L73 was not covered by tests
}
}
}

r.filters = append(r.filters, filters...)
return r
return nil
}

func (r *Validation) AddRules(rules []validatecontract.Rule) error {
Expand Down
17 changes: 6 additions & 11 deletions validation/validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2644,18 +2644,11 @@ func TestAddRule(t *testing.T) {
assert.EqualError(t, err, "duplicate rule name: required")
}

func TestAddFilter(t *testing.T) {
validation := NewValidation()
validation.AddFilter(&DefaultFilter{})
filters := validation.Filters()
filterFunc := filters[0].Handle().(func(string, ...string) string)
assert.Equal(t, "default", filterFunc("", "default"))
assert.Equal(t, "a", filterFunc("a"))
}

func TestAddFilters(t *testing.T) {
validation := NewValidation()
validation.AddFilters([]httpvalidate.Filter{&DefaultFilter{}, &Arr2Str{}})
err := validation.AddFilters([]httpvalidate.Filter{&DefaultFilter{}, &Arr2Str{}})
assert.Nil(t, err)

filters := validation.Filters()
defaultFilterFunc := filters[0].Handle().(func(string, ...string) string)
arr2StrFilterFunc := filters[1].Handle().(func(any, string) string)
Expand All @@ -2674,7 +2667,9 @@ func TestFilters(t *testing.T) {
}

validation := NewValidation()
validation.AddFilter(&DefaultFilter{}).AddFilter(&Arr2Str{})
err := validation.AddFilters([]httpvalidate.Filter{&DefaultFilter{}, &Arr2Str{}})
assert.Nil(t, err)

validator, err := validation.Make(mp, map[string]string{
"name, age, empty, languages, numbers": "required",
}, Filters(map[string]string{
Expand Down
Loading