Make the code simpler

Author: lunny

models/git/branch.go

@@ -174,6 +174,13 @@ func GetBranches(ctx context.Context, repoID int64, branchNames []string) ([]*Br
 	return branches, db.GetEngine(ctx).Where("repo_id=?", repoID).In("name", branchNames).Find(&branches)
 }
 
+func GetExistBranches(ctx context.Context, repoID int64, branchNames []string) ([]*Branch, error) {
+	branches := make([]*Branch, 0, len(branchNames))
+	return branches, db.GetEngine(ctx).Where("repo_id=?", repoID).
+		And("is_deleted=?", false).
+		In("name", branchNames).Find(&branches)
+}
+
 func AddBranches(ctx context.Context, branches []*Branch) error {
 	for _, branch := range branches {
 		if _, err := db.GetEngine(ctx).Insert(branch); err != nil {

routers/web/repo/actions/actions.go

@@ -281,28 +281,22 @@ func loadIsRefDeleted(ctx *context.Context, runs actions_model.RunList) error {
 		refName := git.RefName(run.Ref)
 		if refName.IsBranch() {
 			branchName := refName.ShortName()
+			run.IsRefDeleted = true // assume it's deleted then if it's found in the database it's not deleted
 			branchRuns[branchName] = append(branchRuns[branchName], run)
 			branches.Add(branchName)
 		}
 	}
 	if len(branches) == 0 {
 		return nil
 	}
-	var branchInfos []*git_model.Branch
-	if err := db.GetEngine(ctx).Where("repo_id = ?", ctx.Repo.Repository.ID).
-		In("name", branches.Values()).Find(&branchInfos); err != nil {
+	branchInfos, err := git_model.GetExistBranches(ctx, ctx.Repo.Repository.ID, branches.Values())
+	if err != nil {
 		return err
 	}
-	for branch, branchRun := range branchRuns {
-		exist := false
-		for _, branchInfo := range branchInfos {
-			if branchInfo.Name == branch {
-				exist = !branchInfo.IsDeleted
-				break
-			}
-		}
+	for _, branchInfo := range branchInfos {
+		branchRun := branchRuns[branchInfo.Name]
 		for _, br := range branchRun {
-			br.IsRefDeleted = !exist
+			br.IsRefDeleted = false
 		}
 	}
 	return nil