Add sort option recentclose for issues and pulls

Author: markusamshove

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/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())