record team name in the content when creating request team review comment

Author: sillyguodong

models/issues/comment.go

@@ -313,6 +313,11 @@ type PushActionContent struct {
 	CommitIDs   []string `json:"commit_ids"`
 }
 
+// RequestTeamReviewActionContent is content of requesting or cancelling request a team to review a PR
+type RequestTeamReviewActionContent struct {
+	TeamName string `json:"team_name"`
+}
+
 // LoadIssue loads the issue reference for the comment
 func (c *Comment) LoadIssue(ctx context.Context) (err error) {
 	if c.Issue != nil {

models/issues/review.go

@@ -5,6 +5,7 @@ package issues
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -815,6 +816,14 @@ func AddTeamReviewRequest(issue *Issue, reviewer *organization.Team, doer *user_
 		}
 	}
 
+	// record the name of team in case that we cannot get the name of team after it is deleted.
+	var content RequestTeamReviewActionContent
+	content.TeamName = reviewer.Name
+	contentJSON, err := json.Marshal(content)
+	if err != nil {
+		return nil, err
+	}
+
 	comment, err := CreateComment(ctx, &CreateCommentOptions{
 		Type:            CommentTypeReviewRequest,
 		Doer:            doer,
@@ -823,6 +832,7 @@ func AddTeamReviewRequest(issue *Issue, reviewer *organization.Team, doer *user_
 		RemovedAssignee: false,       // Use RemovedAssignee as !isRequest
 		AssigneeTeamID:  reviewer.ID, // Use AssigneeTeamID as reviewer team ID
 		ReviewID:        review.ID,
+		Content:         string(contentJSON),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("CreateComment(): %w", err)
@@ -875,13 +885,22 @@ func RemoveTeamReviewRequest(issue *Issue, reviewer *organization.Team, doer *us
 		return nil, committer.Commit()
 	}
 
+	// record the name of team in case that we cannot get the name of team after it is deleted.
+	var content RequestTeamReviewActionContent
+	content.TeamName = reviewer.Name
+	contentJSON, err := json.Marshal(content)
+	if err != nil {
+		return nil, err
+	}
+
 	comment, err := CreateComment(ctx, &CreateCommentOptions{
 		Type:            CommentTypeReviewRequest,
 		Doer:            doer,
 		Repo:            issue.Repo,
 		Issue:           issue,
 		RemovedAssignee: true,        // Use RemovedAssignee as !isRequest
 		AssigneeTeamID:  reviewer.ID, // Use AssigneeTeamID as reviewer team ID
+		Content:         string(contentJSON),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("CreateComment(): %w", err)

modules/templates/helper.go

@@ -363,6 +363,7 @@ func NewFuncMap() []template.FuncMap {
 				curBranch,
 			)
 		},
+		"GetRequestReviewTeamName": GetRequestReviewTeamName,
 	}}
 }
 
@@ -799,3 +800,19 @@ func Eval(tokens ...any) (any, error) {
 	n, err := eval.Expr(tokens...)
 	return n.Value, err
 }
+
+// If the value of commnet type is 27 and assigne_team_id not equal 0, this is a request review for a team.
+// So, we can use this func to parse the name of the team from `content` of the comment when the team is deleted.
+func GetRequestReviewTeamName(content string) string {
+	if content == "" {
+		return content
+	}
+
+	var data issues_model.RequestTeamReviewActionContent
+	if err := json.Unmarshal([]byte(content), &data); err != nil {
+		log.Error("json.Unmarshal: %s, error: %v", content, err)
+		return ""
+	}
+
+	return data.TeamName
+}

templates/repo/issue/view_content/comments.tmpl

@@ -688,10 +688,29 @@
 							{{$.locale.Tr "repo.issues.review.add_review_request" (.Assignee.GetDisplayName|Escape) $createdStr | Safe}}
 						{{end}}
 					{{else}}
+						<!-- 
+							- For new comments, the name of the team which is requested review is stored in the `content` column of the comment
+								If the team was deleted, we can parse the name from the `content` column.
+								Of course, if the team has not been deleted, we can get the name from `.AssigneeTeam` directly.
+								
+							- For comments that already exist and the row of the team has been deleted,
+								because we didn't save the name of the team in the `cotent` column of the comment before,
+								So we can only display "Unknown Team" here.
+						-->
+						{{$teamName := "Unknown Team"}}
+						{{if .AssigneeTeam}}
+							{{$teamName = .AssigneeTeam.Name}}
+						{{else if .Content}}
+							{{$teamNameFromContent := GetRequestReviewTeamName .Content}}
+							{{if not (eq $teamNameFromContent "")}}
+								{{$teamName = $teamNameFromContent}}
+							{{end}}
+						{{end}}
+
 						{{if .RemovedAssignee}}
-							{{$.locale.Tr "repo.issues.review.remove_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
+							{{$.locale.Tr "repo.issues.review.remove_review_request" ($teamName|Escape) $createdStr | Safe}}
 						{{else}}
-							{{$.locale.Tr "repo.issues.review.add_review_request" (.AssigneeTeam.Name|Escape) $createdStr | Safe}}
+							{{$.locale.Tr "repo.issues.review.add_review_request" ($teamName|Escape) $createdStr | Safe}}
 						{{end}}
 					{{end}}
 				</span>