mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-26 02:23:04 -04:00
Project columns and cards use a sorting field for ordering, but nothing prevents duplicate values from being inserted. This causes unpredictable ordering and makes swap-based reordering unsafe. Additionally, the same issue can be added to a project multiple times, which shouldn't be possible. This PR adds a migration to clean up existing data and enforce three unique constraints: - (project_id, sorting) on project_board — one sorting value per column per project - (project_id, issue_id) on project_issue — one card per issue per project - (project_board_id, sorting) on project_issue — one sorting value per card per column The migration deduplicates existing rows and reassigns sequential sorting values before adding the constraints. Changes - Migration: fix duplicate sorting values in project_board and project_issue, remove duplicate (project_id, issue_id) rows, add three unique constraints - MoveColumnsOnProject: two-phase swap (negate then set) to avoid constraint collisions - MoveIssuesOnProjectColumn: three-phase approach with duplicate validation and sorted lock ordering - UpdateColumn: always persist sorting field (allows setting to 0) - GetDefaultColumn: query max sorting before auto-creating - createDefaultColumnsForProject: explicit sequential sorting - changeProjectStatus: only set ClosedDateUnix when closing ## 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 - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11334 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Myers Carpenter <myers@maski.org> Co-committed-by: Myers Carpenter <myers@maski.org>
180 lines
5.4 KiB
Go
180 lines
5.4 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package project
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/models/unittest"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGetDefaultColumn(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
projectWithoutDefault, err := GetProjectByID(db.DefaultContext, 5)
|
|
require.NoError(t, err)
|
|
|
|
// check if default column was added
|
|
column, err := projectWithoutDefault.GetDefaultColumn(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(5), column.ProjectID)
|
|
assert.Equal(t, "Uncategorized", column.Title)
|
|
|
|
projectWithMultipleDefaults, err := GetProjectByID(db.DefaultContext, 6)
|
|
require.NoError(t, err)
|
|
|
|
// check if multiple defaults were removed
|
|
column, err = projectWithMultipleDefaults.GetDefaultColumn(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(6), column.ProjectID)
|
|
assert.Equal(t, int64(9), column.ID)
|
|
|
|
// set 8 as default column
|
|
require.NoError(t, SetDefaultColumn(db.DefaultContext, column.ProjectID, 8))
|
|
|
|
// then 9 will become a non-default column
|
|
column, err = GetColumn(db.DefaultContext, 9)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int64(6), column.ProjectID)
|
|
assert.False(t, column.Default)
|
|
}
|
|
|
|
func Test_moveIssuesToAnotherColumn(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
column1 := unittest.AssertExistsAndLoadBean(t, &Column{ID: 1, ProjectID: 1})
|
|
|
|
issues, err := column1.GetIssues(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, issues, 1)
|
|
assert.EqualValues(t, 1, issues[0].ID)
|
|
|
|
column2 := unittest.AssertExistsAndLoadBean(t, &Column{ID: 2, ProjectID: 1})
|
|
issues, err = column2.GetIssues(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, issues, 1)
|
|
assert.EqualValues(t, 3, issues[0].ID)
|
|
|
|
err = column1.moveIssuesToAnotherColumn(db.DefaultContext, column2)
|
|
require.NoError(t, err)
|
|
|
|
issues, err = column1.GetIssues(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Empty(t, issues)
|
|
|
|
issues, err = column2.GetIssues(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, issues, 2)
|
|
assert.EqualValues(t, 3, issues[0].ID)
|
|
assert.EqualValues(t, 0, issues[0].Sorting)
|
|
assert.EqualValues(t, 1, issues[1].ID)
|
|
assert.EqualValues(t, 1, issues[1].Sorting)
|
|
}
|
|
|
|
func Test_MoveColumnsOnProject(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
project1 := unittest.AssertExistsAndLoadBean(t, &Project{ID: 1})
|
|
columns, err := project1.GetColumns(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, columns, 3)
|
|
assert.EqualValues(t, 0, columns[0].Sorting)
|
|
assert.EqualValues(t, 1, columns[1].Sorting)
|
|
assert.EqualValues(t, 2, columns[2].Sorting)
|
|
|
|
err = MoveColumnsOnProject(db.DefaultContext, project1, map[int64]int64{
|
|
0: columns[1].ID,
|
|
1: columns[2].ID,
|
|
2: columns[0].ID,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
columnsAfter, err := project1.GetColumns(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, columnsAfter, 3)
|
|
assert.Equal(t, columns[1].ID, columnsAfter[0].ID)
|
|
assert.Equal(t, columns[2].ID, columnsAfter[1].ID)
|
|
assert.Equal(t, columns[0].ID, columnsAfter[2].ID)
|
|
}
|
|
|
|
func TestMoveColumnsOnProjectSwap(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
project1 := unittest.AssertExistsAndLoadBean(t, &Project{ID: 1})
|
|
columns, err := project1.GetColumns(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
require.Len(t, columns, 3)
|
|
|
|
// First give them distinct positions
|
|
err = MoveColumnsOnProject(db.DefaultContext, project1, map[int64]int64{
|
|
0: columns[0].ID,
|
|
1: columns[1].ID,
|
|
2: columns[2].ID,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// Now swap columns 0 and 1 (would collide under single-phase update)
|
|
err = MoveColumnsOnProject(db.DefaultContext, project1, map[int64]int64{
|
|
0: columns[1].ID,
|
|
1: columns[0].ID,
|
|
2: columns[2].ID,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
columnsAfter, err := project1.GetColumns(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, columnsAfter, 3)
|
|
assert.Equal(t, columns[1].ID, columnsAfter[0].ID)
|
|
assert.Equal(t, columns[0].ID, columnsAfter[1].ID)
|
|
assert.Equal(t, columns[2].ID, columnsAfter[2].ID)
|
|
}
|
|
|
|
func TestUpdateColumnSortingZero(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
column := unittest.AssertExistsAndLoadBean(t, &Column{ID: 1})
|
|
column.Sorting = 5
|
|
require.NoError(t, UpdateColumn(db.DefaultContext, column))
|
|
|
|
// Verify it was set to 5
|
|
updated, err := GetColumn(db.DefaultContext, column.ID)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int8(5), updated.Sorting)
|
|
|
|
// Now set it back to 0
|
|
column.Sorting = 0
|
|
require.NoError(t, UpdateColumn(db.DefaultContext, column))
|
|
|
|
updated, err = GetColumn(db.DefaultContext, column.ID)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, int8(0), updated.Sorting)
|
|
}
|
|
|
|
func Test_NewColumn(t *testing.T) {
|
|
require.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
project1 := unittest.AssertExistsAndLoadBean(t, &Project{ID: 1})
|
|
columns, err := project1.GetColumns(db.DefaultContext)
|
|
require.NoError(t, err)
|
|
assert.Len(t, columns, 3)
|
|
|
|
for i := 0; i < maxProjectColumns-3; i++ {
|
|
err := NewColumn(db.DefaultContext, &Column{
|
|
Title: fmt.Sprintf("column-%d", i+4),
|
|
ProjectID: project1.ID,
|
|
})
|
|
require.NoError(t, err)
|
|
}
|
|
err = NewColumn(db.DefaultContext, &Column{
|
|
Title: "column-21",
|
|
ProjectID: project1.ID,
|
|
})
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "maximum number of columns reached")
|
|
}
|