Workaround to clean up old reviews on creating a new one #28554

6543 · 2023-12-20T11:29:16Z

Sponsored by Kithara Software GmbH

models/issues/review.go

KN4CK3R · 2023-12-21T09:46:36Z

I think this fix is placed at the wrong position. CreateReview previously did just one thing: creating a review in the database. Now there is logic mixed in which should be one or more levels up the callstack.

6543 · 2023-12-21T19:30:00Z

@KN4CK3R well if you looking for the refactoring, that is& will be done at #28544

KN4CK3R · 2023-12-21T21:42:08Z

That PR contains the same code at the same place.

6543 · 2023-12-21T22:19:57Z

yes as I' working on more but I'll wait until the bugfix did get in as it will conflict a lot.

anyway just look at the rest of models/issues/review.go it is not the best.
I want to get the bugfix out soon and work on clean code afterwards (witch will not be backportable)

jpraet · 2023-12-22T11:09:10Z

Maybe it belongs in

gitea/models/issues/review.go

Line 349 in 21229ed

    
           func SubmitReview(ctx context.Context, doer *user_model.User, issue *Issue, reviewType ReviewType, content, commitID string, stale bool, attachmentUUIDs []string) (*Review, *Comment, error) {

where there is already similar code to remove team review requests

gitea/models/issues/review.go

Line 434 in 21229ed

// try to remove team review request if need

6543 · 2023-12-22T11:19:27Z

😆 I that it should move an module higher up but should i start refactoring here or not ?!?

jpraet · 2023-12-23T11:54:18Z

CreateReview is also called when creating a pending review. In that case the review requests should not yet be deleted.
So I think the logic should be moved to SubmitReview.

But I'm also not entirely convinced that the review requests should be deleted.

If I request a review from person A. Then person A does a review, and then person A's review gets dismissed (for example by the "dismiss stale approvals" branch protection setting). Don't we want the PR to revert to the state where a review is requested from person A?

6543 · 2023-12-23T13:06:47Z

CreateReview is also called when creating a pending review. In that case the review requests should not yet be deleted.
So I think the logic should be moved to SubmitReview.

you are right pending reviews should not clear requests, will address that

If I request a review from person A. Then person A does a review, and then person A's review gets dismissed (for example by the "dismiss stale approvals" branch protection setting). Don't we want the PR to revert to the state where a review is requested from person A?

no you wont do that as it is done now (that'S exactly how we get in a corrupt state for example).
if so desired we should trigger a new review request via the "dismis stale reivew" function, and this might also be an setting as it can differ on the review-workflow teams have deployed.

and in any case you can manually re-request in this case

models/issues/review.go

6543 · 2024-01-19T22:24:52Z

did rename the title to make it clear that this is not the final solution

models/issues/review.go

) close go-gitea#28542 blocks go-gitea#28544 --- *Sponsored by Kithara Software GmbH*

6543 · 2024-02-19T13:53:20Z

-> #29264

…9264) close #28542 backport #28554 --- *Sponsored by Kithara Software GmbH*

) close go-gitea#28542 blocks go-gitea#28544 --- *Sponsored by Kithara Software GmbH*

* giteaofficial/main: (32 commits) [skip ci] Updated translations via Crowdin Prevent double use of `git cat-file` session. (go-gitea#29298) Revert go-gitea#28753 because UI broken. (go-gitea#29293) Fix error display when merging PRs (go-gitea#29288) Refactor markup rendering to accept general "protocol:" prefix (go-gitea#29276) Remove jQuery from the installation page (go-gitea#29284) Always write proc-receive hook for all git versions (go-gitea#29287) Do not use `ctx.Doer` when reset password (go-gitea#29289) Update Discord logo (go-gitea#29285) [skip ci] Updated translations via Crowdin Remove jQuery .map() and enable eslint rules for it (go-gitea#29272) Explained where create issue/PR template (go-gitea#29035) (go-gitea#29266) Remove jQuery from repo wiki creation page (go-gitea#29271) Do not show delete button when time tracker is disabled (go-gitea#29257) Left align the input labels for the link account page (go-gitea#29255) [skip ci] Updated translations via Crowdin Remove jQuery from the repo migration form (go-gitea#29229) Fix content size does not match error when uploading lfs file (go-gitea#29259) Workaround to clean up old reviews on creating a new one (go-gitea#28554) Deduplicate translations for contributors graph (go-gitea#29256) ...

github-actions · 2024-02-28T00:04:24Z

Automatically locked because of our CONTRIBUTING guidelines

wxiaoguang · 2024-03-18T16:15:47Z

It seems that deleting a pending review would cause the comment has a dangling Review field and cause 500 panic error.

-> Render failed when opening PR with conversation #29885

-> Fix template error when comment review doesn't exist #29888

Clean up old reviews on creating a new one

cf0f77d

6543 added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Dec 20, 2023

6543 added this to the 1.22.0 milestone Dec 20, 2023

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 20, 2023

pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 20, 2023

6543 mentioned this pull request Dec 20, 2023

[WIP] Refactor review related code #28544

Open

6 tasks

6543 requested a review from a team December 20, 2023 12:49

6543 added 2 commits December 20, 2023 13:49

Merge branch 'main' into cleanup_old-reviews-on-review

05db236

Merge branch 'main' into cleanup_old-reviews-on-review

9245e65

KN4CK3R reviewed Dec 20, 2023

View reviewed changes

models/issues/review.go Outdated Show resolved Hide resolved

Merge branch 'main' into cleanup_old-reviews-on-review

9a71752

6543 requested a review from KN4CK3R December 21, 2023 00:18

6543 added 2 commits December 21, 2023 09:54

Merge branch 'main' into cleanup_old-reviews-on-review

a6adb7e

else if

e08e306

6543 added 2 commits December 23, 2023 14:07

Merge branch 'main' into cleanup_old-reviews-on-review

00abbf6

handle ReviewTypePending

8a06ccb

6543 commented Dec 23, 2023

View reviewed changes

models/issues/review.go Outdated Show resolved Hide resolved

6543 and others added 2 commits December 23, 2023 14:14

Update models/issues/review.go

9fcea4c

Merge branch 'main' into cleanup_old-reviews-on-review

b03faf4

6543 changed the title ~~Clean up old reviews on creating a new one~~ Workaround to clean up old reviews on creating a new one Jan 19, 2024

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 15, 2024

6543 added 5 commits February 15, 2024 22:02

Merge branch 'main' into cleanup_old-reviews-on-review

758dd63

Merge branch 'main' into cleanup_old-reviews-on-review

ab2ef38

Merge branch 'main' into cleanup_old-reviews-on-review

01dafcc

Merge branch 'main' into cleanup_old-reviews-on-review

36a2152

Merge branch 'main' into cleanup_old-reviews-on-review

68c4de2

lafriks approved these changes Feb 19, 2024

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 19, 2024

Merge branch 'main' into cleanup_old-reviews-on-review

d23ace7

lafriks enabled auto-merge (squash) February 19, 2024 12:10

lunny reviewed Feb 19, 2024

View reviewed changes

models/issues/review.go Show resolved Hide resolved

lafriks disabled auto-merge February 19, 2024 12:16

wxiaoguang reviewed Feb 19, 2024

View reviewed changes

models/issues/review.go Show resolved Hide resolved

6543 and others added 2 commits February 19, 2024 13:55

test against rerequest and add some codecomments

b3d062d

Merge branch 'main' into cleanup_old-reviews-on-review

48fa3ad

6543 merged commit 217d71c into go-gitea:main Feb 19, 2024
26 checks passed

6543 deleted the cleanup_old-reviews-on-review branch February 19, 2024 13:46

6543 added the backport/done All backports for this PR have been created label Feb 19, 2024

6543 added a commit to 6543-forks/gitea that referenced this pull request Feb 19, 2024

Workaround to clean up old reviews on creating a new one (go-gitea#28554

79f0729

) close go-gitea#28542 blocks go-gitea#28544 --- *Sponsored by Kithara Software GmbH*

6543 mentioned this pull request Feb 19, 2024

Workaround to clean up old reviews on creating a new one (#28554) #29264

Merged

6543 added the backport/manual No power to the bots! Create your backport yourself! label Feb 19, 2024

6543 added a commit that referenced this pull request Feb 19, 2024

Workaround to clean up old reviews on creating a new one (#28554) (#2…

c01b266

…9264) close #28542 backport #28554 --- *Sponsored by Kithara Software GmbH*

silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024

Workaround to clean up old reviews on creating a new one (go-gitea#28554

a94bf6a

) close go-gitea#28542 blocks go-gitea#28544 --- *Sponsored by Kithara Software GmbH*

github-actions bot locked as resolved and limited conversation to collaborators Feb 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Workaround to clean up old reviews on creating a new one #28554

Workaround to clean up old reviews on creating a new one #28554

6543 commented Dec 20, 2023 •

edited

Loading

KN4CK3R commented Dec 21, 2023

6543 commented Dec 21, 2023 •

edited

Loading

KN4CK3R commented Dec 21, 2023

6543 commented Dec 21, 2023 •

edited

Loading

jpraet commented Dec 22, 2023

6543 commented Dec 22, 2023

jpraet commented Dec 23, 2023

6543 commented Dec 23, 2023

6543 commented Jan 19, 2024

6543 commented Feb 19, 2024

github-actions bot commented Feb 28, 2024

wxiaoguang commented Mar 18, 2024

Workaround to clean up old reviews on creating a new one #28554

Workaround to clean up old reviews on creating a new one #28554

Conversation

6543 commented Dec 20, 2023 • edited Loading

KN4CK3R commented Dec 21, 2023

6543 commented Dec 21, 2023 • edited Loading

KN4CK3R commented Dec 21, 2023

6543 commented Dec 21, 2023 • edited Loading

jpraet commented Dec 22, 2023

6543 commented Dec 22, 2023

jpraet commented Dec 23, 2023

6543 commented Dec 23, 2023

6543 commented Jan 19, 2024

6543 commented Feb 19, 2024

github-actions bot commented Feb 28, 2024

wxiaoguang commented Mar 18, 2024

6543 commented Dec 20, 2023 •

edited

Loading

6543 commented Dec 21, 2023 •

edited

Loading

6543 commented Dec 21, 2023 •

edited

Loading