From f091559c49b2d2f01c2ec58b3e4b14277f6ad50f Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sat, 25 Feb 2023 18:19:01 +0100 Subject: [PATCH] [AB-84] adding necessary information to suggestion update message --- .../abstracto/suggestion/service/SuggestionServiceBean.java | 6 ++++++ .../suggestion/model/template/SuggestionUpdateModel.java | 3 +++ 2 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 bb0e02f7d..410fd73a6 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 @@ -278,6 +278,9 @@ public class SuggestionServiceBean implements SuggestionService { Long agreements = suggestionVoteManagementService.getDecisionsForSuggestion(suggestion, SuggestionDecision.AGREE); Long disagreements = suggestionVoteManagementService.getDecisionsForSuggestion(suggestion, SuggestionDecision.DISAGREE); Long suggestionId = suggestion.getSuggestionId().getId(); + Long totalVotes = disagreements + agreements; + float agreementPercentage = (float) agreements / (totalVotes) * 100; + float disAgreementPercentage = 100f - agreementPercentage; SuggestionUpdateModel model = SuggestionUpdateModel .builder() .suggestionId(suggestionId) @@ -290,6 +293,9 @@ public class SuggestionServiceBean implements SuggestionService { .text(suggestion.getSuggestionText()) .originalChannelId(channelId) .reason(reason) + .totalVotes(totalVotes) + .agreementPercentage(agreementPercentage) + .disAgreementPercentage(disAgreementPercentage) .build(); log.info("Updated posted suggestion {} in server {}.", suggestionId, suggestion.getServer().getId()); CompletableFuture memberById = userService.retrieveUserForId(suggestion.getSuggester().getUserReference().getId()); diff --git a/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionUpdateModel.java b/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionUpdateModel.java index 3ca529765..8b2ed98c2 100644 --- a/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionUpdateModel.java +++ b/abstracto-application/abstracto-modules/suggestion/suggestion-int/src/main/java/dev/sheldan/abstracto/suggestion/model/template/SuggestionUpdateModel.java @@ -25,6 +25,9 @@ public class SuggestionUpdateModel { private Long originalMessageId; private Long agreeVotes; private Long disAgreeVotes; + private Long totalVotes; + private Float agreementPercentage; + private Float disAgreementPercentage; public String getOriginalMessageUrl() { return MessageUtils.buildMessageUrl(serverId, originalChannelId , originalMessageId);