Use pointer of ListOptions instead of struct

Author: lunny

models/issues/issue_search.go

@@ -21,7 +21,7 @@ import (
 
 // IssuesOptions represents options of an issue.
 type IssuesOptions struct { //nolint
-	db.ListOptions
+	*db.ListOptions
 	RepoIDs            []int64 // overwrites RepoCond if the length is not 0
 	AllPublic          bool    // include also all public repositories
 	RepoCond           builder.Cond

models/issues/issue_test.go

@@ -155,17 +155,16 @@ func TestIssues(t *testing.T) {
 	}{
 		{
 			issues_model.IssuesOptions{
-				ListOptions: db.ListOptionsAll,
-				AssigneeID:  1,
-				SortType:    "oldest",
+				AssigneeID: 1,
+				SortType:   "oldest",
 			},
 			[]int64{1, 6},
 		},
 		{
 			issues_model.IssuesOptions{
 				RepoCond: builder.In("repo_id", 1, 3),
 				SortType: "oldest",
-				ListOptions: db.ListOptions{
+				ListOptions: &db.ListOptions{
 					Page:     1,
 					PageSize: 4,
 				},
@@ -175,7 +174,7 @@ func TestIssues(t *testing.T) {
 		{
 			issues_model.IssuesOptions{
 				LabelIDs: []int64{1},
-				ListOptions: db.ListOptions{
+				ListOptions: &db.ListOptions{
 					Page:     1,
 					PageSize: 4,
 				},
@@ -185,7 +184,7 @@ func TestIssues(t *testing.T) {
 		{
 			issues_model.IssuesOptions{
 				LabelIDs: []int64{1, 2},
-				ListOptions: db.ListOptions{
+				ListOptions: &db.ListOptions{
 					Page:     1,
 					PageSize: 4,
 				},
@@ -194,7 +193,6 @@ func TestIssues(t *testing.T) {
 		},
 		{
 			issues_model.IssuesOptions{
-				ListOptions:  db.ListOptionsAll,
 				MilestoneIDs: []int64{1},
 			},
 			[]int64{2},
@@ -328,7 +326,7 @@ func TestCorrectIssueStats(t *testing.T) {
 
 	// Now we will get all issueID's that match the "Bugs are nasty" query.
 	issues, err := issues_model.Issues(context.TODO(), &issues_model.IssuesOptions{
-		ListOptions: db.ListOptions{
+		ListOptions: &db.ListOptions{
 			PageSize: issueAmount,
 		},
 		RepoIDs: []int64{1},

modules/indexer/internal/paginator.go

@@ -10,15 +10,15 @@ import (
 )
 
 // ParsePaginator parses a db.Paginator into a skip and limit
-func ParsePaginator(listOptions db.ListOptions, max ...int) (int, int) {
+func ParsePaginator(listOptions *db.ListOptions, max ...int) (int, int) {
 	// Use a very large number to indicate no limit
 	unlimited := math.MaxInt32
 	if len(max) > 0 {
 		// Some indexer engines have a limit on the page size, respect that
 		unlimited = max[0]
 	}
 
-	if listOptions.IsListAll() {
+	if listOptions == nil || listOptions.IsListAll() {
 		// It shouldn't happen. In actual usage scenarios, there should not be requests to search all.
 		// But if it does happen, respect it and return "unlimited".
 		// And it's also useful for testing.

modules/indexer/issues/db/db.go

@@ -79,7 +79,7 @@ func (i *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	}
 
 	// If pagesize == 0, return total count only. It's a special case for search count.
-	if options.ListOptions.PageSize == 0 {
+	if options.ListOptions != nil && options.ListOptions.PageSize == 0 {
 		total, err := issue_model.CountIssues(ctx, opt, cond)
 		if err != nil {
 			return nil, err

modules/indexer/issues/indexer.go

@@ -308,7 +308,7 @@ func SearchIssues(ctx context.Context, opts *SearchOptions) ([]int64, int64, err
 
 // CountIssues counts issues by options. It is a shortcut of SearchIssues(ctx, opts) but only returns the total count.
 func CountIssues(ctx context.Context, opts *SearchOptions) (int64, error) {
-	opts = opts.Copy(func(options *SearchOptions) { options.ListOptions = db_model.ListOptions{PageSize: 0} })
+	opts = opts.Copy(func(options *SearchOptions) { options.ListOptions = &db_model.ListOptions{PageSize: 0} })
 
 	_, total, err := SearchIssues(ctx, opts)
 	return total, err

modules/indexer/issues/indexer_test.go

@@ -397,7 +397,7 @@ func searchIssueWithPaginator(t *testing.T) {
 	}{
 		{
 			SearchOptions{
-				ListOptions: db.ListOptions{
+				ListOptions: &db.ListOptions{
 					PageSize: 5,
 				},
 			},

modules/indexer/issues/internal/model.go

@@ -106,7 +106,7 @@ type SearchOptions struct {
 	UpdatedAfterUnix  optional.Option[int64]
 	UpdatedBeforeUnix optional.Option[int64]
 
-	db.ListOptions
+	*db.ListOptions
 
 	SortBy SortBy // sort by field
 }