From 05d36433aa6369c18c5f25db9eee05f00d85def9 Mon Sep 17 00:00:00 2001 From: "m.huber" Date: Mon, 18 Aug 2025 16:34:18 +0200 Subject: [PATCH 1/2] make magic string an const --- models/issues/pull.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/models/issues/pull.go b/models/issues/pull.go index 00d7bfe1cab2e..abd5a9b4dcdab 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -29,6 +29,8 @@ import ( var ErrMustCollaborator = util.NewPermissionDeniedErrorf("user must be a collaborator") +const reviewedBy = "Reviewed-by: " + // ErrPullRequestNotExist represents a "PullRequestNotExist" kind of error. type ErrPullRequestNotExist struct { ID int64 @@ -392,7 +394,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer) } else if review.Reviewer == nil { continue } - if _, err := writer.Write([]byte("Reviewed-by: ")); err != nil { + if _, err := writer.Write([]byte(reviewedBy)); err != nil { return err } if _, err := writer.Write([]byte(review.Reviewer.NewGitSig().String())); err != nil { From ec37ffb682adc4fd29b01618ab6902b97a26abc9 Mon Sep 17 00:00:00 2001 From: "m.huber" Date: Mon, 18 Aug 2025 16:34:33 +0200 Subject: [PATCH 2/2] reformat sql to be more redable and use builder --- models/issues/pull.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/models/issues/pull.go b/models/issues/pull.go index abd5a9b4dcdab..7a37b627e1bd0 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -350,7 +350,11 @@ type ReviewCount struct { func (pr *PullRequest) GetApprovalCounts(ctx context.Context) ([]*ReviewCount, error) { rCounts := make([]*ReviewCount, 0, 6) sess := db.GetEngine(ctx).Where("issue_id = ?", pr.IssueID) - return rCounts, sess.Select("issue_id, type, count(id) as `count`").Where("official = ? AND dismissed = ?", true, false).GroupBy("issue_id, type").Table("review").Find(&rCounts) + return rCounts, sess.Select("issue_id, type, count(id) as `count`"). + Where(builder.Eq{"official": true, "dismissed": false}). + GroupBy("issue_id, type"). + Table("review"). + Find(&rCounts) } // GetApprovers returns the approvers of the pull request