f6bec85296
* now uses the same permission model as for the activity feed: only include activities in repos, that the doer has access to. this might be somewhat slower. * also improves handling of user.KeepActivityPrivate (still shows the heatmap to self & admins) * extend tests * adjust integration test to new behaviour * add access to actions for admins * extend heatmap unit tests
62 lines
2.1 KiB
Go
62 lines
2.1 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.package models
|
|
|
|
package models
|
|
|
|
import (
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/timeutil"
|
|
)
|
|
|
|
// UserHeatmapData represents the data needed to create a heatmap
|
|
type UserHeatmapData struct {
|
|
Timestamp timeutil.TimeStamp `json:"timestamp"`
|
|
Contributions int64 `json:"contributions"`
|
|
}
|
|
|
|
// GetUserHeatmapDataByUser returns an array of UserHeatmapData
|
|
func GetUserHeatmapDataByUser(user *User, doer *User) ([]*UserHeatmapData, error) {
|
|
hdata := make([]*UserHeatmapData, 0)
|
|
|
|
if !activityReadable(user, doer) {
|
|
return hdata, nil
|
|
}
|
|
|
|
var groupBy string
|
|
var groupByName = "timestamp" // We need this extra case because mssql doesn't allow grouping by alias
|
|
switch {
|
|
case setting.Database.UseSQLite3:
|
|
groupBy = "strftime('%s', strftime('%Y-%m-%d', created_unix, 'unixepoch'))"
|
|
case setting.Database.UseMySQL:
|
|
groupBy = "UNIX_TIMESTAMP(DATE(FROM_UNIXTIME(created_unix)))"
|
|
case setting.Database.UsePostgreSQL:
|
|
groupBy = "extract(epoch from date_trunc('day', to_timestamp(created_unix)))"
|
|
case setting.Database.UseMSSQL:
|
|
groupBy = "datediff(SECOND, '19700101', dateadd(DAY, 0, datediff(day, 0, dateadd(s, created_unix, '19700101'))))"
|
|
groupByName = groupBy
|
|
}
|
|
|
|
cond, err := activityQueryCondition(GetFeedsOptions{
|
|
RequestedUser: user,
|
|
Actor: doer,
|
|
IncludePrivate: true, // don't filter by private, as we already filter by repo access
|
|
IncludeDeleted: true,
|
|
// * 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.
|
|
OnlyPerformedBy: !user.IsOrganization(),
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return hdata, x.
|
|
Select(groupBy+" AS timestamp, count(user_id) as contributions").
|
|
Table("action").
|
|
Where(cond).
|
|
And("created_unix > ?", (timeutil.TimeStampNow() - 31536000)).
|
|
GroupBy(groupByName).
|
|
OrderBy("timestamp").
|
|
Find(&hdata)
|
|
}
|