Skip to content

Commit e952ac7

Browse files
committed
use case-insensitive like
1 parent 8157fd6 commit e952ac7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

models/issues/issue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ func isPullToCond(isPull optional.Option[bool]) builder.Cond {
509509
return builder.NewCond()
510510
}
511511

512-
func FindLatestIssues(ctx context.Context, repoID int64, isPull optional.Option[bool], pageSize int) (IssueList, error) {
512+
func FindLatestUpdatedIssues(ctx context.Context, repoID int64, isPull optional.Option[bool], pageSize int) (IssueList, error) {
513513
issues := make([]*Issue, 0, pageSize)
514514
err := db.GetEngine(ctx).Where("repo_id = ?", repoID).
515515
And(isPullToCond(isPull)).
@@ -524,7 +524,7 @@ func FindIssuesSuggestionByKeyword(ctx context.Context, repoID int64, keyword st
524524
if excludedID > 0 {
525525
cond = cond.And(builder.Neq{"`id`": excludedID})
526526
}
527-
cond = cond.And(builder.Expr("name LIKE ?", "%"+keyword+"%"))
527+
cond = cond.And(db.BuildCaseInsensitiveLike("`name`", keyword))
528528

529529
issues := make([]*Issue, 0, pageSize)
530530
err := db.GetEngine(ctx).Where("repo_id = ?", repoID).

services/issue/suggestion.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ func GetSuggestion(ctx context.Context, repo *repo_model.Repository, isPull opti
1818
var err error
1919
pageSize := 5
2020
if keyword == "" {
21-
issues, err = issues_model.FindLatestIssues(ctx, repo.ID, isPull, pageSize)
21+
issues, err = issues_model.FindLatestUpdatedIssues(ctx, repo.ID, isPull, pageSize)
2222
if err != nil {
2323
return nil, err
2424
}
2525
} else {
2626
indexKeyword, _ := strconv.ParseInt(keyword, 10, 64)
27-
var issue *issues_model.Issue
27+
var issueByIndex *issues_model.Issue
2828
var excludedID int64
2929
if indexKeyword > 0 {
30-
issue, err = issues_model.GetIssueByIndex(ctx, repo.ID, indexKeyword)
30+
issueByIndex, err = issues_model.GetIssueByIndex(ctx, repo.ID, indexKeyword)
3131
if err != nil && !issues_model.IsErrIssueNotExist(err) {
3232
return nil, err
3333
}
34-
if issue != nil {
35-
excludedID = issue.ID
34+
if issueByIndex != nil {
35+
excludedID = issueByIndex.ID
3636
pageSize--
3737
}
3838
}
@@ -42,8 +42,8 @@ func GetSuggestion(ctx context.Context, repo *repo_model.Repository, isPull opti
4242
return nil, err
4343
}
4444

45-
if issue != nil {
46-
issues = append([]*issues_model.Issue{issue}, issues...)
45+
if issueByIndex != nil {
46+
issues = append([]*issues_model.Issue{issueByIndex}, issues...)
4747
}
4848
}
4949

0 commit comments

Comments
 (0)