Fix incorrect oldest sort in project list (#25806)
sort type `oldest` should be `Asc`. Added a test for this.
This commit is contained in:
parent
491cc06ffe
commit
44572e9243
5 changed files with 64 additions and 15 deletions
|
@ -7,6 +7,8 @@
|
||||||
creator_id: 2
|
creator_id: 2
|
||||||
board_type: 1
|
board_type: 1
|
||||||
type: 2
|
type: 2
|
||||||
|
created_unix: 1688973030
|
||||||
|
updated_unix: 1688973030
|
||||||
|
|
||||||
-
|
-
|
||||||
id: 2
|
id: 2
|
||||||
|
@ -17,6 +19,8 @@
|
||||||
creator_id: 3
|
creator_id: 3
|
||||||
board_type: 1
|
board_type: 1
|
||||||
type: 2
|
type: 2
|
||||||
|
created_unix: 1688973010
|
||||||
|
updated_unix: 1688973010
|
||||||
|
|
||||||
-
|
-
|
||||||
id: 3
|
id: 3
|
||||||
|
@ -27,6 +31,8 @@
|
||||||
creator_id: 5
|
creator_id: 5
|
||||||
board_type: 1
|
board_type: 1
|
||||||
type: 2
|
type: 2
|
||||||
|
created_unix: 1688973020
|
||||||
|
updated_unix: 1688973020
|
||||||
|
|
||||||
-
|
-
|
||||||
id: 4
|
id: 4
|
||||||
|
@ -37,3 +43,5 @@
|
||||||
creator_id: 2
|
creator_id: 2
|
||||||
board_type: 1
|
board_type: 1
|
||||||
type: 2
|
type: 2
|
||||||
|
created_unix: 1688973000
|
||||||
|
updated_unix: 1688973000
|
||||||
|
|
|
@ -196,7 +196,7 @@ type SearchOptions struct {
|
||||||
RepoID int64
|
RepoID int64
|
||||||
Page int
|
Page int
|
||||||
IsClosed util.OptionalBool
|
IsClosed util.OptionalBool
|
||||||
SortType string
|
OrderBy db.SearchOrderBy
|
||||||
Type Type
|
Type Type
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,26 +226,28 @@ func CountProjects(ctx context.Context, opts SearchOptions) (int64, error) {
|
||||||
return db.GetEngine(ctx).Where(opts.toConds()).Count(new(Project))
|
return db.GetEngine(ctx).Where(opts.toConds()).Count(new(Project))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetSearchOrderByBySortType(sortType string) db.SearchOrderBy {
|
||||||
|
switch sortType {
|
||||||
|
case "oldest":
|
||||||
|
return db.SearchOrderByOldest
|
||||||
|
case "recentupdate":
|
||||||
|
return db.SearchOrderByRecentUpdated
|
||||||
|
case "leastupdate":
|
||||||
|
return db.SearchOrderByLeastUpdated
|
||||||
|
default:
|
||||||
|
return db.SearchOrderByNewest
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// FindProjects returns a list of all projects that have been created in the repository
|
// FindProjects returns a list of all projects that have been created in the repository
|
||||||
func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, error) {
|
func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, error) {
|
||||||
e := db.GetEngine(ctx).Where(opts.toConds())
|
e := db.GetEngine(ctx).Where(opts.toConds()).OrderBy(opts.OrderBy.String())
|
||||||
projects := make([]*Project, 0, setting.UI.IssuePagingNum)
|
projects := make([]*Project, 0, setting.UI.IssuePagingNum)
|
||||||
|
|
||||||
if opts.Page > 0 {
|
if opts.Page > 0 {
|
||||||
e = e.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum)
|
e = e.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch opts.SortType {
|
|
||||||
case "oldest":
|
|
||||||
e.Desc("created_unix")
|
|
||||||
case "recentupdate":
|
|
||||||
e.Desc("updated_unix")
|
|
||||||
case "leastupdate":
|
|
||||||
e.Asc("updated_unix")
|
|
||||||
default:
|
|
||||||
e.Asc("created_unix")
|
|
||||||
}
|
|
||||||
|
|
||||||
count, err := e.FindAndCount(&projects)
|
count, err := e.FindAndCount(&projects)
|
||||||
return projects, count, err
|
return projects, count, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,3 +82,42 @@ func TestProject(t *testing.T) {
|
||||||
|
|
||||||
assert.True(t, projectFromDB.IsClosed)
|
assert.True(t, projectFromDB.IsClosed)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestProjectsSort(t *testing.T) {
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
sortType string
|
||||||
|
wants []int64
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
sortType: "default",
|
||||||
|
wants: []int64{1, 3, 2, 4},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
sortType: "oldest",
|
||||||
|
wants: []int64{4, 2, 3, 1},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
sortType: "recentupdate",
|
||||||
|
wants: []int64{1, 3, 2, 4},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
sortType: "leastupdate",
|
||||||
|
wants: []int64{4, 2, 3, 1},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
projects, count, err := FindProjects(db.DefaultContext, SearchOptions{
|
||||||
|
OrderBy: GetSearchOrderByBySortType(tt.sortType),
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.EqualValues(t, int64(4), count)
|
||||||
|
if assert.Len(t, projects, 4) {
|
||||||
|
for i := range projects {
|
||||||
|
assert.EqualValues(t, tt.wants[i], projects[i].ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ func Projects(ctx *context.Context) {
|
||||||
OwnerID: ctx.ContextUser.ID,
|
OwnerID: ctx.ContextUser.ID,
|
||||||
Page: page,
|
Page: page,
|
||||||
IsClosed: util.OptionalBoolOf(isShowClosed),
|
IsClosed: util.OptionalBoolOf(isShowClosed),
|
||||||
SortType: sortType,
|
OrderBy: project_model.GetSearchOrderByBySortType(sortType),
|
||||||
Type: projectType,
|
Type: projectType,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -74,7 +74,7 @@ func Projects(ctx *context.Context) {
|
||||||
RepoID: repo.ID,
|
RepoID: repo.ID,
|
||||||
Page: page,
|
Page: page,
|
||||||
IsClosed: util.OptionalBoolOf(isShowClosed),
|
IsClosed: util.OptionalBoolOf(isShowClosed),
|
||||||
SortType: sortType,
|
OrderBy: project_model.GetSearchOrderByBySortType(sortType),
|
||||||
Type: project_model.TypeRepository,
|
Type: project_model.TypeRepository,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in a new issue