diff --git a/internal/storage/ticker.go b/internal/storage/ticker.go index b7a0229d..891d1fb1 100644 --- a/internal/storage/ticker.go +++ b/internal/storage/ticker.go @@ -148,8 +148,11 @@ func NewTickerFilter(req *http.Request) TickerFilter { } } } - if req.URL.Query().Get("sort") != "" { - filter.Sort = req.URL.Query().Get("sort") + + if req.URL.Query().Get("sort") == "asc" { + filter.Sort = "asc" + } else { + filter.Sort = "desc" } domain := req.URL.Query().Get("domain") diff --git a/internal/storage/user.go b/internal/storage/user.go index cc515af0..04a843ac 100644 --- a/internal/storage/user.go +++ b/internal/storage/user.go @@ -8,10 +8,6 @@ import ( "golang.org/x/crypto/bcrypt" ) -var ( - UserOrderFields = []string{"id", "created_at", "updated_at", "email", "is_super_admin"} -) - type User struct { ID int `gorm:"primaryKey"` CreatedAt time.Time @@ -98,8 +94,11 @@ func NewUserFilter(req *http.Request) UserFilter { } } } - if req.URL.Query().Get("sort") != "" { - filter.Sort = req.URL.Query().Get("sort") + + if req.URL.Query().Get("sort") == "asc" { + filter.Sort = "asc" + } else { + filter.Sort = "desc" } email := req.URL.Query().Get("email")