thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Fix issue not showing on default board and add test (#27720)

Browse source 
See https://github.com/go-gitea/gitea/pull/27718#issuecomment-1773743014
. Add a test to ensure its behavior.
Why this test uses `ProjectBoardID=0`? Because in `SearchOptions`,
`ProjectBoardID=0` means what it is. But in `IssueOptions`,
`ProjectBoardID=0` means there is no condition, and
`ProjectBoardID=db.NoConditionID` means the board ID = 0.
It's really confusing. Probably it's better to separate the db search
engine and the other issue search code. It's really two different
systems. As far as I can see, `IssueOptions` is not necessary for most
of the code, which has very simple issue search conditions.
This commit is contained in:
Nanguan Lin 2023-10-25 19:51:49 +08:00 committed by GitHub
parent 31f8880bc2
commit 1eae2aadae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/issues/issue_search.go
View file

@ -186,7 +186,7 @@ func applyProjectBoardCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.S
if opts.ProjectBoardID > 0 { if opts.ProjectBoardID > 0 {
sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID})) sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}))
} else if opts.ProjectBoardID == db.NoConditionID { } else if opts.ProjectBoardID == db.NoConditionID {
sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Neq{"project_board_id": 0})) sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}))
} }
return sess return sess
} }

6
modules/indexer/issues/indexer_test.go
View file

@ -382,6 +382,12 @@ func searchIssueInProject(t *testing.T) {
}, },
[]int64{1}, []int64{1},
}, },
{
SearchOptions{
ProjectBoardID: int64Pointer(0), // issue with in default board
},
[]int64{2},
},
} }
for _, test := range tests { for _, test := range tests {
issueIDs, _, err := SearchIssues(context.TODO(), &test.opts) issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)