Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 2 Releases 1 Activity

Уведомление об изменении ревьюверов
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Struchkov Mark 2024-09-04 00:16:56 +03:00
parent 625c59f163
commit 0e1e7c6cad
No known key found for this signature in database
GPG Key ID: A3F0AC3F0FA52F3C
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bot-core/src/main/java/dev/struchkov/bot/gitlab/core/handler/MergeRequestHandler.java
View File

@ -68,11 +68,7 @@ public class MergeRequestHandler {
} }
} }
if (checkNotEmpty(mergeRequest.getReviewers())) { sendGroupNotifyForReviewers(mergeRequest, projectName);
sendGroupNotifyForReviewers(mergeRequest, projectName);
} else {
sendGroupNotifyAboutNoReviewers(mergeRequest, projectName);
}
} }
} }
@ -116,6 +112,9 @@ public class MergeRequestHandler {
if (newConflict) { if (newConflict) {
sendGroupNotifyAboutConflict(newMergeRequest, project.getName()); 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) { private void sendGroupNotifyForReviewers(MergeRequest mergeRequest, String projectName) {
final Map<Long, String> reviewerTelegramUsernames = personService.getTelegramUsernamesByPersonIds(mergeRequest.getReviewers().stream().map(Person::getId).collect(Collectors.toSet())); if (checkNotEmpty(mergeRequest.getReviewers())) {
if (!reviewerTelegramUsernames.isEmpty()) { final Map<Long, String> reviewerTelegramUsernames = personService.getTelegramUsernamesByPersonIds(mergeRequest.getReviewers().stream().map(Person::getId).collect(Collectors.toSet()));
notifyService.send( if (!reviewerTelegramUsernames.isEmpty()) {
NewMergeRequestGroupNotify.builder() notifyService.send(
.mrId(mergeRequest.getId()) NewMergeRequestGroupNotify.builder()
.title(mergeRequest.getTitle()) .mrId(mergeRequest.getId())
.url(mergeRequest.getWebUrl()) .title(mergeRequest.getTitle())
.author(mergeRequest.getAuthor().getName()) .url(mergeRequest.getWebUrl())
.reviewerTelegramUsernames(reviewerTelegramUsernames) .author(mergeRequest.getAuthor().getName())
.milestone(mergeRequest.getMilestone()) .reviewerTelegramUsernames(reviewerTelegramUsernames)
.projectName(projectName) .milestone(mergeRequest.getMilestone())
.targetBranch(mergeRequest.getTargetBranch()) .projectName(projectName)
.sourceBranch(mergeRequest.getSourceBranch()) .targetBranch(mergeRequest.getTargetBranch())
.description(mergeRequest.getDescription()) .sourceBranch(mergeRequest.getSourceBranch())
.build() .description(mergeRequest.getDescription())
); .build()
);
}
} else {
sendGroupNotifyAboutNoReviewers(mergeRequest, projectName);
} }
} }