Remove prefix index search in suggestion feature

Author: lunny

models/issues/issue.go

@@ -10,6 +10,7 @@ import (
 	"html/template"
 	"regexp"
 	"slices"
+	"strconv"
 
 	"code.gitea.io/gitea/models/db"
 	project_model "code.gitea.io/gitea/models/project"
@@ -519,38 +520,19 @@ func FindLatestIssues(ctx context.Context, repoID int64, isPull optional.Option[
 	return issues, err
 }
 
-func FindIssuesTitleKeywords(ctx context.Context, repoID int64, keyword string, isPull optional.Option[bool], nonIDs []int64, pageSize int) (IssueList, error) {
-	issues := make([]*Issue, 0, pageSize)
-	sess := db.GetEngine(ctx).Where("repo_id = ?", repoID).
-		And(isPullToCond(isPull))
-	if len(nonIDs) > 0 {
-		sess.NotIn("id", nonIDs)
-	}
-	err := sess.And("name LIKE ?", "%"+keyword+"%").
-		OrderBy("created_unix DESC").
-		Limit(pageSize).
-		Find(&issues)
-	return issues, err
-}
-
-func FindIssuesWithIndexPrefix(ctx context.Context, repoID, index int64, isPull optional.Option[bool], pageSize int) (IssueList, error) {
-	var cond string
-	switch {
-	case setting.Database.Type.IsSQLite3():
-		cond = "CAST(`index` AS TEXT) LIKE ?"
-	case setting.Database.Type.IsMySQL():
-		cond = "CAST(`index` AS CHAR) LIKE ?"
-	case setting.Database.Type.IsPostgreSQL():
-		cond = "index::TEXT LIKE ?"
-	case setting.Database.Type.IsMSSQL():
-		cond = "CAST([index] AS VARCHAR) LIKE ?"
+func FindIssuesSuggestionByKeyword(ctx context.Context, repoID int64, keyword string, isPull optional.Option[bool], pageSize int) (IssueList, error) {
+	indexKeyword, _ := strconv.ParseInt(keyword, 10, 64)
+	cond := builder.NewCond()
+	if indexKeyword > 0 {
+		cond = cond.Or(builder.Eq{"`index`": indexKeyword})
 	}
+	cond = cond.Or(builder.Expr("name LIKE ?", "%"+keyword+"%"))
 
 	issues := make([]*Issue, 0, pageSize)
 	err := db.GetEngine(ctx).Where("repo_id = ?", repoID).
 		And(isPullToCond(isPull)).
-		Where(cond, fmt.Sprintf("%d%%", index)).
-		OrderBy("`index` ASC").
+		And(cond).
+		OrderBy("`index` DESC").
 		Limit(pageSize).
 		Find(&issues)
 	return issues, err

services/issue/suggestion.go

@@ -5,6 +5,7 @@ package issue
 
 import (
 	"context"
+	"sort"
 	"strconv"
 
 	issues_model "code.gitea.io/gitea/models/issues"
@@ -23,25 +24,21 @@ func GetSuggestion(ctx context.Context, repo *repo_model.Repository, isPull opti
 			return nil, err
 		}
 	} else {
+		issues, err = issues_model.FindIssuesSuggestionByKeyword(ctx, repo.ID, keyword, isPull, pageSize)
+		if err != nil {
+			return nil, err
+		}
 		indexKeyword, _ := strconv.ParseInt(keyword, 10, 64)
-		nonIDs := []int64{}
 		if indexKeyword > 0 {
-			issues, err = issues_model.FindIssuesWithIndexPrefix(ctx, repo.ID, indexKeyword, isPull, pageSize)
-			if err != nil {
-				return nil, err
-			}
-			for _, issue := range issues {
-				nonIDs = append(nonIDs, issue.ID)
-			}
-			pageSize -= len(issues)
-		}
-
-		if pageSize > 0 {
-			newIssues, err := issues_model.FindIssuesTitleKeywords(ctx, repo.ID, keyword, isPull, nonIDs, pageSize)
-			if err != nil {
-				return nil, err
-			}
-			issues = append(issues, newIssues...)
+			sort.Slice(issues, func(i, j int) bool {
+				if issues[i].Index == indexKeyword {
+					return true
+				}
+				if issues[j].Index == indexKeyword {
+					return false
+				}
+				return issues[i].Index > issues[j].Index
+			})
 		}
 	}