The Unified and Autonomous Development Platform
refactor: Remove TransactionService dependency and simplify removeReviewer method in PullRequestResource
Robin Shen47f0b8fc2e4d
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 2d8732cda9..1be9bbfe6d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -52,7 +52,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.persistence.TransactionService;import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;import io.onedev.server.rest.resource.support.RestConstants;@@ -91,9 +90,6 @@ public class PullRequestResource {@Injectprivate UserService userService;- @Inject- private TransactionService transactionService;-@Injectprivate ObjectMapper objectMapper;@@ -403,26 +399,24 @@ public class PullRequestResource {@Path("/{requestId}/reviewers/{userId}")@DELETEpublic Response removeReviewer(@PathParam("requestId") Long requestId, @PathParam("userId") Long userId) {- return transactionService.call(() -> {- var request = pullRequestService.load(requestId);- var user = userService.load(userId);-- var subject = SecurityUtils.getSubject();-- if (!SecurityUtils.canModifyPullRequest(subject, request))- throw new UnauthorizedException();-- var review = request.getReview(user);- if (review != null) {- review.setStatus(EXCLUDED);- pullRequestService.checkReviews(request, false);- if (review.getStatus() != EXCLUDED)- throw new NotAcceptableException("This reviewer is mandatory and cannot be removed");- pullRequestReviewService.createOrUpdate(user, review);- }-- return Response.ok().build();- });+ var request = pullRequestService.load(requestId);+ var user = userService.load(userId);++ var subject = SecurityUtils.getSubject();++ if (!SecurityUtils.canModifyPullRequest(subject, request))+ throw new UnauthorizedException();++ var review = request.getReview(user);+ if (review != null) {+ review.setStatus(EXCLUDED);+ pullRequestService.checkReviews(request, false);+ if (review.getStatus() != EXCLUDED)+ throw new NotAcceptableException("This reviewer is mandatory and cannot be removed");+ pullRequestReviewService.createOrUpdate(user, review);+ }++ return Response.ok().build();}@Api(order=1480)diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.javaindex 900bce08ae..7011ea87aa 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java@@ -849,7 +849,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>}- @Transactional+ @Sessional@Overridepublic void checkReviews(PullRequest request, boolean sourceUpdated) {if (request.isOpen()) {