This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit d5dd29cf9c8f076996170a9f552cc4e29e08645f Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 8 18:13:28 2017 +0200 fix build --- .../chorem/pollen/services/service/ErrorMap.java | 4 ++++ .../pollen/services/service/VoteService.java | 25 ++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ErrorMap.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ErrorMap.java index a365da5f..9a7c7a43 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ErrorMap.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ErrorMap.java @@ -54,6 +54,10 @@ public class ErrorMap { } + public void addAllErrors(ErrorMap errorMap) { + errors.putAll(errorMap.getErrors()); + } + public void copyTo(ErrorMap errorMap, String prefix) { for (String key : errors.keySet()) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 50154a5b..4b1f2574 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -186,13 +186,11 @@ public class VoteService extends PollenServiceSupport { checkPermission(PermissionVerb.deleteVote, voteId); Poll poll = getPollService().getPoll0(pollId); - List<ChoiceBean> choices = getChoiceService().getChoices(pollId); - - Vote vote = getVote(poll, voteId); - ErrorMap errorMap = checkVote(poll, vote, choices); + ErrorMap errorMap = checkPoll(poll); errorMap.failIfNotEmpty(); + Vote vote = getVote(poll, voteId); getVoteDao().delete(vote); commit(); @@ -201,18 +199,27 @@ public class VoteService extends PollenServiceSupport { } - protected ErrorMap checkVote(Poll poll, VoteBean vote, List<ChoiceBean> choices) { + protected ErrorMap checkPoll(Poll poll) { ErrorMap errors = new ErrorMap(); - boolean voteExists = vote.isPersisted(); - Set<String> voterNames = new HashSet<>(); - Date now = serviceContext.getNow(); check(errors, "poll", Polls.isStarted(poll, now), l(getLocale(), "pollen.error.vote.poll.notStarted")); check(errors, "poll", !Polls.isFinished(poll, now), l(getLocale(), "pollen.error.vote.poll.finished")); + return errors; + } + + protected ErrorMap checkVote(Poll poll, VoteBean vote, List<ChoiceBean> choices) { + + ErrorMap errors = new ErrorMap(); + + Set<String> voterNames = new HashSet<>(); + + errors.addAllErrors(checkPoll(poll)); + + boolean voteExists = vote.isPersisted(); boolean voteNameNotBlank = checkNotBlank(errors, "voter.name", vote.getVoterName(), l(getLocale(), "pollen.error.vote.voterName.mandatory")); if (voteNameNotBlank) { @@ -224,7 +231,7 @@ public class VoteService extends PollenServiceSupport { for (Vote oneVote : existingVote) { if (voteExists && - oneVote.getTopiaId().equals(vote.getEntityId())) { + oneVote.getTopiaId().equals(vote.getEntityId())) { continue; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.