mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-12 06:52:57 +02:00
fix
This commit is contained in:
parent
f08a73838b
commit
75121570fb
@ -12,7 +12,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestCountColumns(t *testing.T) {
|
||||
func TestCountProjectColumns(t *testing.T) {
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
project, err := GetProjectByID(t.Context(), 1)
|
||||
@ -23,7 +23,7 @@ func TestCountColumns(t *testing.T) {
|
||||
assert.EqualValues(t, 3, count)
|
||||
}
|
||||
|
||||
func TestGetColumnsPaginated(t *testing.T) {
|
||||
func TestGetProjectColumns(t *testing.T) {
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
project, err := GetProjectByID(t.Context(), 1)
|
||||
@ -47,3 +47,19 @@ func TestGetColumnsPaginated(t *testing.T) {
|
||||
}
|
||||
assert.Len(t, allIDs, 3)
|
||||
}
|
||||
|
||||
func TestGetColumnsByIDs(t *testing.T) {
|
||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
project, err := GetProjectByID(t.Context(), 1)
|
||||
assert.NoError(t, err)
|
||||
|
||||
columns, err := GetColumnsByIDs(t.Context(), project.ID, []int64{1, 3, 4})
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, columns, 2)
|
||||
assert.ElementsMatch(t, []int64{1, 3}, []int64{columns[0].ID, columns[1].ID})
|
||||
|
||||
empty, err := GetColumnsByIDs(t.Context(), project.ID, nil)
|
||||
assert.NoError(t, err)
|
||||
assert.Empty(t, empty)
|
||||
}
|
||||
|
||||
@ -1576,15 +1576,15 @@ func Routes() *web.Router {
|
||||
Post(reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, bind(api.CreateProjectOption{}), repo.CreateProject)
|
||||
m.Group("/{id}", func() {
|
||||
m.Combo("").Get(repo.GetProject).
|
||||
Patch(reqToken(), reqRepoWriter(unit.TypeProjects), bind(api.EditProjectOption{}), repo.EditProject).
|
||||
Delete(reqToken(), reqRepoWriter(unit.TypeProjects), repo.DeleteProject)
|
||||
Patch(reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, bind(api.EditProjectOption{}), repo.EditProject).
|
||||
Delete(reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, repo.DeleteProject)
|
||||
m.Combo("/columns").Get(repo.ListProjectColumns).
|
||||
Post(reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, bind(api.CreateProjectColumnOption{}), repo.CreateProjectColumn)
|
||||
})
|
||||
m.Group("/columns/{id}", func() {
|
||||
m.Combo("").
|
||||
Patch(reqToken(), reqRepoWriter(unit.TypeProjects), bind(api.EditProjectColumnOption{}), repo.EditProjectColumn).
|
||||
Delete(reqToken(), reqRepoWriter(unit.TypeProjects), repo.DeleteProjectColumn)
|
||||
Patch(reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, bind(api.EditProjectColumnOption{}), repo.EditProjectColumn).
|
||||
Delete(reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, repo.DeleteProjectColumn)
|
||||
m.Post("/issues", reqToken(), reqRepoWriter(unit.TypeProjects), mustNotBeArchived, bind(api.AddIssueToProjectColumnOption{}), repo.AddIssueToProjectColumn)
|
||||
})
|
||||
}, reqRepoReader(unit.TypeProjects))
|
||||
|
||||
@ -12,10 +12,6 @@ import (
|
||||
|
||||
// ToProject converts a project_model.Project to api.Project
|
||||
func ToProject(ctx context.Context, p *project_model.Project) *api.Project {
|
||||
if p == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
project := &api.Project{
|
||||
ID: p.ID,
|
||||
Title: p.Title,
|
||||
@ -55,10 +51,6 @@ func ToProject(ctx context.Context, p *project_model.Project) *api.Project {
|
||||
|
||||
// ToProjectColumn converts a project_model.Column to api.ProjectColumn
|
||||
func ToProjectColumn(ctx context.Context, column *project_model.Column) *api.ProjectColumn {
|
||||
if column == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &api.ProjectColumn{
|
||||
ID: column.ID,
|
||||
Title: column.Title,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user