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>
104 lines
2.7 KiB
Go
104 lines
2.7 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package activities_test
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
activities_model "forgejo.org/models/activities"
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/unittest"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/json"
|
|
"forgejo.org/modules/timeutil"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGetUserHeatmapDataByUser(t *testing.T) {
|
|
testCases := []struct {
|
|
desc string
|
|
userID int64
|
|
doerID int64
|
|
CountResult int
|
|
JSONResult string
|
|
}{
|
|
{
|
|
"self looks at action in private repo",
|
|
2, 2, 1, `[{"timestamp":1603227600,"contributions":1}]`,
|
|
},
|
|
{
|
|
"admin looks at action in private repo",
|
|
2, 1, 1, `[{"timestamp":1603227600,"contributions":1}]`,
|
|
},
|
|
{
|
|
"other user looks at action in private repo",
|
|
2, 3, 0, `[]`,
|
|
},
|
|
{
|
|
"nobody looks at action in private repo",
|
|
2, 0, 0, `[]`,
|
|
},
|
|
{
|
|
"collaborator looks at action in private repo",
|
|
16, 15, 1, `[{"timestamp":1603267200,"contributions":1}]`,
|
|
},
|
|
{
|
|
"no action action not performed by target user",
|
|
3, 3, 0, `[]`,
|
|
},
|
|
{
|
|
"multiple actions performed with two grouped together",
|
|
10, 10, 3, `[{"timestamp":1603009800,"contributions":1},{"timestamp":1603010700,"contributions":2}]`,
|
|
},
|
|
{
|
|
"test cutoff within",
|
|
40, 40, 1, `[{"timestamp":1577404800,"contributions":1}]`,
|
|
},
|
|
}
|
|
// Prepare
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
// Mock time
|
|
timeutil.MockSet(time.Date(2021, 1, 1, 0, 0, 0, 0, time.UTC))
|
|
defer timeutil.MockUnset()
|
|
|
|
for _, tc := range testCases {
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: tc.userID})
|
|
|
|
doer := &user_model.User{ID: tc.doerID}
|
|
_, err := unittest.LoadBeanIfExists(doer)
|
|
require.NoError(t, err)
|
|
if tc.doerID == 0 {
|
|
doer = nil
|
|
}
|
|
|
|
// get the action for comparison
|
|
actions, count, err := activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
RequestedUser: user,
|
|
Actor: doer,
|
|
IncludePrivate: true,
|
|
OnlyPerformedBy: true,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// Get the heatmap and compare
|
|
heatmap, err := activities_model.GetUserHeatmapDataByUser(db.DefaultContext, user, doer)
|
|
var contributions int
|
|
for _, hm := range heatmap {
|
|
contributions += int(hm.Contributions)
|
|
}
|
|
require.NoError(t, err)
|
|
assert.Len(t, actions, contributions, "invalid action count: did the test data became too old?")
|
|
assert.Equal(t, count, int64(contributions))
|
|
assert.Equal(t, tc.CountResult, contributions, tc.desc)
|
|
|
|
// Test JSON rendering
|
|
jsonData, err := json.Marshal(heatmap)
|
|
require.NoError(t, err)
|
|
assert.JSONEq(t, tc.JSONResult, string(jsonData))
|
|
}
|
|
}
|