File tree 2 files changed +12
-2
lines changed
2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -19,12 +19,17 @@ func list(w http.ResponseWriter, r *http.Request) {
19
19
20
20
orgIDs := r .URL .Query ()["id" ]
21
21
searchQuery := r .URL .Query ().Get ("q" )
22
+ sort := r .URL .Query ().Get ("sort" )
23
+
24
+ if sort != "asc" {
25
+ sort = "desc"
26
+ }
22
27
// if orgIDs is empty, then return all organisations
23
28
// else return organisations with given ids
24
29
res := & response {}
25
30
if len (orgIDs ) == 0 {
26
31
offset , limit := paginationx .Parse (r .URL .Query ())
27
- err := model .DB .Model (& model.Organisation {}).Where ("title ILIKE ?" , "%" + searchQuery + "%" ).Count (& res .Total ).Offset (offset ).Limit (limit ).Find (& res .Nodes ).Error
32
+ err := model .DB .Model (& model.Organisation {}).Where ("title ILIKE ?" , "%" + searchQuery + "%" ).Order ( "created_at " + sort ). Count (& res .Total ).Offset (offset ).Limit (limit ).Find (& res .Nodes ).Error
28
33
if err != nil {
29
34
loggerx .Error (err )
30
35
errorx .Render (w , errorx .Parser (errorx .DBError ()))
Original file line number Diff line number Diff line change @@ -19,12 +19,17 @@ func list(w http.ResponseWriter, r *http.Request) {
19
19
20
20
userIDs := r .URL .Query ()["id" ]
21
21
searchQuery := r .URL .Query ().Get ("q" )
22
+ sort := r .URL .Query ().Get ("sort" )
22
23
res := & response {}
23
24
25
+ if sort != "asc" {
26
+ sort = "desc"
27
+ }
28
+
24
29
if len (userIDs ) == 0 {
25
30
qs := "%" + searchQuery + "%"
26
31
offset , limit := paginationx .Parse (r .URL .Query ())
27
- err := model .DB .Model (& model.User {}).Where ("display_name ILIKE ? OR email ILIKE ?" , qs , qs ).Count (& res .Total ).Offset (offset ).Limit (limit ).Find (& res .Nodes ).Error
32
+ err := model .DB .Model (& model.User {}).Where ("display_name ILIKE ? OR email ILIKE ?" , qs , qs ).Order ( "created_at " + sort ). Count (& res .Total ).Offset (offset ).Limit (limit ).Find (& res .Nodes ).Error
28
33
if err != nil {
29
34
loggerx .Error (err )
30
35
errorx .Render (w , errorx .Parser (errorx .DBError ()))
You can’t perform that action at this time.
0 commit comments