Skip to content

Commit

Permalink
improve FindProjects (#23085)
Browse files Browse the repository at this point in the history
I found `FindAndCount` which can `Find` and `Count` in the same time
Maybe it is better to use it in `FindProjects`

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
  • Loading branch information
yp05327 and lunny authored Feb 24, 2023
1 parent 0bc8bb3 commit 5b87c05
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions models/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,8 @@ func CountProjects(ctx context.Context, opts SearchOptions) (int64, error) {

// FindProjects returns a list of all projects that have been created in the repository
func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, error) {
e := db.GetEngine(ctx)
e := db.GetEngine(ctx).Where(opts.toConds())
projects := make([]*Project, 0, setting.UI.IssuePagingNum)
cond := opts.toConds()

count, err := e.Where(cond).Count(new(Project))
if err != nil {
return nil, 0, fmt.Errorf("Count: %w", err)
}

e = e.Where(cond)

if opts.Page > 0 {
e = e.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum)
Expand All @@ -243,7 +235,8 @@ func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, e
e.Asc("created_unix")
}

return projects, count, e.Find(&projects)
count, err := e.FindAndCount(&projects)
return projects, count, err
}

// NewProject creates a new Project
Expand Down

0 comments on commit 5b87c05

Please sign in to comment.