Skip to content

Commit 8d1db60

Browse files
add sort in organisation and user admin list api
1 parent 190d091 commit 8d1db60

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

server/action/admin/organisation/list.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ func list(w http.ResponseWriter, r *http.Request) {
1919

2020
orgIDs := r.URL.Query()["id"]
2121
searchQuery := r.URL.Query().Get("q")
22+
sort := r.URL.Query().Get("sort")
23+
24+
if sort != "asc" {
25+
sort = "desc"
26+
}
2227
// if orgIDs is empty, then return all organisations
2328
// else return organisations with given ids
2429
res := &response{}
2530
if len(orgIDs) == 0 {
2631
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
2833
if err != nil {
2934
loggerx.Error(err)
3035
errorx.Render(w, errorx.Parser(errorx.DBError()))

server/action/admin/user/list.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ func list(w http.ResponseWriter, r *http.Request) {
1919

2020
userIDs := r.URL.Query()["id"]
2121
searchQuery := r.URL.Query().Get("q")
22+
sort := r.URL.Query().Get("sort")
2223
res := &response{}
2324

25+
if sort != "asc" {
26+
sort = "desc"
27+
}
28+
2429
if len(userIDs) == 0 {
2530
qs := "%" + searchQuery + "%"
2631
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
2833
if err != nil {
2934
loggerx.Error(err)
3035
errorx.Render(w, errorx.Parser(errorx.DBError()))

0 commit comments

Comments
 (0)