mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-27 12:43:09 -04:00
327cdc1787
Continuing the pattern from #9868, fixes another deadlock discovered in synthetic testing of #9785. This modifies the `milestone` table to have the `num_issues`, `num_closed_issues`, and `completeness` statistics be calculated asynchronously. An optional `updateTimestamp` field was added to the stats queue to support the conditional updating of the milestone's modification date, retaining existing functionality. ## 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... - [x] 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. - [x] 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. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9916 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
66 lines
2.2 KiB
Go
66 lines
2.2 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package issues
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/unittest"
|
|
"forgejo.org/modules/optional"
|
|
"forgejo.org/modules/timeutil"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRecalcMilestoneByMilestoneID(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
// Verify no error on recalc of a deleted/non-existent object; important because async recalcs can be queued and
|
|
// then occur later after more state changes have happened.
|
|
err := doRecalcMilestoneByID(t.Context(), -1000, optional.None[timeutil.TimeStamp]())
|
|
require.NoError(t, err)
|
|
|
|
// Intentionally corrupt counts from fixture, then recalc them
|
|
milestone := unittest.AssertExistsAndLoadBean(t, &Milestone{ID: 1})
|
|
updated, err := db.GetEngine(t.Context()).
|
|
Table(&Milestone{}).
|
|
Where("id = ?", milestone.ID).
|
|
Update(map[string]any{
|
|
"num_issues": 1000,
|
|
"num_closed_issues": 1001,
|
|
"completeness": 99,
|
|
"updated_unix": 123,
|
|
})
|
|
require.NoError(t, err)
|
|
require.EqualValues(t, 1, updated)
|
|
err = doRecalcMilestoneByID(t.Context(), milestone.ID, optional.None[timeutil.TimeStamp]())
|
|
require.NoError(t, err)
|
|
milestone = unittest.AssertExistsAndLoadBean(t, &Milestone{ID: 1})
|
|
assert.Equal(t, 1, milestone.NumIssues)
|
|
assert.Equal(t, 0, milestone.NumClosedIssues)
|
|
assert.Equal(t, 0, milestone.Completeness)
|
|
assert.NotEqualValues(t, 123, milestone.UpdatedUnix)
|
|
|
|
// Exercise the updateTimestamp option to the recalc
|
|
updated, err = db.GetEngine(t.Context()).
|
|
Table(&Milestone{}).
|
|
Where("id = ?", milestone.ID).
|
|
Update(map[string]any{
|
|
"num_issues": 1000,
|
|
"num_closed_issues": 1001,
|
|
"completeness": 99,
|
|
"updated_unix": 123,
|
|
})
|
|
require.NoError(t, err)
|
|
require.EqualValues(t, 1, updated)
|
|
err = doRecalcMilestoneByID(t.Context(), milestone.ID, optional.Some(timeutil.TimeStamp(456)))
|
|
require.NoError(t, err)
|
|
milestone = unittest.AssertExistsAndLoadBean(t, &Milestone{ID: 1})
|
|
assert.Equal(t, 1, milestone.NumIssues)
|
|
assert.Equal(t, 0, milestone.NumClosedIssues)
|
|
assert.Equal(t, 0, milestone.Completeness)
|
|
assert.EqualValues(t, 456, milestone.UpdatedUnix)
|
|
}
|