diff --git a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/handler/MergeRequestHandler.java b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/handler/MergeRequestHandler.java index 3a4f324..341937f 100644 --- a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/handler/MergeRequestHandler.java +++ b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/handler/MergeRequestHandler.java @@ -68,11 +68,7 @@ public class MergeRequestHandler { } } - if (checkNotEmpty(mergeRequest.getReviewers())) { - sendGroupNotifyForReviewers(mergeRequest, projectName); - } else { - sendGroupNotifyAboutNoReviewers(mergeRequest, projectName); - } + sendGroupNotifyForReviewers(mergeRequest, projectName); } } @@ -116,6 +112,9 @@ public class MergeRequestHandler { if (newConflict) { sendGroupNotifyAboutConflict(newMergeRequest, project.getName()); } + if (reviewerChanged.isChanged()) { + sendGroupNotifyForReviewers(newMergeRequest, project.getName()); + } } @@ -156,22 +155,26 @@ public class MergeRequestHandler { } private void sendGroupNotifyForReviewers(MergeRequest mergeRequest, String projectName) { - final Map reviewerTelegramUsernames = personService.getTelegramUsernamesByPersonIds(mergeRequest.getReviewers().stream().map(Person::getId).collect(Collectors.toSet())); - if (!reviewerTelegramUsernames.isEmpty()) { - notifyService.send( - NewMergeRequestGroupNotify.builder() - .mrId(mergeRequest.getId()) - .title(mergeRequest.getTitle()) - .url(mergeRequest.getWebUrl()) - .author(mergeRequest.getAuthor().getName()) - .reviewerTelegramUsernames(reviewerTelegramUsernames) - .milestone(mergeRequest.getMilestone()) - .projectName(projectName) - .targetBranch(mergeRequest.getTargetBranch()) - .sourceBranch(mergeRequest.getSourceBranch()) - .description(mergeRequest.getDescription()) - .build() - ); + if (checkNotEmpty(mergeRequest.getReviewers())) { + final Map reviewerTelegramUsernames = personService.getTelegramUsernamesByPersonIds(mergeRequest.getReviewers().stream().map(Person::getId).collect(Collectors.toSet())); + if (!reviewerTelegramUsernames.isEmpty()) { + notifyService.send( + NewMergeRequestGroupNotify.builder() + .mrId(mergeRequest.getId()) + .title(mergeRequest.getTitle()) + .url(mergeRequest.getWebUrl()) + .author(mergeRequest.getAuthor().getName()) + .reviewerTelegramUsernames(reviewerTelegramUsernames) + .milestone(mergeRequest.getMilestone()) + .projectName(projectName) + .targetBranch(mergeRequest.getTargetBranch()) + .sourceBranch(mergeRequest.getSourceBranch()) + .description(mergeRequest.getDescription()) + .build() + ); + } + } else { + sendGroupNotifyAboutNoReviewers(mergeRequest, projectName); } }