Earl Warren
603a44edf0
Refs: https://codeberg.org/forgejo/forgejo/issues/2109 (cherry picked from commit 8b4ba3dce7fc99fa328444ef27383dccca49c237) (cherry picked from commit 196edea0f972a9a027c4cacb9df36330cf676d2f) [GITEA] POST /repos/{owner}/{repo}/pulls/{index}/reviews/{id}/comments (squash) do not implicitly create a review If a comment already exists in a review, the comment is added. If it is the first comment added to a review, it will implicitly create a new review instead of adding to the existing one. The pull_service.CreateCodeComment function is responsibe for this behavior and it will defer to createCodeComment once the review is determined, either because it was found or because it was created. Rename createCodeComment into CreateCodeCommentKnownReviewID to expose it and change the API endpoint to use it instead. Since the review is provided by the user and verified to exist already, there is no need for the logic implemented by CreateCodeComment. The tests are modified to remove the initial comment from the fixture because it was creating the false positive. I was verified to fail without this fix. (cherry picked from commit 6a555996dca6ba71c65818e14ab0eeafa1af6dc2) (cherry picked from commit b173a0ccee6cc0dadf40ec55e5d88987314c1cc4) (cherry picked from commit 838ab9740a6b022676103bcb3a7d168b501006e1)
140 lines
4.1 KiB
Go
140 lines
4.1 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package convert
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
)
|
|
|
|
// ToPullReview convert a review to api format
|
|
func ToPullReview(ctx context.Context, r *issues_model.Review, doer *user_model.User) (*api.PullReview, error) {
|
|
if err := r.LoadAttributes(ctx); err != nil {
|
|
if !user_model.IsErrUserNotExist(err) {
|
|
return nil, err
|
|
}
|
|
r.Reviewer = user_model.NewGhostUser()
|
|
}
|
|
|
|
result := &api.PullReview{
|
|
ID: r.ID,
|
|
Reviewer: ToUser(ctx, r.Reviewer, doer),
|
|
State: api.ReviewStateUnknown,
|
|
Body: r.Content,
|
|
CommitID: r.CommitID,
|
|
Stale: r.Stale,
|
|
Official: r.Official,
|
|
Dismissed: r.Dismissed,
|
|
CodeCommentsCount: r.GetCodeCommentsCount(ctx),
|
|
Submitted: r.CreatedUnix.AsTime(),
|
|
Updated: r.UpdatedUnix.AsTime(),
|
|
HTMLURL: r.HTMLURL(ctx),
|
|
HTMLPullURL: r.Issue.HTMLURL(),
|
|
}
|
|
|
|
if r.ReviewerTeam != nil {
|
|
var err error
|
|
result.ReviewerTeam, err = ToTeam(ctx, r.ReviewerTeam)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
switch r.Type {
|
|
case issues_model.ReviewTypeApprove:
|
|
result.State = api.ReviewStateApproved
|
|
case issues_model.ReviewTypeReject:
|
|
result.State = api.ReviewStateRequestChanges
|
|
case issues_model.ReviewTypeComment:
|
|
result.State = api.ReviewStateComment
|
|
case issues_model.ReviewTypePending:
|
|
result.State = api.ReviewStatePending
|
|
case issues_model.ReviewTypeRequest:
|
|
result.State = api.ReviewStateRequestReview
|
|
}
|
|
|
|
return result, nil
|
|
}
|
|
|
|
// ToPullReviewList convert a list of review to it's api format
|
|
func ToPullReviewList(ctx context.Context, rl []*issues_model.Review, doer *user_model.User) ([]*api.PullReview, error) {
|
|
result := make([]*api.PullReview, 0, len(rl))
|
|
for i := range rl {
|
|
// show pending reviews only for the user who created them
|
|
if rl[i].Type == issues_model.ReviewTypePending && (doer == nil || !(doer.IsAdmin || doer.ID == rl[i].ReviewerID)) {
|
|
continue
|
|
}
|
|
r, err := ToPullReview(ctx, rl[i], doer)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
result = append(result, r)
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
// ToPullReviewCommentList convert the CodeComments of an review to it's api format
|
|
func ToPullReviewComment(ctx context.Context, review *issues_model.Review, comment *issues_model.Comment, doer *user_model.User) (*api.PullReviewComment, error) {
|
|
apiComment := &api.PullReviewComment{
|
|
ID: comment.ID,
|
|
Body: comment.Content,
|
|
Poster: ToUser(ctx, comment.Poster, doer),
|
|
Resolver: ToUser(ctx, comment.ResolveDoer, doer),
|
|
ReviewID: review.ID,
|
|
Created: comment.CreatedUnix.AsTime(),
|
|
Updated: comment.UpdatedUnix.AsTime(),
|
|
Path: comment.TreePath,
|
|
CommitID: comment.CommitSHA,
|
|
OrigCommitID: comment.OldRef,
|
|
DiffHunk: patch2diff(comment.Patch),
|
|
HTMLURL: comment.HTMLURL(ctx),
|
|
HTMLPullURL: review.Issue.HTMLURL(),
|
|
}
|
|
|
|
if comment.Line < 0 {
|
|
apiComment.OldLineNum = comment.UnsignedLine()
|
|
} else {
|
|
apiComment.LineNum = comment.UnsignedLine()
|
|
}
|
|
|
|
return apiComment, nil
|
|
}
|
|
|
|
// ToPullReviewCommentList convert the CodeComments of an review to it's api format
|
|
func ToPullReviewCommentList(ctx context.Context, review *issues_model.Review, doer *user_model.User) ([]*api.PullReviewComment, error) {
|
|
if err := review.LoadAttributes(ctx); err != nil {
|
|
if !user_model.IsErrUserNotExist(err) {
|
|
return nil, err
|
|
}
|
|
review.Reviewer = user_model.NewGhostUser()
|
|
}
|
|
|
|
apiComments := make([]*api.PullReviewComment, 0, len(review.CodeComments))
|
|
|
|
for _, lines := range review.CodeComments {
|
|
for _, comments := range lines {
|
|
for _, comment := range comments {
|
|
apiComment, err := ToPullReviewComment(ctx, review, comment, doer)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
apiComments = append(apiComments, apiComment)
|
|
}
|
|
}
|
|
}
|
|
return apiComments, nil
|
|
}
|
|
|
|
func patch2diff(patch string) string {
|
|
split := strings.Split(patch, "\n@@")
|
|
if len(split) == 2 {
|
|
return "@@" + split[1]
|
|
}
|
|
return ""
|
|
}
|