tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-10 17:26:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(user): user id asc

Browse Source
This commit is contained in:
ryan
2026-06-18 13:59:54 +08:00
parent 410ff14795
commit 9c6c697d95
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/apps/admin/user/routers_test.go
+10 -8
View File
@@ -4,7 +4,8 @@
package user package user
import ("bytes" import (
"bytes"
"encoding/json" "encoding/json"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@@ -16,7 +17,8 @@ import ("bytes"
"github.com/Rain-kl/Wavelet/internal/testhelper" "github.com/Rain-kl/Wavelet/internal/testhelper"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/Rain-kl/Wavelet/internal/common/response") "github.com/Rain-kl/Wavelet/internal/common/response"
)
func setupTestRouter(authUser *model.User) *gin.Engine { func setupTestRouter(authUser *model.User) *gin.Engine {
r := testhelper.NewTestGinEngine() r := testhelper.NewTestGinEngine()
@@ -106,9 +108,9 @@ func TestListUsers(t *testing.T) {
if listResp.Total != 3 { if listResp.Total != 3 {
t.Errorf("expected total 3, got %d", listResp.Total) t.Errorf("expected total 3, got %d", listResp.Total)
} }
// Ordered by ID DESC // Ordered by ID ASC
if listResp.Users[0].ID != 1003 || listResp.Users[1].ID != 1002 { if listResp.Users[0].ID != 1001 || listResp.Users[1].ID != 1002 {
t.Errorf("expected ordered DESC, got first ID %d, second ID %d", listResp.Users[0].ID, listResp.Users[1].ID) t.Errorf("expected ordered ASC, got first ID %d, second ID %d", listResp.Users[0].ID, listResp.Users[1].ID)
} }
}) })
@@ -444,9 +446,9 @@ func TestCreateUser(t *testing.T) {
t.Run("validation error - invalid email format", func(t *testing.T) { t.Run("validation error - invalid email format", func(t *testing.T) {
payload := map[string]interface{}{ payload := map[string]interface{}{
"username": "bademail", "username": "bademail",
"password": "password123", "password": "password123",
"email": "not-an-email", "email": "not-an-email",
"is_active": true, "is_active": true,
} }
body, _ := json.Marshal(payload) body, _ := json.Marshal(payload)
internal/repository/user.go
+1 -1
View File
@@ -78,7 +78,7 @@ func ListAdminUsers(ctx context.Context, filter AdminUserListFilter) (int64, []m
offset := (filter.Page - 1) * filter.PageSize offset := (filter.Page - 1) * filter.PageSize
if err := query. if err := query.
Select("id, username, nickname, avatar_url, is_active, is_admin, last_login_at, created_at, updated_at"). Select("id, username, nickname, avatar_url, is_active, is_admin, last_login_at, created_at, updated_at").
Order("id DESC"). Order("id ASC").
Offset(offset). Offset(offset).
Limit(filter.PageSize). Limit(filter.PageSize).
Find(&users).Error; err != nil { Find(&users).Error; err != nil {