Skip to content

Prevent NPE due to missing repo in regression in #17551 #17697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 18, 2021
Merged

Prevent NPE due to missing repo in regression in #17551 #17697

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1717ea0
Prevent NPE due to missing repo in regression in #17551
zeripath Nov 17, 2021
fd05345
Merge branch 'main' into fix-regression-due-to-17551
lafriks Nov 17, 2021
d27f7ff
Merge branch 'main' into fix-regression-due-to-17551
zeripath Nov 17, 2021
c8ff557
Merge branch 'main' into fix-regression-due-to-17551
wxiaoguang Nov 18, 2021
7759271
Merge branch 'main' into fix-regression-due-to-17551
lunny Nov 18, 2021
eb59f73
Merge branch 'main' into fix-regression-due-to-17551
techknowlogick Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,26 +1928,38 @@ func (issue *Issue) getParticipantIDsByIssue(e db.Engine) ([]int64, error) {

// Get Blocked By Dependencies, aka all issues this issue is blocked by.
func (issue *Issue) getBlockedByDependencies(e db.Engine) (issueDeps []*DependencyInfo, err error) {
return issueDeps, e.
err = e.
Table("issue").
Join("INNER", "repository", "repository.id = issue.repo_id").
Join("INNER", "issue_dependency", "issue_dependency.dependency_id = issue.id").
Where("issue_id = ?", issue.ID).
// sort by repo id then created date, with the issues of the same repo at the beginning of the list
OrderBy("CASE WHEN issue.repo_id = " + strconv.FormatInt(issue.RepoID, 10) + " THEN 0 ELSE issue.repo_id END, issue.created_unix DESC").
Find(&issueDeps)

for _, depInfo := range issueDeps {
depInfo.Issue.Repo = &depInfo.Repository
}

return issueDeps, err
}

// Get Blocking Dependencies, aka all issues this issue blocks.
func (issue *Issue) getBlockingDependencies(e db.Engine) (issueDeps []*DependencyInfo, err error) {
return issueDeps, e.
err = e.
Table("issue").
Join("INNER", "repository", "repository.id = issue.repo_id").
Join("INNER", "issue_dependency", "issue_dependency.issue_id = issue.id").
Where("dependency_id = ?", issue.ID).
// sort by repo id then created date, with the issues of the same repo at the beginning of the list
OrderBy("CASE WHEN issue.repo_id = " + strconv.FormatInt(issue.RepoID, 10) + " THEN 0 ELSE issue.repo_id END, issue.created_unix DESC").
Find(&issueDeps)

for _, depInfo := range issueDeps {
depInfo.Issue.Repo = &depInfo.Repository
}

return issueDeps, err
}

// BlockedByDependencies finds all Dependencies an issue is blocked by
Expand Down