From fb7b0271b313068dc57db995a8f871bfbc800f42 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 18 Dec 2020 19:04:12 +0100 Subject: [PATCH] Removed code pass through --- logs/Voting.log | 76 +++++++++++++++++++ .../controller/VotingController.java | 12 +-- .../table/TableAction.java | 1 + .../static/styles/addingCandidates.css | 1 + 4 files changed, 81 insertions(+), 9 deletions(-) diff --git a/logs/Voting.log b/logs/Voting.log index dec608e..642280f 100644 --- a/logs/Voting.log +++ b/logs/Voting.log @@ -81,3 +81,79 @@ 2020-12-18 18:56:14,142 WARN [http-nio-8000-exec-4] simon.bussmann@adolfinum.de 2020-12-18 18:56:24,707 WARN [http-nio-8000-exec-6] 513389 2020-12-18 18:56:24,707 WARN [http-nio-8000-exec-6] matched +2020-12-18 18:59:40,836 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' +2020-12-18 18:59:40,840 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-12-18 18:59:40,844 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... +2020-12-18 18:59:40,857 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. +2020-12-18 18:59:43,049 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 8537 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-12-18 18:59:43,053 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-12-18 18:59:43,098 INFO [restartedMain] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +2020-12-18 18:59:43,099 INFO [restartedMain] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +2020-12-18 18:59:43,445 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-12-18 18:59:43,489 INFO [restartedMain] Finished Spring Data repository scanning in 39ms. Found 6 JPA repository interfaces. +2020-12-18 18:59:44,087 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-12-18 18:59:44,095 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-12-18 18:59:44,096 INFO [restartedMain] Starting service [Tomcat] +2020-12-18 18:59:44,096 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-12-18 18:59:44,153 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-12-18 18:59:44,154 INFO [restartedMain] Root WebApplicationContext: initialization completed in 1055 ms +2020-12-18 18:59:44,318 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-12-18 18:59:44,360 INFO [restartedMain] HHH000412: Hibernate ORM core version 5.4.21.Final +2020-12-18 18:59:44,449 INFO [restartedMain] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} +2020-12-18 18:59:44,516 INFO [restartedMain] HikariPool-1 - Starting... +2020-12-18 18:59:44,869 INFO [restartedMain] HikariPool-1 - Start completed. +2020-12-18 18:59:44,889 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-12-18 18:59:45,479 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-12-18 18:59:45,487 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-12-18 18:59:45,501 INFO [restartedMain] LiveReload server is running on port 35729 +2020-12-18 18:59:45,960 INFO [restartedMain] Program started with arguments: votingPhase=false mottoPhase=false addingPhase=true +2020-12-18 18:59:46,131 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-12-18 18:59:46,244 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-12-18 18:59:46,446 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-12-18 18:59:46,468 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-12-18 18:59:46,477 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 3.797 seconds (JVM running for 4.416) +2020-12-18 18:59:52,929 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-12-18 18:59:52,930 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-12-18 18:59:52,937 INFO [http-nio-8000-exec-1] Completed initialization in 7 ms +2020-12-18 18:59:55,289 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de +2020-12-18 19:00:06,493 WARN [http-nio-8000-exec-5] 513389 +2020-12-18 19:00:06,494 WARN [http-nio-8000-exec-5] matched +2020-12-18 19:03:11,735 INFO [SpringContextShutdownHook] Shutting down ExecutorService 'applicationTaskExecutor' +2020-12-18 19:03:11,738 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default' +2020-12-18 19:03:11,741 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown initiated... +2020-12-18 19:03:11,751 INFO [SpringContextShutdownHook] HikariPool-1 - Shutdown completed. +2020-12-18 19:03:14,975 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 8726 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem) +2020-12-18 19:03:14,980 INFO [restartedMain] No active profile set, falling back to default profiles: default +2020-12-18 19:03:15,044 INFO [restartedMain] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable +2020-12-18 19:03:15,045 INFO [restartedMain] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG' +2020-12-18 19:03:15,409 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode. +2020-12-18 19:03:15,455 INFO [restartedMain] Finished Spring Data repository scanning in 40ms. Found 6 JPA repository interfaces. +2020-12-18 19:03:16,022 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http) +2020-12-18 19:03:16,032 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"] +2020-12-18 19:03:16,032 INFO [restartedMain] Starting service [Tomcat] +2020-12-18 19:03:16,033 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38] +2020-12-18 19:03:16,089 INFO [restartedMain] Initializing Spring embedded WebApplicationContext +2020-12-18 19:03:16,089 INFO [restartedMain] Root WebApplicationContext: initialization completed in 1044 ms +2020-12-18 19:03:16,256 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default] +2020-12-18 19:03:16,294 INFO [restartedMain] HHH000412: Hibernate ORM core version 5.4.21.Final +2020-12-18 19:03:16,398 INFO [restartedMain] HCANN000001: Hibernate Commons Annotations {5.1.0.Final} +2020-12-18 19:03:16,478 INFO [restartedMain] HikariPool-1 - Starting... +2020-12-18 19:03:16,810 INFO [restartedMain] HikariPool-1 - Start completed. +2020-12-18 19:03:16,832 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect +2020-12-18 19:03:17,396 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform] +2020-12-18 19:03:17,403 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default' +2020-12-18 19:03:17,415 INFO [restartedMain] LiveReload server is running on port 35729 +2020-12-18 19:03:17,773 INFO [restartedMain] Program started with arguments: votingPhase=false mottoPhase=false addingPhase=true +2020-12-18 19:03:17,961 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning +2020-12-18 19:03:18,056 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor' +2020-12-18 19:03:18,211 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"] +2020-12-18 19:03:18,228 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path '' +2020-12-18 19:03:18,237 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 3.6 seconds (JVM running for 4.169) +2020-12-18 19:03:24,174 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet' +2020-12-18 19:03:24,174 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet' +2020-12-18 19:03:24,179 INFO [http-nio-8000-exec-1] Completed initialization in 5 ms +2020-12-18 19:03:26,721 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de +2020-12-18 19:03:37,618 WARN [http-nio-8000-exec-5] 513389 +2020-12-18 19:03:37,619 WARN [http-nio-8000-exec-5] matched +2020-12-18 19:03:41,410 WARN [http-nio-8000-exec-7] 513389 +2020-12-18 19:03:41,410 WARN [http-nio-8000-exec-7] wrong 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 69f9923..fe0669f 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -173,7 +173,6 @@ public class VotingController { List mottos = mottoRepository.findAll(); model.addAttribute("mottos", mottos); model.addAttribute("name", name); - model.addAttribute("code", code); return "mottoVoting.html"; } else if (addingPhase) { PossibleCandidateWrapper possibleCandidates = new PossibleCandidateWrapper(); @@ -184,13 +183,11 @@ public class VotingController { model.addAttribute("categories", categories); model.addAttribute("form", possibleCandidates); model.addAttribute("name", name); - model.addAttribute("code", code); return "addingCandidates.html"; } else if (votingPhase) { List categories = categoryRepository.findAll(); model.addAttribute("categories", categories); model.addAttribute("name", name); - model.addAttribute("code", code); return "voting.html"; } } else if (tokenStatus.equals("expired")) { @@ -210,11 +207,10 @@ public class VotingController { } @RequestMapping("/saveCandidates") - public String candidateSaving(@ModelAttribute PossibleCandidateWrapper possibleCandidates, @RequestParam String name, @RequestParam String code) { + public String candidateSaving(@ModelAttribute PossibleCandidateWrapper possibleCandidates, @RequestParam String name) { if (voterRepository.findByEmail(name).getVote_status()) { return "errors/alreadyVoted.html"; } else { - authCodesRepository.delete(authCodesRepository.findByName(code)); LinkedList posCandidates = possibleCandidates.getPossibleCandidates(); long index = 1; for (PossibleCandidate posCandidate : posCandidates) { @@ -236,12 +232,11 @@ public class VotingController { } @RequestMapping("/saveMotto") - public String mottoSaving(@RequestParam String name, @RequestParam String voteValue, @RequestParam String code) { + public String mottoSaving(@RequestParam String name, @RequestParam String voteValue) { LOGGER.info(name); if (voterRepository.findByEmail(name).getMotto_status()) { return "errors/alreadySubmitted.html"; } else { - authCodesRepository.delete(authCodesRepository.findByName(code)); tableAction.voteForMotto(voteValue, mottoRepository); tableAction.updateMottoStatus(name, voterRepository); LOGGER.info(name + " has choose his motto"); @@ -250,11 +245,10 @@ public class VotingController { } @RequestMapping("/processVote") - public String ProcessVote(@RequestParam String name, @RequestParam String voteValues, @RequestParam String code) { + public String ProcessVote(@RequestParam String name, @RequestParam String voteValues) { if (voterRepository.findByEmail(name).getCandidatesubmit_status()) { return "errors/alreadySubmitted.html"; } else { - authCodesRepository.delete(authCodesRepository.findByName(code)); String[] partVoteValues = voteValues.split(","); for (String s : partVoteValues) { tableAction.voteForCandidate(s, candidateRepository); diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java index c12a984..c1f07dd 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java @@ -55,6 +55,7 @@ public class TableAction { try { AuthCode authCode = authCodesRepository.findByName(name); if (authCode.getCode().equals(code) && !authCode.isExpired()) { + authCodesRepository.delete(authCode); return "matched"; } else if (authCode.isExpired()) { authCodesRepository.delete(authCode); diff --git a/src/main/resources/static/styles/addingCandidates.css b/src/main/resources/static/styles/addingCandidates.css index 9aac8ac..6d68b66 100644 --- a/src/main/resources/static/styles/addingCandidates.css +++ b/src/main/resources/static/styles/addingCandidates.css @@ -28,6 +28,7 @@ h2 { } h2.categoryCategory { + color: #bb1515; margin-top: 5%; margin-bottom: 1%; }