Fix select page (#84)

Fix select page
acmestack · May 27, 2024 · ffcc4a9 · ffcc4a9
1 parent 75724bf
commit ffcc4a9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/gplus/dao.go b/gplus/dao.go
@@ -50,6 +50,12 @@ func (dao Dao[T]) NewQuery() (*QueryCond[T], *T) {
 }
 
 func NewPage[T any](current, size int) *Page[T] {
+	if current <= 0 {
+		current = 1
+	}
+	if size <= 0 {
+		size = 10
+	}
 	return &Page[T]{Current: current, Size: size}
 }
 

diff --git a/tests/dao_test.go b/tests/dao_test.go
@@ -296,6 +296,26 @@ func TestSelectPage(t *testing.T) {
 
 }
 
+func TestSelectPageDefaultPageParam(t *testing.T) {
+	deleteOldData()
+	users := getUsers()
+	gplus.InsertBatch[User](users)
+
+	query, model := gplus.NewQuery[User]()
+	page := gplus.NewPage[User](0, 0)
+	query.Eq(&model.Username, users[0].Username).Or().Eq(&model.Username, users[5].Username)
+	resultPage, db := gplus.SelectPage(page, query)
+	if db.Error != nil {
+		t.Errorf("errors happened when selectByIds : %v", db.Error)
+	}
+	if resultPage.Total != 2 {
+		t.Errorf("page total expects: %v, got %v", 2, resultPage.Total)
+	}
+
+	AssertObjEqual(t, page.Current, 1)
+	AssertObjEqual(t, page.Size, 10)
+}
+
 func TestSelectPageGeneric2(t *testing.T) {
 	deleteOldData()
 	users := getUsers()