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.

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

fix: verify query separator #13

Merged
merged 2 commits into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 18 additions & 17 deletions src/usecases/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,47 +113,48 @@ func (ru *repositoryUseCase) ValidateQuery(q string) (language string, err error
type ValidatorFunc func(qualifier, value string) error

// validateFilters verifies the filters in the query
func validateFilters(q string) (language string, error error) {
func validateFilters(q string) (language string, err error) {
validators := map[string]ValidatorFunc{
"size": validateNumberOperator,
"topics": validateNumberOperator,
"stars": validateNumberOperator,
"followers": validateNumberOperator,
"forks": validateNumberOperator,

"license": validateEqualOperator,
"language": validateEqualOperator,

"created": validateDateOperator,
"pushed": validateDateOperator,
"license": validateEqualOperator,
"language": validateEqualOperator,
"created": validateDateOperator,
"pushed": validateDateOperator,
}

parts := strings.Fields(q)
hasLanguageFilter := false

for _, part := range parts {
for _, part := range strings.Fields(q) {
if strings.Count(part, ":") > 1 {
return "", fmt.Errorf("invalid filter format in '%s': use '+' to separate filters, not ':'", part)
}

qualifier, value, found := strings.Cut(part, ":")
if !found {
continue
}

if qualifier == "language" {
hasLanguageFilter = true
language = value
}

validator, exists := validators[qualifier]
if !exists {
return language, fmt.Errorf("unknown qualifier: %s", qualifier)
return "", fmt.Errorf("unknown qualifier: %s", qualifier)
}

if err := validator(qualifier, value); err != nil {
return language, err
return "", err
}

if qualifier == "language" {
hasLanguageFilter = true
language = value
}
}

if !hasLanguageFilter {
return language, fmt.Errorf("no language filter set, please provide one")
return "", fmt.Errorf("no language filter set, please provide one")
}

return language, nil
Expand Down
4 changes: 4 additions & 0 deletions src/usecases/repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ func TestValidateFilters(t *testing.T) {
query: "unknown:value",
wantError: assert.Error,
},
"invalid separator usage, return error": {
query: "language:go:size:10",
wantError: assert.Error,
},
"missing language filter, return error": {
query: "tetris stars:>100 created:>2023-01-01",
wantError: assert.Error,
Expand Down
Loading