Add sort option recentclose for issues and pulls

models/fixtures/issue.yml

@@ -372,3 +372,57 @@
   created_unix: 1707270422
   updated_unix: 1707270422
   is_locked: false
+
+-
+  id: 23
+  repo_id: 63
+  index: 1
+  poster_id: 40
+  original_author_id: 0
+  name: repo62 pull1
+  content: this pr is created, merged and updated first
+  milestone_id: 0
+  priority: 0
+  is_closed: true
+  is_pull: true
+  num_comments: 0
+  created_unix: 1707270000
+  updated_unix: 1707270001
+  closed_unix: 1707270001
+  is_locked: false
+
+-
+  id: 24
+  repo_id: 63
+  index: 2
+  poster_id: 40
+  original_author_id: 0
+  name: repo62 pull2
+  content: this pr is created and merged second but updated latest
+  milestone_id: 0
+  priority: 0
+  is_closed: true
+  is_pull: true
+  num_comments: 0
+  created_unix: 1707270001
+  updated_unix: 1707279999
+  closed_unix: 1707271000
+  is_locked: false
+
+-
+  id: 25
+  repo_id: 63
+  index: 3
+  poster_id: 40
+  original_author_id: 0
+  name: repo62 pull3
+  content: this pr is created, merged latest but updated before merge
+  milestone_id: 0
+  priority: 0
+  is_closed: true
+  is_pull: true
+  num_comments: 0
+  created_unix: 1707279999
+  updated_unix: 1707275555
+  closed_unix: 1707279999
+  is_locked: false

models/fixtures/pull_request.yml

@@ -117,3 +117,33 @@
   index: 1
   head_repo_id: 61
   base_repo_id: 61
+
+-
+  id: 11
+  issue_id: 23
+  type: 0 # gitea pull request
+  index: 1
+  head_repo_id: 63
+  base_repo_id: 63
+  has_merged: true
+  merged_unix: 1707270001
+
+-
+  id: 12
+  issue_id: 24
+  type: 0 # gitea pull request
+  index: 2
+  head_repo_id: 63
+  base_repo_id: 63
+  has_merged: true
+  merged_unix: 1707271000 # merged before someone commented again
+
+-
+  id: 13
+  issue_id: 25
+  type: 0 # gitea pull request
+  index: 3
+  head_repo_id: 63
+  base_repo_id: 63
+  has_merged: true
+  merged_unix: 1707279999

models/fixtures/repository.yml

@@ -1786,3 +1786,34 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+
+-
+  id: 63
+  owner_id: 42
+  owner_name: org42
+  lower_name: listprsort
+  name: listprsort
+  default_branch: master
+  num_watches: 0
+  num_stars: 0
+  num_forks: 0
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 3
+  num_closed_pulls: 3
+  num_milestones: 0
+  num_closed_milestones: 0
+  num_projects: 0
+  num_closed_projects: 0
+  is_private: false
+  is_empty: false
+  is_archived: false
+  is_mirror: false
+  status: 0
+  is_fork: false
+  fork_id: 0
+  is_template: false
+  template_id: 0
+  size: 0
+  is_fsck_enabled: true
+  close_issues_via_commit_in_any_branch: false

models/fixtures/user.yml

@@ -1549,7 +1549,7 @@
   num_followers: 0
   num_following: 0
   num_stars: 0
-  num_repos: 1
+  num_repos: 2
   num_teams: 0
   num_members: 0
   visibility: 0

models/issues/issue_search.go

@@ -88,6 +88,8 @@ func applySorts(sess *xorm.Session, sortType string, priorityRepoID int64) {
 		sess.Asc("issue.created_unix").Asc("issue.id")
 	case "recentupdate":
 		sess.Desc("issue.updated_unix").Desc("issue.created_unix").Desc("issue.id")
+	case "recentclose":
+		sess.Desc("issue.closed_unix").Desc("issue.created_unix").Desc("issue.id")
 	case "leastupdate":
 		sess.Asc("issue.updated_unix").Asc("issue.created_unix").Asc("issue.id")
 	case "mostcomment":

models/issues/issue_test.go

@@ -378,7 +378,7 @@ func TestCountIssues(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	count, err := issues_model.CountIssues(db.DefaultContext, &issues_model.IssuesOptions{})
 	assert.NoError(t, err)
-	assert.EqualValues(t, 22, count)
+	assert.EqualValues(t, 25, count)
 }
 
 func TestIssueLoadAttributes(t *testing.T) {

models/issues/pull_test.go

@@ -76,6 +76,52 @@ func TestPullRequestsNewest(t *testing.T) {
 	}
 }
 
+func TestPullRequestsRecentClosed(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+	prs, _, err := issues_model.PullRequests(db.DefaultContext, 63, &issues_model.PullRequestsOptions{
+		ListOptions: db.ListOptions{
+			Page: 1,
+		},
+		State:    "closed",
+		SortType: "recentclose",
+	})
+	assert.NoError(t, err)
+
+	// Pull ID | Closed At.  | Updated At
+	//    11   | 1707270001  | 1707270001
+	//    12   | 1707271000  | 1707279999
+	//    13   | 1707279999  | 1707275555
+
+	if assert.Len(t, prs, 3) {
+		assert.EqualValues(t, 13, prs[0].ID)
+		assert.EqualValues(t, 12, prs[1].ID)
+		assert.EqualValues(t, 11, prs[2].ID)
+	}
+}
+
+func TestPullRequestsRecentUpdate(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+	prs, _, err := issues_model.PullRequests(db.DefaultContext, 63, &issues_model.PullRequestsOptions{
+		ListOptions: db.ListOptions{
+			Page: 1,
+		},
+		State:    "closed",
+		SortType: "recentupdate",
+	})
+	assert.NoError(t, err)
+
+	// Pull ID | Closed At.  | Updated At
+	//    11   | 1707270001  | 1707270001
+	//    12   | 1707271000  | 1707279999
+	//    13   | 1707279999  | 1707275555
+
+	if assert.Len(t, prs, 3) {
+		assert.EqualValues(t, 12, prs[0].ID)
+		assert.EqualValues(t, 13, prs[1].ID)
+		assert.EqualValues(t, 11, prs[2].ID)
+	}
+}
+
 func TestLoadRequestedReviewers(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 

models/repo/repo_list_test.go

@@ -138,12 +138,12 @@ func getTestCases() []struct {
 		{
 			name:  "AllPublic/PublicRepositoriesOfUserIncludingCollaborative",
 			opts:  &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 15, AllPublic: true, Template: optional.Some(false)},
-			count: 34,
+			count: 35,
 		},
 		{
 			name:  "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborative",
 			opts:  &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 15, Private: true, AllPublic: true, AllLimited: true, Template: optional.Some(false)},
-			count: 39,
+			count: 40,
 		},
 		{
 			name:  "AllPublic/PublicAndPrivateRepositoriesOfUserIncludingCollaborativeByName",
@@ -158,7 +158,7 @@ func getTestCases() []struct {
 		{
 			name:  "AllPublic/PublicRepositoriesOfOrganization",
 			opts:  &repo_model.SearchRepoOptions{ListOptions: db.ListOptions{Page: 1, PageSize: 10}, OwnerID: 17, AllPublic: true, Collaborate: optional.Some(false), Template: optional.Some(false)},
-			count: 34,
+			count: 35,
 		},
 		{
 			name:  "AllTemplates",

modules/indexer/issues/indexer_test.go

@@ -190,7 +190,7 @@ func searchIssueByID(t *testing.T) {
 		{
 			// NOTE: This tests no assignees filtering and also ToSearchOptions() to ensure it handles the filter correctly
 			opts:        *ToSearchOptions("", &issues.IssuesOptions{AssigneeID: "(none)"}),
-			expectedIDs: []int64{22, 21, 16, 15, 14, 13, 12, 11, 20, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2},
+			expectedIDs: []int64{25, 22, 21, 24, 23, 16, 15, 14, 13, 12, 11, 20, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2},
 		},
 		{
 			opts: SearchOptions{
@@ -255,7 +255,7 @@ func searchIssueIsPull(t *testing.T) {
 			SearchOptions{
 				IsPull: optional.Some(true),
 			},
-			[]int64{22, 21, 12, 11, 20, 19, 9, 8, 3, 2},
+			[]int64{25, 22, 21, 24, 23, 12, 11, 20, 19, 9, 8, 3, 2},
 		},
 	}
 	for _, test := range tests {
@@ -280,7 +280,7 @@ func searchIssueIsClosed(t *testing.T) {
 			SearchOptions{
 				IsClosed: optional.Some(true),
 			},
-			[]int64{5, 4},
+			[]int64{25, 24, 23, 5, 4},
 		},
 	}
 	for _, test := range tests {
@@ -299,7 +299,7 @@ func searchIssueIsArchived(t *testing.T) {
 			SearchOptions{
 				IsArchived: optional.Some(false),
 			},
-			[]int64{22, 21, 17, 16, 15, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
+			[]int64{25, 22, 21, 24, 23, 17, 16, 15, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
 		},
 		{
 			SearchOptions{
@@ -361,7 +361,7 @@ func searchIssueByLabelID(t *testing.T) {
 			SearchOptions{
 				ExcludedLabelIDs: []int64{1},
 			},
-			[]int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3},
+			[]int64{25, 22, 21, 24, 23, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3},
 		},
 	}
 	for _, test := range tests {
@@ -380,7 +380,7 @@ func searchIssueByTime(t *testing.T) {
 			SearchOptions{
 				UpdatedAfterUnix: optional.Some(int64(0)),
 			},
-			[]int64{22, 21, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
+			[]int64{25, 22, 21, 24, 23, 17, 16, 15, 14, 13, 12, 11, 20, 6, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2, 1},
 		},
 	}
 	for _, test := range tests {
@@ -399,7 +399,7 @@ func searchIssueWithOrder(t *testing.T) {
 			SearchOptions{
 				SortBy: internal.SortByCreatedAsc,
 			},
-			[]int64{1, 2, 3, 8, 9, 4, 7, 10, 18, 19, 5, 6, 20, 11, 12, 13, 14, 15, 16, 17, 21, 22},
+			[]int64{1, 2, 3, 8, 9, 4, 7, 10, 18, 19, 5, 6, 20, 11, 12, 13, 14, 15, 16, 17, 23, 24, 21, 22, 25},
 		},
 	}
 	for _, test := range tests {
@@ -452,8 +452,8 @@ func searchIssueWithPaginator(t *testing.T) {
 					PageSize: 5,
 				},
 			},
-			[]int64{22, 21, 17, 16, 15},
-			22,
+			[]int64{25, 22, 21, 24, 23},
+			25,
 		},
 	}
 	for _, test := range tests {

routers/api/v1/repo/pull.go

@@ -73,7 +73,7 @@ func ListPullRequests(ctx *context.APIContext) {
 	//   in: query
 	//   description: Type of sort
 	//   type: string
-	//   enum: [oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority]
+	//   enum: [oldest, recentupdate, recentclose, leastupdate, mostcomment, leastcomment, priority]
 	// - name: milestone
 	//   in: query
 	//   description: ID of the milestone

tests/integration/api_issue_test.go

@@ -306,22 +306,22 @@ func TestAPISearchIssues(t *testing.T) {
 	req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.Len(t, apiIssues, 2)
+	assert.Len(t, apiIssues, 5)
 
 	query.Set("state", "all")
 	link.RawQuery = query.Encode()
 	req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "25", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 20)
 
 	query.Add("limit", "10")
 	link.RawQuery = query.Encode()
 	req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "25", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 10)
 
 	query = url.Values{"assigned": {"true"}, "state": {"all"}}

tests/integration/api_nodeinfo_test.go

@@ -30,6 +30,6 @@ func TestNodeinfo(t *testing.T) {
 	assert.True(t, nodeinfo.OpenRegistrations)
 	assert.Equal(t, "gitea", nodeinfo.Software.Name)
 	assert.Equal(t, 29, nodeinfo.Usage.Users.Total)
-	assert.Equal(t, 22, nodeinfo.Usage.LocalPosts)
+	assert.Equal(t, 25, nodeinfo.Usage.LocalPosts)
 	assert.Equal(t, 3, nodeinfo.Usage.LocalComments)
 }

tests/integration/api_repo_test.go

@@ -94,9 +94,9 @@ func TestAPISearchRepo(t *testing.T) {
 	}{
 		{
 			name: "RepositoriesMax50", requestURL: "/api/v1/repos/search?limit=50&private=false", expectedResults: expectedResults{
-				nil:   {count: 36},
-				user:  {count: 36},
-				user2: {count: 36},
+				nil:   {count: 37},
+				user:  {count: 37},
+				user2: {count: 37},
 			},
 		},
 		{

tests/integration/issue_test.go

@@ -512,22 +512,22 @@ func TestSearchIssues(t *testing.T) {
 	req = NewRequest(t, "GET", link.String())
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.Len(t, apiIssues, 2)
+	assert.Len(t, apiIssues, 5)
 
 	query.Set("state", "all")
 	link.RawQuery = query.Encode()
 	req = NewRequest(t, "GET", link.String())
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "25", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 20)
 
 	query.Add("limit", "5")
 	link.RawQuery = query.Encode()
 	req = NewRequest(t, "GET", link.String())
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "25", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 5)
 
 	query = url.Values{"assigned": {"true"}, "state": {"all"}}