add sort in organisation and user admin list api

factly · Aug 9, 2023 · 8d1db60 · 8d1db60
1 parent 190d091
commit 8d1db60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/server/action/admin/organisation/list.go b/server/action/admin/organisation/list.go
@@ -19,12 +19,17 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	orgIDs := r.URL.Query()["id"]
 	searchQuery := r.URL.Query().Get("q")
+	sort := r.URL.Query().Get("sort")
+
+	if sort != "asc" {
+		sort = "desc"
+	}
 	// if orgIDs is empty, then return all organisations
 	// else return organisations with given ids
 	res := &response{}
 	if len(orgIDs) == 0 {
 		offset, limit := paginationx.Parse(r.URL.Query())
-		err := model.DB.Model(&model.Organisation{}).Where("title ILIKE ?", "%"+searchQuery+"%").Count(&res.Total).Offset(offset).Limit(limit).Find(&res.Nodes).Error
+		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
 		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.DBError()))

diff --git a/server/action/admin/user/list.go b/server/action/admin/user/list.go
@@ -19,12 +19,17 @@ func list(w http.ResponseWriter, r *http.Request) {
 
 	userIDs := r.URL.Query()["id"]
 	searchQuery := r.URL.Query().Get("q")
+	sort := r.URL.Query().Get("sort")
 	res := &response{}
 
+	if sort != "asc" {
+		sort = "desc"
+	}
+
 	if len(userIDs) == 0 {
 		qs := "%" + searchQuery + "%"
 		offset, limit := paginationx.Parse(r.URL.Query())
-		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
+		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
 		if err != nil {
 			loggerx.Error(err)
 			errorx.Render(w, errorx.Parser(errorx.DBError()))