From 436ac3b340cea909193b0c63aa04f671b7e58f25 Mon Sep 17 00:00:00 2001 From: eddie Date: Fri, 13 Dec 2019 15:51:53 -0500 Subject: [PATCH 1/2] Votes updated --- .../com/groupfour/chatapp/chatapp/poll/Poll.java | 1 + .../chatapp/chatapp/poll/PollService.java | 2 ++ .../com/groupfour/chatapp/chatapp/poll/Vote.java | 3 +++ .../chatapp/chatapp/poll/VoteController.java | 15 +++++++-------- .../chatapp/chatapp/poll/VoteRepository.java | 6 +++++- .../chatapp/chatapp/poll/VoteService.java | 12 ++++++++++++ 6 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java index 95362ba01..d06306fc2 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java @@ -27,6 +27,7 @@ public class Poll { @ManyToOne private User pollCreator; + public Long getPollId() { return pollId; } diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/PollService.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/PollService.java index eb0df1c05..20931d66a 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/PollService.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/PollService.java @@ -12,4 +12,6 @@ public class PollService { public PollService(PollRepository pollRepository) { this.pollRepository = pollRepository; } + + } diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/Vote.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/Vote.java index 810278ead..fd8f13cb9 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/Vote.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/Vote.java @@ -16,6 +16,9 @@ public class Vote { @JoinColumn(name = "OPTION_ID") private Option option; + @ManyToOne + private Poll poll; + @OneToOne private User voter; diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteController.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteController.java index 7d48fcbdb..24ef6ff88 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteController.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteController.java @@ -11,32 +11,31 @@ @RestController public class VoteController { - private VoteRepository voteRepository; private VoteService voteService; @Autowired - public VoteController(VoteRepository voteRepository) { - this.voteRepository = voteRepository; + public VoteController(VoteService voteService) { + this.voteService = voteService; } - @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST) + @PostMapping(value = "/polls/{pollId}/votes") public ResponseEntity createVote(@PathVariable Long pollId, @RequestBody Vote vote) { - vote = voteRepository.save(vote); + vote = voteService.save(vote); // Set the headers for the newly created resource HttpHeaders responseHeaders = new HttpHeaders(); responseHeaders.setLocation(ServletUriComponentsBuilder. - fromCurrentRequest().path("/{id}").buildAndExpand(vote.getVoteId()).toUri()); + fromCurrentRequest().path("/{id}").buildAndExpand(vote.getVoteId()).toUri()); return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED); } @RequestMapping(value="/polls/votes", method=RequestMethod.GET) public Iterable getAllVotes() { - return voteRepository.findAll(); + return voteService.findAll(); } @RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET) public Iterable getVote(@PathVariable Long pollId) { - return voteRepository.findVotesByPoll(pollId); + return voteService.findVotesByPoll(pollId); } diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteRepository.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteRepository.java index db2605af3..3c25c2a3d 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteRepository.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteRepository.java @@ -7,9 +7,13 @@ @Repository public interface VoteRepository extends CrudRepository { @Query(value = "SELECT v.* " + - "FROM Option o, Vote v " + + "FROM Chat o, Vote v " + "WHERE o.POLL_ID = ?1 " + "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true) public Iterable findVotesByPoll(Long pollId); + + public Iterable findVotesBy(); + + Vote findVotesByPoll_PollId(Long id); } diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteService.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteService.java index dd0524bf4..8f8e6f9dd 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteService.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/VoteService.java @@ -12,4 +12,16 @@ public class VoteService { public VoteService(VoteRepository voteRepository) { this.voteRepository = voteRepository; } + + public Vote save(Vote vote){ + return voteRepository.save(vote); + } + + public Iterable findAll() { + return null; + } + + public Iterable findVotesByPoll(Long pollId) { + return null; + } } From 0e5771b36f6c6d44317c994025bd9e49eb1d8cec Mon Sep 17 00:00:00 2001 From: eddie Date: Tue, 17 Dec 2019 20:19:06 -0500 Subject: [PATCH 2/2] removed spaces on `Poll` class --- src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java b/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java index 37130c14c..f4149f4da 100644 --- a/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java +++ b/src/main/java/com/groupfour/chatapp/chatapp/poll/Poll.java @@ -10,8 +10,6 @@ @Entity public class Poll { - - @Id @GeneratedValue @Column(name = "POLL_ID")