github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-16 17:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mg/pr-review/review-sha' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#59)

Browse Source
This commit is contained in:
Marko Gacesa 2023-05-09 16:08:53 +00:00 committed by Harness
commit b7e92c0ec2
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/api/controller/pullreq/review_submit.go
View File

@ -12,7 +12,6 @@ import (
"time" "time"
"github.com/harness/gitness/gitrpc" "github.com/harness/gitness/gitrpc"
gitrpcenum "github.com/harness/gitness/gitrpc/enum"
"github.com/harness/gitness/internal/api/usererror" "github.com/harness/gitness/internal/api/usererror"
"github.com/harness/gitness/internal/auth" "github.com/harness/gitness/internal/auth"
"github.com/harness/gitness/internal/store" "github.com/harness/gitness/internal/store"
@ -24,11 +23,16 @@ import (
) )
type ReviewSubmitInput struct { type ReviewSubmitInput struct {
Decision enum.PullReqReviewDecision `json:"decision"` CommitSHA string `json:"commit_sha"`
Message string `json:"message"` Decision enum.PullReqReviewDecision `json:"decision"`
Message string `json:"message"`
} }
func (in *ReviewSubmitInput) Validate() error { func (in *ReviewSubmitInput) Validate() error {
if in.CommitSHA == "" {
return usererror.BadRequest("CommitSHA is a mandatory field")
}
decision, ok := in.Decision.Sanitize() decision, ok := in.Decision.Sanitize()
if !ok || decision == enum.PullReqReviewDecisionPending { if !ok || decision == enum.PullReqReviewDecisionPending {
msg := fmt.Sprintf("Decision must be: %q, %q or %q.", msg := fmt.Sprintf("Decision must be: %q, %q or %q.",
@ -72,18 +76,15 @@ func (c *Controller) ReviewSubmit(
return nil, usererror.BadRequest("Can't submit review to own pull requests.") return nil, usererror.BadRequest("Can't submit review to own pull requests.")
} }
ref, err := c.gitRPCClient.GetRef(ctx, gitrpc.GetRefParams{ commit, err := c.gitRPCClient.GetCommit(ctx, &gitrpc.GetCommitParams{
ReadParams: gitrpc.ReadParams{RepoUID: repo.GitUID}, ReadParams: gitrpc.ReadParams{RepoUID: repo.GitUID},
Name: pr.TargetBranch, SHA: in.CommitSHA,
Type: gitrpcenum.RefTypeBranch,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get git branch sha: %w", err) return nil, fmt.Errorf("failed to get git branch sha: %w", err)
} }
if ref.SHA == "" { commitSHA := commit.Commit.SHA
return nil, usererror.BadRequest("Failed to get branch SHA. Does the branch still exist?")
}
var review *types.PullReqReview var review *types.PullReqReview
@ -96,7 +97,7 @@ func (c *Controller) ReviewSubmit(
Updated: now, Updated: now,
PullReqID: pr.ID, PullReqID: pr.ID,
Decision: in.Decision, Decision: in.Decision,
SHA: ref.SHA, SHA: commitSHA,
} }
err = c.reviewStore.Create(ctx, review) err = c.reviewStore.Create(ctx, review)
@ -104,7 +105,7 @@ func (c *Controller) ReviewSubmit(
return err return err
} }
_, err = c.updateReviewer(ctx, session, pr, review, ref.SHA) _, err = c.updateReviewer(ctx, session, pr, review, commitSHA)
return err return err
}) })
if err != nil { if err != nil {
@ -117,8 +118,9 @@ func (c *Controller) ReviewSubmit(
} }
payload := &types.PullRequestActivityPayloadReviewSubmit{ payload := &types.PullRequestActivityPayloadReviewSubmit{
Message: in.Message, CommitSHA: commitSHA,
Decision: in.Decision, Message: in.Message,
Decision: in.Decision,
} }
_, err = c.activityStore.CreateWithPayload(ctx, pr, session.Principal.ID, payload) _, err = c.activityStore.CreateWithPayload(ctx, pr, session.Principal.ID, payload)
return err return err

5
types/pullreq_activity.go
View File

@ -242,8 +242,9 @@ func (a *PullRequestActivityPayloadTitleChange) ActivityType() enum.PullReqActiv
} }
type PullRequestActivityPayloadReviewSubmit struct { type PullRequestActivityPayloadReviewSubmit struct {
Message string `json:"message,omitempty"` CommitSHA string `json:"commit_sha"`
Decision enum.PullReqReviewDecision `json:"decision"` Message string `json:"message,omitempty"`
Decision enum.PullReqReviewDecision `json:"decision"`
} }
func (a *PullRequestActivityPayloadReviewSubmit) ActivityType() enum.PullReqActivityType { func (a *PullRequestActivityPayloadReviewSubmit) ActivityType() enum.PullReqActivityType {