Skip to content

Commit 740a0c4

Browse files
guillep2klunny
authored andcommitted
Fix column name ambiguity in GetUserIssueStats() (#8347)
* Add test for FilterModeMention * Fix column name ambiguity * Fix fmt
1 parent cd13f27 commit 740a0c4

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

models/issue.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1661,14 +1661,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
16611661
return nil, err
16621662
}
16631663
case FilterModeAssign:
1664-
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false).
1664+
stats.OpenCount, err = x.Where(cond).And("issue.is_closed = ?", false).
16651665
Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id").
16661666
And("issue_assignees.assignee_id = ?", opts.UserID).
16671667
Count(new(Issue))
16681668
if err != nil {
16691669
return nil, err
16701670
}
1671-
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true).
1671+
stats.ClosedCount, err = x.Where(cond).And("issue.is_closed = ?", true).
16721672
Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id").
16731673
And("issue_assignees.assignee_id = ?", opts.UserID).
16741674
Count(new(Issue))
@@ -1689,14 +1689,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
16891689
return nil, err
16901690
}
16911691
case FilterModeMention:
1692-
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false).
1692+
stats.OpenCount, err = x.Where(cond).And("issue.is_closed = ?", false).
16931693
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
16941694
And("issue_user.uid = ?", opts.UserID).
16951695
Count(new(Issue))
16961696
if err != nil {
16971697
return nil, err
16981698
}
1699-
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true).
1699+
stats.ClosedCount, err = x.Where(cond).And("issue.is_closed = ?", true).
17001700
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
17011701
And("issue_user.uid = ?", opts.UserID).
17021702
Count(new(Issue))

models/issue_test.go

+13
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,19 @@ func TestGetUserIssueStats(t *testing.T) {
279279
ClosedCount: 2,
280280
},
281281
},
282+
{
283+
UserIssueStatsOptions{
284+
UserID: 1,
285+
FilterMode: FilterModeMention,
286+
},
287+
IssueStats{
288+
YourRepositoriesCount: 0,
289+
AssignCount: 2,
290+
CreateCount: 2,
291+
OpenCount: 0,
292+
ClosedCount: 0,
293+
},
294+
},
282295
} {
283296
stats, err := GetUserIssueStats(test.Opts)
284297
if !assert.NoError(t, err) {

0 commit comments

Comments
 (0)