mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
Fixes [#3525](https://codeberg.org/forgejo/forgejo/issues/3525) and supersedes [#9586](https://codeberg.org/forgejo/forgejo/pulls/9586) ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [ ] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Features - [PR](https://codeberg.org/forgejo/forgejo/pulls/9829): <!--number 9829 --><!--line 0 --><!--description Y2hvcmU6IFJlbW92ZSBJc0RlbGV0ZWQgZnJvbSBhY3Rpb24gKGFjdGl2aXR5KSB0YWJsZQ==-->chore: Remove IsDeleted from action (activity) table<!--description--> <!--end release-notes-assistant--> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9829 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Leni Kadali <lenikadali@noreply.codeberg.org> Co-committed-by: Leni Kadali <lenikadali@noreply.codeberg.org>
83 lines
2.7 KiB
Go
83 lines
2.7 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package activities
|
|
|
|
import (
|
|
"context"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/organization"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/setting"
|
|
"forgejo.org/modules/timeutil"
|
|
)
|
|
|
|
const (
|
|
// contributionsMaxAgeSeconds How old data to retrieve for the heatmap.
|
|
// 371 days to cover the entire heatmap (53 *full* weeks)
|
|
contributionsMaxAgeSeconds = 32054400
|
|
)
|
|
|
|
// 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(ctx context.Context, user, doer *user_model.User) ([]*UserHeatmapData, error) {
|
|
return getUserHeatmapData(ctx, user, nil, doer)
|
|
}
|
|
|
|
// GetUserHeatmapDataByUserTeam returns an array of UserHeatmapData
|
|
func GetUserHeatmapDataByUserTeam(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
|
|
return getUserHeatmapData(ctx, user, team, doer)
|
|
}
|
|
|
|
func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
|
|
hdata := make([]*UserHeatmapData, 0)
|
|
|
|
if !ActivityReadable(user, doer) {
|
|
return hdata, nil
|
|
}
|
|
|
|
// Group by 15 minute intervals which will allow the client to accurately shift the timestamp to their timezone.
|
|
// The interval is based on the fact that there are timezones such as UTC +5:30 and UTC +12:45.
|
|
groupBy := "created_unix / 900 * 900"
|
|
if setting.Database.Type.IsMySQL() {
|
|
groupBy = "created_unix DIV 900 * 900"
|
|
}
|
|
|
|
cond, err := activityQueryCondition(ctx, GetFeedsOptions{
|
|
RequestedUser: user,
|
|
RequestedTeam: team,
|
|
Actor: doer,
|
|
IncludePrivate: true, // don't filter by private, as we already filter by repo access
|
|
// * 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, db.GetEngine(ctx).
|
|
Select(groupBy+" AS timestamp, count(user_id) as contributions").
|
|
Table("action").
|
|
Where(cond).
|
|
And("created_unix >= ?", timeutil.TimeStampNow()-contributionsMaxAgeSeconds).
|
|
GroupBy("timestamp").
|
|
OrderBy("timestamp").
|
|
Find(&hdata)
|
|
}
|
|
|
|
// GetTotalContributionsInHeatmap returns the total number of contributions in a heatmap
|
|
func GetTotalContributionsInHeatmap(hdata []*UserHeatmapData) int64 {
|
|
var total int64
|
|
for _, v := range hdata {
|
|
total += v.Contributions
|
|
}
|
|
return total
|
|
}
|