diff --git a/internal/apps/admin/user/routers_test.go b/internal/apps/admin/user/routers_test.go index c2e2cc2c..5fe5e290 100644 --- a/internal/apps/admin/user/routers_test.go +++ b/internal/apps/admin/user/routers_test.go @@ -4,7 +4,8 @@ package user -import ("bytes" +import ( + "bytes" "encoding/json" "net/http" "net/http/httptest" @@ -16,7 +17,8 @@ import ("bytes" "github.com/Rain-kl/Wavelet/internal/testhelper" "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 { r := testhelper.NewTestGinEngine() @@ -106,9 +108,9 @@ func TestListUsers(t *testing.T) { if listResp.Total != 3 { t.Errorf("expected total 3, got %d", listResp.Total) } - // Ordered by ID DESC - if listResp.Users[0].ID != 1003 || 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) + // Ordered by ID ASC + if listResp.Users[0].ID != 1001 || listResp.Users[1].ID != 1002 { + 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) { payload := map[string]interface{}{ - "username": "bademail", - "password": "password123", - "email": "not-an-email", + "username": "bademail", + "password": "password123", + "email": "not-an-email", "is_active": true, } body, _ := json.Marshal(payload) diff --git a/internal/repository/user.go b/internal/repository/user.go index 277d3ca3..cd246c7e 100644 --- a/internal/repository/user.go +++ b/internal/repository/user.go @@ -78,7 +78,7 @@ func ListAdminUsers(ctx context.Context, filter AdminUserListFilter) (int64, []m offset := (filter.Page - 1) * filter.PageSize if err := query. 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). Limit(filter.PageSize). Find(&users).Error; err != nil { @@ -169,4 +169,4 @@ func ListUsersByIDs(ctx context.Context, ids []uint64) ([]model.User, error) { return nil, err } return users, nil -} \ No newline at end of file +}