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

пофиксил баг

Browse Source
This commit is contained in:
uPagge 2021-02-05 19:58:18 +03:00
parent 58a5ac294f
commit cb9ddea57e
No known key found for this signature in database
GPG Key ID: 964B40928E4C9088
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot-app/src/main/resources/application.yaml
View File

@ -22,7 +22,7 @@ telegram-config:
bot-username: ${TELEGRAM_BOT_USERNAME} bot-username: ${TELEGRAM_BOT_USERNAME}
bot-token: ${TELEGRAM_BOT_TOKEN} bot-token: ${TELEGRAM_BOT_TOKEN}
gitlab-bot: gitlab-bot:
version: 0.0.3 Beta version: 0.0.4 Beta
person: person:
telegram-id: ${TELEGRAM_PERSON_ID} telegram-id: ${TELEGRAM_PERSON_ID}
token: ${GITLAB_PERSONAL_TOKEN} token: ${GITLAB_PERSONAL_TOKEN}

8
bot-core/src/main/java/org/sadtech/bot/gitlab/core/service/parser/NoteParser.java
View File

@ -122,6 +122,14 @@ public class NoteParser {
) )
.collect(Collectors.toList()); .collect(Collectors.toList());
final Set<Long> newNoteIds = newNotes.stream().map(Task::getId).collect(Collectors.toSet());
final ExistsContainer<Note, Long> existsNoteContainer = noteService.existsById(newNoteIds);
if (existsContainer.getContainer() != null && !existsContainer.getContainer().isEmpty()) {
noteService.deleteAllById(existsNoteContainer.getContainer().stream().map(Note::getId).collect(Collectors.toSet()));
}
final List<Task> newTasks = taskService.createAll(newNotes); final List<Task> newTasks = taskService.createAll(newNotes);
newTasks.forEach(task -> noteService.link(task.getId(), mergeRequest.getId())); newTasks.forEach(task -> noteService.link(task.getId(), mergeRequest.getId()));
} }