mirror of
https://github.com/go-gitea/gitea
synced 2024-08-18 13:20:51 +02:00
Only count users own actions for heatmap contributions (#5647)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
This commit is contained in:
parent
97dafdc057
commit
c42bde719e
@ -32,12 +32,22 @@ func GetUserHeatmapDataByUser(user *User) ([]*UserHeatmapData, error) {
|
|||||||
groupByName = groupBy
|
groupByName = groupBy
|
||||||
}
|
}
|
||||||
|
|
||||||
err := x.Select(groupBy+" AS timestamp, count(user_id) as contributions").
|
sess := x.Select(groupBy+" AS timestamp, count(user_id) as contributions").
|
||||||
Table("action").
|
Table("action").
|
||||||
Where("user_id = ?", user.ID).
|
Where("user_id = ?", user.ID).
|
||||||
And("created_unix > ?", (util.TimeStampNow() - 31536000)).
|
And("created_unix > ?", (util.TimeStampNow() - 31536000))
|
||||||
GroupBy(groupByName).
|
|
||||||
|
// * Heatmaps for individual users only include actions that the user themself
|
||||||
|
// did.
|
||||||
|
// * For organizations actions by all users that were made in owned
|
||||||
|
// repositories are counted.
|
||||||
|
if user.Type == UserTypeIndividual {
|
||||||
|
sess = sess.And("act_user_id = ?", user.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
err := sess.GroupBy(groupByName).
|
||||||
OrderBy("timestamp").
|
OrderBy("timestamp").
|
||||||
Find(&hdata)
|
Find(&hdata)
|
||||||
|
|
||||||
return hdata, err
|
return hdata, err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user