From 577015fa3f7a68eabc0f98a49c3ac50290ee490b Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 9 Jan 2021 20:23:16 +0100 Subject: [PATCH] BUGFIX --- .../controller/VotingController.java | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java index ddf32af..6fe81fc 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -190,32 +190,23 @@ public class VotingController { return "errors/alreadyVoted.html"; } else { LinkedList posCandidates = possibleCandidates.getPossibleCandidates(); - LinkedList voteForPosCandidates = new LinkedList<>(); - LinkedList addToPosCandidates = new LinkedList<>(); long index = 1; for (PossibleCandidate posCandidate : posCandidates) { if (posCandidate.getName() != "") { if (possibleCandidateRepository.findByNameAndCategory(posCandidate.getName(), categoryRepository.findById(index).get()) != null) { PossibleCandidate p = possibleCandidateRepository.findByNameAndCategory(posCandidate.getName(), categoryRepository.findById(index).get()); - voteForPosCandidates.add(p); + p.setVotes(p.getVotes() + 1); + possibleCandidateRepository.save(p); } else { - if(index > 31 && posCandidate.getName().indexOf(" ") != -1){ - posCandidate.setName(posCandidate.getName().split(" ")[posCandidate.getName().split(" ").length-1]); + if (index > 31 && posCandidate.getName().indexOf(" ") != -1) { + posCandidate.setName(posCandidate.getName().split(" ")[posCandidate.getName().split(" ").length - 1]); } PossibleCandidate possibleCandidate = new PossibleCandidate(posCandidate.getName(), categoryRepository.findById(index).get()); - addToPosCandidates.add(possibleCandidate); + possibleCandidateRepository.save(possibleCandidate); } } index++; } - for (PossibleCandidate p: voteForPosCandidates) { - p.setVotes(p.getVotes() + 1); - possibleCandidateRepository.save(p); - } - - for (PossibleCandidate p: addToPosCandidates) { - possibleCandidateRepository.save(p); - } tableAction.updateCandidatesubmit_status(name, voterRepository); return "voteSuccessful.html";