fix: allow re-requesting uncounted review approvals (#38988)

services/issue/pull.go

@@ -182,7 +182,7 @@ func HasAllRequiredCodeownerReviews(ctx context.Context, pb *git_model.Protected
 	// owner lacks write access, or isn't on the approvals whitelist). Unlike the other
 	// branch-protection checks below, this one only cares whether a listed code owner approved.
 	approvingReviews, err := issues_model.FindLatestReviews(ctx, issues_model.FindReviewOptions{
-		Types:        []issues_model.ReviewType{issues_model.ReviewTypeApprove, issues_model.ReviewTypeReject},
+		Types:        []issues_model.ReviewType{issues_model.ReviewTypeApprove, issues_model.ReviewTypeReject, issues_model.ReviewTypeRequest},
 		IssueID:      pr.IssueID,
 		OfficialOnly: false,
 		Dismissed:    optional.Some(false),

services/issue/review_request.go

@@ -103,6 +103,10 @@ func isValidReviewRequest(ctx context.Context, reviewer, doer *user_model.User,
 			return nil
 		}
 
+		if !issue.Repo.IsArchived && doer.ID == reviewer.ID && lastReview != nil && lastReview.Type == issues_model.ReviewTypeApprove {
+			return nil
+		}
+
 		return issues_model.ErrNotValidReviewRequest{
 			Reason: "Doer can't choose reviewer",
 			UserID: doer.ID,

services/issue/review_request_test.go

@@ -0,0 +1,57 @@
+// Copyright 2026 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package issue
+
+import (
+	"testing"
+
+	issues_model "gitea.dev/models/issues"
+	"gitea.dev/models/unittest"
+	user_model "gitea.dev/models/user"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestReviewRequestRetractOwnApproval(t *testing.T) {
+	for _, tc := range []struct {
+		name       string
+		reviewType issues_model.ReviewType
+		archived   bool
+		allowed    bool
+	}{
+		{"approval", issues_model.ReviewTypeApprove, false, true},
+		{"comment", issues_model.ReviewTypeComment, false, false},
+		{"archived repository", issues_model.ReviewTypeApprove, true, false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			require.NoError(t, unittest.PrepareTestDatabase())
+
+			pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{IssueID: 2})
+			pull.HasMerged = false
+			require.NoError(t, pull.UpdateCols(t.Context(), "has_merged"))
+			issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+			require.NoError(t, issue.LoadRepo(t.Context()))
+			require.NoError(t, issue.Repo.LoadOwner(t.Context()))
+			reviewer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
+
+			review, _, err := issues_model.SubmitReview(t.Context(), reviewer, issue, tc.reviewType, "review", "", false, nil)
+			require.NoError(t, err)
+			assert.False(t, review.Official)
+			issue.Repo.IsArchived = tc.archived
+
+			_, err = ReviewRequest(t.Context(), issue, reviewer, nil, reviewer, true)
+			if !tc.allowed {
+				assert.True(t, issues_model.IsErrNotValidReviewRequest(err))
+				return
+			}
+			require.NoError(t, err)
+
+			review, err = issues_model.GetReviewByIssueIDAndUserID(t.Context(), issue.ID, reviewer.ID)
+			require.NoError(t, err)
+			assert.Equal(t, issues_model.ReviewTypeRequest, review.Type)
+			assert.False(t, review.Official)
+		})
+	}
+}