From 36ca9b11e488ac3aa2faa0e5b25e470c6b80dfb9 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Wed, 13 Oct 2021 18:00:54 +0200 Subject: [PATCH] [AB-334] adding vote result to suggestion reminder --- .../suggestion/service/SuggestionServiceBean.java | 7 +++++++ .../suggestion/model/template/SuggestionReminderModel.java | 1 + .../abstracto/suggestion/service/SuggestionService.java | 1 + 3 files changed, 9 insertions(+) diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java index 15cb8f87f..0005a9037 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-impl/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionServiceBean.java @@ -353,6 +353,7 @@ public class SuggestionServiceBean implements SuggestionService { .channelId(suggestion.getCommandChannel().getId()) .messageId(suggestion.getCommandMessageId()) .build(); + SuggestionInfoModel suggestionInfoModel = getSuggestionInfo(suggestionId); SuggestionReminderModel model = SuggestionReminderModel .builder() .serverId(serverId) @@ -361,6 +362,7 @@ public class SuggestionServiceBean implements SuggestionService { .suggestionId(suggestionId.getId()) .suggestionMessage(suggestionServerChannelMessage) .suggestionCommandMessage(commandServerChannelMessage) + .suggestionInfo(suggestionInfoModel) .build(); MessageToSend messageToSend = templateService.renderEmbedTemplate(SUGGESTION_REMINDER_TEMPLATE_KEY, model, serverId); log.info("Reminding about suggestion {} in server {}.", suggestionId.getId(), serverId); @@ -388,6 +390,11 @@ public class SuggestionServiceBean implements SuggestionService { .build(); } + @Override + public SuggestionInfoModel getSuggestionInfo(ServerSpecificId suggestionId) { + return getSuggestionInfo(suggestionId.getServerId(), suggestionId.getId()); + } + @Transactional public void deleteSuggestion(Long suggestionId, Long serverId) { Suggestion suggestion = suggestionManagementService.getSuggestion(serverId, suggestionId); diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionReminderModel.java b/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionReminderModel.java index a3b95ac95..056029f45 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionReminderModel.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionReminderModel.java @@ -18,4 +18,5 @@ public class SuggestionReminderModel { private ServerChannelMessage suggestionMessage; private ServerChannelMessage suggestionCommandMessage; private ServerUser serverUser; + private SuggestionInfoModel suggestionInfo; } diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionService.java b/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionService.java index c10ed8023..a26f40c89 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionService.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/service/SuggestionService.java @@ -19,4 +19,5 @@ public interface SuggestionService { CompletableFuture remindAboutSuggestion(ServerSpecificId suggestionId); void cancelSuggestionReminder(Suggestion suggestion); SuggestionInfoModel getSuggestionInfo(Long serverId, Long suggestionId); + SuggestionInfoModel getSuggestionInfo(ServerSpecificId suggestionId); }