move logics to proper file

logics for fetching reviewers in pull requests
is now placed in the RetrieveRepoMetas

Author: CalK16

routers/web/repo/compare.go

@@ -19,7 +19,6 @@ import (
 	"code.gitea.io/gitea/models/db"
 	git_model "code.gitea.io/gitea/models/git"
 	issues_model "code.gitea.io/gitea/models/issues"
-	"code.gitea.io/gitea/models/organization"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
@@ -40,7 +39,6 @@ import (
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/context/upload"
 	"code.gitea.io/gitea/services/gitdiff"
-	repo_service "code.gitea.io/gitea/services/repository"
 )
 
 const (
@@ -791,47 +789,6 @@ func CompareDiff(ctx *context.Context) {
 			if ctx.Written() {
 				return
 			}
-
-			// Get reviewer info for pr
-			var (
-				reviewers       []*user_model.User
-				teamReviewers   []*organization.Team
-				reviewersResult []*repoReviewerSelection
-			)
-			reviewers, err = repo_model.GetReviewers(ctx, ctx.Repo.Repository, ctx.Doer.ID, ctx.Doer.ID)
-			if err != nil {
-				ctx.ServerError("GetReviewers", err)
-				return
-			}
-
-			teamReviewers, err = repo_service.GetReviewerTeams(ctx, ctx.Repo.Repository)
-			if err != nil {
-				ctx.ServerError("GetReviewerTeams", err)
-				return
-			}
-
-			for _, user := range reviewers {
-				reviewersResult = append(reviewersResult, &repoReviewerSelection{
-					IsTeam:    false,
-					CanChange: true,
-					User:      user,
-					ItemID:    user.ID,
-				})
-			}
-
-			// negative reviewIDs represent team requests
-			for _, team := range teamReviewers {
-				reviewersResult = append(reviewersResult, &repoReviewerSelection{
-					IsTeam:    true,
-					CanChange: true,
-					Team:      team,
-					ItemID:    -team.ID,
-				})
-			}
-			ctx.Data["Reviewers"] = reviewersResult
-			if ctx.Written() {
-				return
-			}
 		}
 	}
 	beforeCommitID := ctx.Data["BeforeCommitID"].(string)

routers/web/repo/issue.go

@@ -557,8 +557,8 @@ func renderMilestones(ctx *context.Context) {
 	ctx.Data["ClosedMilestones"] = closedMilestones
 }
 
-// RetrieveRepoMilestonesAndAssignees find all the milestones and assignees of a repository
-func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.Repository) {
+// RetrieveRepoMilestonesAndAssignees find all the milestones, assignees, and reviewers of a repository
+func RetrieveRepoMilestonesAssigneesAndReviewers(ctx *context.Context, repo *repo_model.Repository) {
 	var err error
 	ctx.Data["OpenMilestones"], err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{
 		RepoID:   repo.ID,
@@ -585,6 +585,8 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R
 	ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers)
 
 	handleTeamMentions(ctx)
+
+	retrieveReviewers(ctx)
 }
 
 func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) {
@@ -862,7 +864,7 @@ func RetrieveRepoMetas(ctx *context.Context, repo *repo_model.Repository, isPull
 		labels = append(labels, orgLabels...)
 	}
 
-	RetrieveRepoMilestonesAndAssignees(ctx, repo)
+	RetrieveRepoMilestonesAssigneesAndReviewers(ctx, repo)
 	if ctx.Written() {
 		return nil
 	}
@@ -883,6 +885,46 @@ func RetrieveRepoMetas(ctx *context.Context, repo *repo_model.Repository, isPull
 	return labels
 }
 
+func retrieveReviewers(ctx *context.Context) {
+	// Get reviewer info for pr
+	var (
+		reviewers       []*user_model.User
+		teamReviewers   []*organization.Team
+		reviewersResult []*repoReviewerSelection
+	)
+	reviewers, err := repo_model.GetReviewers(ctx, ctx.Repo.Repository, ctx.Doer.ID, ctx.Doer.ID)
+	if err != nil {
+		ctx.ServerError("GetReviewers", err)
+		return
+	}
+
+	teamReviewers, err = repo_service.GetReviewerTeams(ctx, ctx.Repo.Repository)
+	if err != nil {
+		ctx.ServerError("GetReviewerTeams", err)
+		return
+	}
+
+	for _, user := range reviewers {
+		reviewersResult = append(reviewersResult, &repoReviewerSelection{
+			IsTeam:    false,
+			CanChange: true,
+			User:      user,
+			ItemID:    user.ID,
+		})
+	}
+
+	// negative reviewIDs represent team requests
+	for _, team := range teamReviewers {
+		reviewersResult = append(reviewersResult, &repoReviewerSelection{
+			IsTeam:    true,
+			CanChange: true,
+			Team:      team,
+			ItemID:    -team.ID,
+		})
+	}
+	ctx.Data["Reviewers"] = reviewersResult
+}
+
 // Tries to load and set an issue template. The first return value indicates if a template was loaded.
 func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleFiles []string) (bool, map[string]error) {
 	commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
@@ -1573,7 +1615,7 @@ func ViewIssue(ctx *context.Context) {
 
 	// Check milestone and assignee.
 	if ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
-		RetrieveRepoMilestonesAndAssignees(ctx, repo)
+		RetrieveRepoMilestonesAssigneesAndReviewers(ctx, repo)
 		retrieveProjects(ctx, repo)
 
 		if ctx.Written() {