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

Jump to bottom

NOISSUE - Fix date filter bug #19

Merged
merged 1 commit into from
Aug 2, 2023
Merged

NOISSUE - Fix date filter bug #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion api/requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (req listTelemetryReq) validate() error {
return ErrLimitSize
}

if req.to.Before(req.from) {
if !req.from.IsZero() && req.to.Before(req.from) {
return ErrInvalidDateRange
}

Expand Down
7 changes: 3 additions & 4 deletions timescale/timescale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,14 @@ func generateQuery(filters callhome.TelemetryFilters) (string, map[string]interf
var queries []string
params := make(map[string]interface{})

switch {
case !filters.From.IsZero():
if !filters.From.IsZero() {
queries = append(queries, "time >= :from")
params["from"] = filters.From
case !filters.To.IsZero():
}
if !filters.To.IsZero() {
queries = append(queries, "time <= :to")
params["to"] = filters.To
}

if filters.Country != "" {
queries = append(queries, "country = :country")
params["country"] = filters.Country
Expand Down