improve

Author: yp05327

models/git/branch.go

@@ -464,18 +464,17 @@ func FindRecentlyPushedNewBranches(ctx context.Context, doer *user_model.User, o
 
 	// find all related branches, these branches may already created PRs, we will check later
 	var branches []*Branch
-	cond := FindBranchOptions{
-		PusherID:        doer.ID,
-		IsDeletedBranch: optional.Some(false),
-		CommitAfterUnix: opts.CommitAfterUnix,
-	}.ToConds()
-	cond = cond.And(
-		builder.In("repo_id", repoIDs),
-		// newly created branch have no changes, so skip them
-		builder.Neq{"commit_id": baseBranch.CommitID},
-	)
 	if err := db.GetEngine(ctx).
-		Where(cond).
+		Where(builder.And(
+			builder.Eq{
+				"pusher_id":  doer.ID,
+				"is_deleted": false,
+			},
+			builder.Gte{"commit_time": opts.CommitAfterUnix},
+			builder.In("repo_id", repoIDs),
+			// newly created branch have no changes, so skip them
+			builder.Neq{"commit_id": baseBranch.CommitID},
+		)).
 		OrderBy(db.SearchOrderByRecentUpdated.String()).
 		Find(&branches); err != nil {
 		return nil, err

models/git/branch_list.go

@@ -84,41 +84,25 @@ type FindBranchOptions struct {
 	ExcludeBranchNames []string
 	PusherID           int64
 	IsDeletedBranch    optional.Option[bool]
-	CommitAfterUnix    int64
-	CommitBeforeUnix   int64
 	OrderBy            string
 	Keyword            string
 }
 
 func (opts FindBranchOptions) ToConds() builder.Cond {
 	cond := builder.NewCond()
-
 	if opts.RepoID > 0 {
 		cond = cond.And(builder.Eq{"repo_id": opts.RepoID})
 	}
 
 	if len(opts.ExcludeBranchNames) > 0 {
 		cond = cond.And(builder.NotIn("name", opts.ExcludeBranchNames))
 	}
-
-	if opts.PusherID > 0 {
-		cond = cond.And(builder.Eq{"pusher_id": opts.PusherID})
-	}
-
 	if opts.IsDeletedBranch.Has() {
 		cond = cond.And(builder.Eq{"is_deleted": opts.IsDeletedBranch.Value()})
 	}
 	if opts.Keyword != "" {
 		cond = cond.And(builder.Like{"name", opts.Keyword})
 	}
-
-	if opts.CommitAfterUnix != 0 {
-		cond = cond.And(builder.Gte{"commit_time": opts.CommitAfterUnix})
-	}
-	if opts.CommitBeforeUnix != 0 {
-		cond = cond.And(builder.Lte{"commit_time": opts.CommitBeforeUnix})
-	}
-
 	return cond
 }