Skip to content

Commit 38ace76

Browse files
committed
some improvements
1 parent 2533c9d commit 38ace76

File tree

1 file changed

+5
-36
lines changed

1 file changed

+5
-36
lines changed

routers/api/v1/repo/pull_review.go

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ func DeleteReviewRequests(ctx *context.APIContext) {
724724
// "404":
725725
// "$ref": "#/responses/notFound"
726726
opts := web.GetForm(ctx).(*api.PullReviewRequestOptions)
727-
apiReviewRequest(ctx, *opts, false)
727+
deleteReviewRequests(ctx, *opts)
728728
}
729729

730730
func parseReviewersByNames(ctx *context.APIContext, reviewerNames, teamReviewerNames []string) (reviewers []*user_model.User, teamReviewers []*organization.Team) {
@@ -768,7 +768,7 @@ func parseReviewersByNames(ctx *context.APIContext, reviewerNames, teamReviewerN
768768
return reviewers, teamReviewers
769769
}
770770

771-
func apiReviewRequest(ctx *context.APIContext, opts api.PullReviewRequestOptions, isAdd bool) {
771+
func deleteReviewRequests(ctx *context.APIContext, opts api.PullReviewRequestOptions) {
772772
pr, err := issues_model.GetPullRequestByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("index"))
773773
if err != nil {
774774
if issues_model.IsErrPullRequestNotExist(err) {
@@ -795,13 +795,8 @@ func apiReviewRequest(ctx *context.APIContext, opts api.PullReviewRequestOptions
795795
return
796796
}
797797

798-
var reviews []*issues_model.Review
799-
if isAdd {
800-
reviews = make([]*issues_model.Review, 0, len(reviewers))
801-
}
802-
803798
for _, reviewer := range reviewers {
804-
comment, err := pull_service.ReviewRequest(ctx, pr, ctx.Doer, &permDoer, reviewer, isAdd)
799+
_, err := pull_service.ReviewRequest(ctx, pr, ctx.Doer, &permDoer, reviewer, false)
805800
if err != nil {
806801
if issues_model.IsErrReviewRequestOnClosedPR(err) {
807802
ctx.Error(http.StatusForbidden, "", err)
@@ -814,19 +809,11 @@ func apiReviewRequest(ctx *context.APIContext, opts api.PullReviewRequestOptions
814809
ctx.Error(http.StatusInternalServerError, "ReviewRequest", err)
815810
return
816811
}
817-
818-
if comment != nil && isAdd {
819-
if err = comment.LoadReview(ctx); err != nil {
820-
ctx.ServerError("ReviewRequest", err)
821-
return
822-
}
823-
reviews = append(reviews, comment.Review)
824-
}
825812
}
826813

827814
if ctx.Repo.Repository.Owner.IsOrganization() && len(opts.TeamReviewers) > 0 {
828815
for _, teamReviewer := range teamReviewers {
829-
comment, err := pull_service.TeamReviewRequest(ctx, pr, ctx.Doer, teamReviewer, isAdd)
816+
_, err := pull_service.TeamReviewRequest(ctx, pr, ctx.Doer, teamReviewer, false)
830817
if err != nil {
831818
if issues_model.IsErrReviewRequestOnClosedPR(err) {
832819
ctx.Error(http.StatusForbidden, "", err)
@@ -839,28 +826,10 @@ func apiReviewRequest(ctx *context.APIContext, opts api.PullReviewRequestOptions
839826
ctx.ServerError("TeamReviewRequest", err)
840827
return
841828
}
842-
843-
if comment != nil && isAdd {
844-
if err = comment.LoadReview(ctx); err != nil {
845-
ctx.ServerError("ReviewRequest", err)
846-
return
847-
}
848-
reviews = append(reviews, comment.Review)
849-
}
850829
}
851830
}
852831

853-
if isAdd {
854-
apiReviews, err := convert.ToPullReviewList(ctx, reviews, ctx.Doer)
855-
if err != nil {
856-
ctx.Error(http.StatusInternalServerError, "convertToPullReviewList", err)
857-
return
858-
}
859-
ctx.JSON(http.StatusCreated, apiReviews)
860-
} else {
861-
ctx.Status(http.StatusNoContent)
862-
return
863-
}
832+
ctx.Status(http.StatusNoContent)
864833
}
865834

866835
// DismissPullReview dismiss a review for a pull request

0 commit comments

Comments
 (0)