Skip to content

Commit 7735d70

Browse files
lunnylunny
committed
remove unnecessary code
1 parent 0f5de85 commit 7735d70

File tree

5 files changed

+115
-123
lines changed

5 files changed

+115
-123
lines changed

‎models/review.go

Lines changed: 72 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55
package models
66

77
import (
8-
"fmt"
8+
"strings"
99

10-
"code.gitea.io/gitea/modules/log"
1110
"code.gitea.io/gitea/modules/timeutil"
1211

1312
"xorm.io/builder"
1413
"xorm.io/core"
15-
"xorm.io/xorm"
1614
)
1715

1816
// ReviewType defines the sort of feedback a review gives
@@ -86,6 +84,11 @@ func (r *Review) loadReviewer(e Engine) (err error) {
8684
return
8785
}
8886

87+
// LoadReviewer loads reviewer
88+
func (r *Review) LoadReviewer() error {
89+
return r.loadReviewer(x)
90+
}
91+
8992
func (r *Review) loadAttributes(e Engine) (err error) {
9093
if err = r.loadReviewer(e); err != nil {
9194
return
@@ -101,54 +104,6 @@ func (r *Review) LoadAttributes() error {
101104
return r.loadAttributes(x)
102105
}
103106

104-
// Publish will send notifications / actions to participants for all code comments; parts are concurrent
105-
func (r *Review) Publish() error {
106-
return r.publish(x)
107-
}
108-
109-
func (r *Review) publish(e *xorm.Engine) error {
110-
if r.Type == ReviewTypePending || r.Type == ReviewTypeUnknown {
111-
return fmt.Errorf("review cannot be published if type is pending or unknown")
112-
}
113-
if r.Issue == nil {
114-
if err := r.loadIssue(e); err != nil {
115-
return err
116-
}
117-
}
118-
if err := r.Issue.loadRepo(e); err != nil {
119-
return err
120-
}
121-
if len(r.CodeComments) == 0 {
122-
if err := r.loadCodeComments(e); err != nil {
123-
return err
124-
}
125-
}
126-
for _, lines := range r.CodeComments {
127-
for _, comments := range lines {
128-
for _, comment := range comments {
129-
go func(en *xorm.Engine, review *Review, comm *Comment) {
130-
sess := en.NewSession()
131-
defer sess.Close()
132-
opts := &CreateCommentOptions{
133-
Doer: comm.Poster,
134-
Issue: review.Issue,
135-
Repo: review.Issue.Repo,
136-
Type: comm.Type,
137-
Content: comm.Content,
138-
}
139-
if err := updateCommentInfos(sess, opts, comm); err != nil {
140-
log.Warn("updateCommentInfos: %v", err)
141-
}
142-
if err := sendCreateCommentAction(sess, opts, comm); err != nil {
143-
log.Warn("sendCreateCommentAction: %v", err)
144-
}
145-
}(e, r, comment)
146-
}
147-
}
148-
}
149-
return nil
150-
}
151-
152107
func getReviewByID(e Engine, id int64) (*Review, error) {
153108
review := new(Review)
154109
if has, err := e.ID(id).Get(review); err != nil {
@@ -271,12 +226,73 @@ func GetCurrentReview(reviewer *User, issue *Issue) (*Review, error) {
271226
return getCurrentReview(x, reviewer, issue)
272227
}
273228

274-
// UpdateReview will update all cols of the given review in db
275-
func UpdateReview(r *Review) error {
276-
if _, err := x.ID(r.ID).AllCols().Update(r); err != nil {
277-
return err
229+
type ContentEmptyErr struct {
230+
}
231+
232+
func (ContentEmptyErr) Error() string {
233+
return "Review content is empty"
234+
}
235+
236+
func IsContentEmptyErr(err error) bool {
237+
_, ok := err.(ContentEmptyErr)
238+
return ok
239+
}
240+
241+
// SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
242+
func SubmitReview(doer *User, issue *Issue, reviewType ReviewType, content string) (*Review, *Comment, error) {
243+
sess := x.NewSession()
244+
defer sess.Close()
245+
if err := sess.Begin(); err != nil {
246+
return nil, nil, err
247+
}
248+
249+
review, err := getCurrentReview(sess, doer, issue)
250+
if err != nil {
251+
if !IsErrReviewNotExist(err) {
252+
return nil, nil, err
253+
}
254+
255+
if len(strings.TrimSpace(content)) == 0 {
256+
return nil, nil, ContentEmptyErr{}
257+
}
258+
259+
// No current review. Create a new one!
260+
review, err = createReview(sess, CreateReviewOptions{
261+
Type: reviewType,
262+
Issue: issue,
263+
Reviewer: doer,
264+
Content: content,
265+
})
266+
if err != nil {
267+
return nil, nil, err
268+
}
269+
} else {
270+
review.Issue = issue
271+
review.Content = content
272+
review.Type = reviewType
273+
if _, err := sess.ID(review.ID).Cols("content, typpe").Update(review); err != nil {
274+
return nil, nil, err
275+
}
276+
}
277+
278+
comm, err := createComment(sess, &CreateCommentOptions{
279+
Type: CommentTypeReview,
280+
Doer: doer,
281+
Content: review.Content,
282+
Issue: issue,
283+
Repo: issue.Repo,
284+
ReviewID: review.ID,
285+
})
286+
if err != nil || comm == nil {
287+
return nil, nil, err
288+
}
289+
290+
comm.Review = review
291+
292+
if err := updateIssueCols(sess, review.Issue, "updated_unix"); err != nil {
293+
return nil, nil, err
278294
}
279-
return nil
295+
return review, comm, sess.Commit()
280296
}
281297

282298
// PullReviewersWithType represents the type used to display a review overview

‎models/review_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,6 @@ func TestCreateReview(t *testing.T) {
9898
AssertExistsAndLoadBean(t, &Review{Content: "New Review"})
9999
}
100100

101-
func TestUpdateReview(t *testing.T) {
102-
assert.NoError(t, PrepareTestDatabase())
103-
review := AssertExistsAndLoadBean(t, &Review{ID: 1}).(*Review)
104-
review.Content = "Updated Review"
105-
assert.NoError(t, UpdateReview(review))
106-
AssertExistsAndLoadBean(t, &Review{ID: 1, Content: "Updated Review"})
107-
}
108-
109101
func TestGetReviewersByPullID(t *testing.T) {
110102
assert.NoError(t, PrepareTestDatabase())
111103

‎modules/notification/action/action.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package action
66

77
import (
88
"fmt"
9+
"strings"
910

1011
"code.gitea.io/gitea/models"
1112
"code.gitea.io/gitea/modules/log"
@@ -117,3 +118,41 @@ func (a *actionNotifier) NotifyForkRepository(doer *models.User, oldRepo, repo *
117118
log.Error("notify watchers '%d/%d': %v", doer.ID, repo.ID, err)
118119
}
119120
}
121+
122+
func (a *actionNotifier) NotifyPullRequestReview(pr *models.PullRequest, review *models.Review, comment *models.Comment) {
123+
if err := review.LoadReviewer(); err != nil {
124+
log.Error("LoadReviewer '%d/%d': %v", review.ID, review.ReviewerID, err)
125+
return
126+
}
127+
var content = comment.Content
128+
if err := review.LoadCodeComments(); err != nil {
129+
log.Error("LoadCodeComments '%d/%d': %v", review.Reviewer.ID, review.ID, err)
130+
return
131+
}
132+
133+
for _, lines := range review.CodeComments {
134+
for _, comments := range lines {
135+
for _, comment := range comments {
136+
// TODO: how to handle???
137+
/*if err := sendCreateCommentAction(sess, opts, comm); err != nil {
138+
log.Warn("sendCreateCommentAction: %v", err)
139+
}*/
140+
content += "\n" + comment.Content
141+
}
142+
}
143+
}
144+
145+
if err := models.NotifyWatchers(&models.Action{
146+
ActUserID: review.Reviewer.ID,
147+
ActUser: review.Reviewer,
148+
Content: fmt.Sprintf("%d|%s", review.Issue.Index, strings.Split(content, "\n")[0]),
149+
OpType: models.ActionCommentIssue,
150+
RepoID: review.Issue.RepoID,
151+
Repo: review.Issue.Repo,
152+
IsPrivate: review.Issue.Repo.IsPrivate,
153+
Comment: comment,
154+
CommentID: comment.ID,
155+
}); err != nil {
156+
log.Error("notify watchers '%d/%d': %v", review.Reviewer.ID, review.Issue.RepoID, err)
157+
}
158+
}

‎routers/repo/pull_review.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) {
7676
reviewType := form.ReviewType()
7777
switch reviewType {
7878
case models.ReviewTypeUnknown:
79-
ctx.ServerError("GetCurrentReview", fmt.Errorf("unknown ReviewType: %s", form.Type))
79+
ctx.ServerError("ReviewType", fmt.Errorf("unknown ReviewType: %s", form.Type))
8080
return
8181

8282
// can not approve/reject your own PR
@@ -97,13 +97,12 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) {
9797

9898
_, comm, err := pull_service.SubmitReview(ctx.User, issue, reviewType, form.Content)
9999
if err != nil {
100-
if pull_service.IsContentEmptyErr(err) {
100+
if models.IsContentEmptyErr(err) {
101101
ctx.Flash.Error(ctx.Tr("repo.issues.review.content.empty"))
102102
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
103103
} else {
104104
ctx.ServerError("SubmitReview", err)
105105
}
106-
107106
return
108107
}
109108

‎services/pull/review.go

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -131,68 +131,14 @@ func createCodeComment(doer *models.User, repo *models.Repository, issue *models
131131
})
132132
}
133133

134-
type ContentEmptyErr struct {
135-
}
136-
137-
func (ContentEmptyErr) Error() string {
138-
return "Review content is empty"
139-
}
140-
141-
func IsContentEmptyErr(err error) bool {
142-
_, ok := err.(ContentEmptyErr)
143-
return ok
144-
}
145-
146134
// SubmitReview creates a review out of the existing pending review or creates a new one if no pending review exist
147135
func SubmitReview(doer *models.User, issue *models.Issue, reviewType models.ReviewType, content string) (*models.Review, *models.Comment, error) {
148-
review, err := models.GetCurrentReview(doer, issue)
136+
review, comm, err := models.SubmitReview(doer, issue, reviewType, content)
149137
if err != nil {
150-
if !models.IsErrReviewNotExist(err) {
151-
return nil, nil, err
152-
}
153-
154-
if len(strings.TrimSpace(content)) == 0 {
155-
return nil, nil, ContentEmptyErr{}
156-
}
157-
158-
// No current review. Create a new one!
159-
review, err = models.CreateReview(models.CreateReviewOptions{
160-
Type: reviewType,
161-
Issue: issue,
162-
Reviewer: doer,
163-
Content: content,
164-
})
165-
if err != nil {
166-
return nil, nil, err
167-
}
168-
} else {
169-
review.Issue = issue
170-
review.Content = content
171-
review.Type = reviewType
172-
if err = models.UpdateReview(review); err != nil {
173-
return nil, nil, err
174-
}
175-
176-
if err := review.LoadCodeComments(); err != nil {
177-
return nil, nil, err
178-
}
179-
}
180-
181-
comm, err := models.CreateComment(&models.CreateCommentOptions{
182-
Type: models.CommentTypeReview,
183-
Doer: doer,
184-
Content: review.Content,
185-
Issue: issue,
186-
Repo: issue.Repo,
187-
ReviewID: review.ID,
188-
})
189-
if err != nil || comm == nil {
190-
return nil, nil, err
191-
}
192-
if err = review.Publish(); err != nil {
193138
return nil, nil, err
194139
}
195140

141+
// publish review
196142
pr, err := issue.GetPullRequest()
197143
if err != nil {
198144
return nil, nil, err

0 commit comments

Comments
 (0)