From b90dc6d0e395d06cff52c1e05d419aeb3f588535 Mon Sep 17 00:00:00 2001
From: a_fattahi <afattahi@yahoo.com>
Date: Wed, 22 Dec 2021 16:01:03 +0330
Subject: [PATCH] code clean
---
.../example/polls/controller/PollController.java | 16 ----------------
.../com/example/polls/service/PollService.java | 2 +-
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/polling-app-server/src/main/java/com/example/polls/controller/PollController.java b/polling-app-server/src/main/java/com/example/polls/controller/PollController.java
index ade3af3a..1d0c4457 100644
--- a/polling-app-server/src/main/java/com/example/polls/controller/PollController.java
+++ b/polling-app-server/src/main/java/com/example/polls/controller/PollController.java
@@ -2,15 +2,10 @@
import com.example.polls.model.*;
import com.example.polls.payload.*;
-import com.example.polls.repository.PollRepository;
-import com.example.polls.repository.UserRepository;
-import com.example.polls.repository.VoteRepository;
import com.example.polls.security.CurrentUser;
import com.example.polls.security.UserPrincipal;
import com.example.polls.service.PollService;
import com.example.polls.util.AppConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,20 +18,9 @@
@RequestMapping("/api/polls")
public class PollController {
- @Autowired
- private PollRepository pollRepository;
-
- @Autowired
- private VoteRepository voteRepository;
-
- @Autowired
- private UserRepository userRepository;
-
@Autowired
private PollService pollService;
- private static final Logger logger = LoggerFactory.getLogger(PollController.class);
-
@GetMapping
public PagedResponse<PollResponse> getPolls(@CurrentUser UserPrincipal currentUser,
@RequestParam(value = "page", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER) int page,
diff --git a/polling-app-server/src/main/java/com/example/polls/service/PollService.java b/polling-app-server/src/main/java/com/example/polls/service/PollService.java
index 5d4cb5eb..90c52cfd 100644
--- a/polling-app-server/src/main/java/com/example/polls/service/PollService.java
+++ b/polling-app-server/src/main/java/com/example/polls/service/PollService.java
@@ -192,7 +192,7 @@ public PollResponse castVoteAndGetUpdatedPoll(Long pollId, VoteRequest voteReque
throw new BadRequestException("Sorry! This Poll has already expired");
}
- User user = userRepository.getOne(currentUser.getId());
+ User user = userRepository.getById(currentUser.getId());
Choice selectedChoice = poll.getChoices().stream()
.filter(choice -> choice.getId().equals(voteRequest.getChoiceId()))