Refmt, begin e2e testing

src/main/java/io/zipcoder/tc_spring_poll_application/controllers/ComputeResultController.java

@@ -1,9 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.controllers;
 
-import io.zipcoder.tc_spring_poll_application.domain.Option;
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
 import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import io.zipcoder.tc_spring_poll_application.utils.ResultCalculator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -38,12 +38,14 @@ public class ComputeResultController {
         return new ResponseEntity<>(voteResult, HttpStatus.OK);
     }
 
-    protected VoteResult computeResults(Iterable<Vote> votes) {
+    private VoteResult computeResults(Iterable<Vote> votes) {
         Iterator<Vote> voterator = votes.iterator();
-        VoteResult result = new VoteResult();
-        while(voterator.hasNext()) {
+
+        ResultCalculator rc = new ResultCalculator();
+        while (voterator.hasNext()) {
             Vote v = voterator.next();
+            rc.add(v.getOption());
         }
-        return result;
+        return rc.calculate();
     }
 }

src/main/java/io/zipcoder/tc_spring_poll_application/controllers/VoteController.java

@@ -52,12 +52,12 @@ public class VoteController {
         return new ResponseEntity<>(vote, responseHeaders, HttpStatus.CREATED);
     }
 
-    @RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET)
+    @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Vote>> getVotes() {
         return new ResponseEntity<>(voteRepository.findAll(), HttpStatus.OK);
     }
 
-    @RequestMapping(value="/polls/{pollId}/votes/", method=RequestMethod.GET)
+    @RequestMapping(value = "/polls/{pollId}/votes/", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Vote>> getVotesForPoll(@PathVariable Long pollId) {
         return new ResponseEntity<>(voteRepository.findVotesByPoll(pollId), HttpStatus.OK);
     }

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java

@@ -16,10 +16,10 @@ public class Option {
 
     @Id
     @GeneratedValue
-    @Column(name="OPTION_ID")
+    @Column(name = "OPTION_ID")
     private Long Id;
 
-    @Column(name="OPTION_VALUE")
+    @Column(name = "OPTION_VALUE")
     private String value;
 
     public Option() {

src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java

@@ -12,6 +12,11 @@ public class VoteResult {
     private int totalVotes;
     private Collection<OptionCount> results;
 
+    public VoteResult(int totalVotes, Collection<OptionCount> results) {
+        this.totalVotes = totalVotes;
+        this.results = results;
+    }
+
     public int getTotalVotes() {
         return totalVotes;
     }

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java

@@ -9,5 +9,5 @@ import org.springframework.data.repository.CrudRepository;
  * author: https://github.com/vvmk
  * date: 4/5/18
  */
-public interface OptionRepository extends CrudRepository<Option, Long>{
+public interface OptionRepository extends CrudRepository<Option, Long> {
 }

src/main/java/io/zipcoder/tc_spring_poll_application/utils/ResultCalculator.java

@@ -2,6 +2,7 @@ package io.zipcoder.tc_spring_poll_application.utils;
 
 import io.zipcoder.tc_spring_poll_application.domain.Option;
 import io.zipcoder.tc_spring_poll_application.dtos.OptionCount;
+import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
 
 import java.util.AbstractCollection;
 import java.util.HashMap;
@@ -36,6 +37,10 @@ public class ResultCalculator extends AbstractCollection<OptionCount> {
         optionCounts.put(oId, workingCount);
     }
 
+    public VoteResult calculate() {
+        return new VoteResult(size(), optionCounts.values());
+    }
+
     public OptionCount getOptionCountById(Long id) {
         return optionCounts.get(id);
     }

src/test/java/io/zipcoder/tc_spring_poll_application/controllers/VoteControllerTest.java

@@ -14,9 +14,7 @@ import java.util.List;
 import static junit.framework.TestCase.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 /**
  * project: spring-demo
@@ -38,8 +36,8 @@ public class VoteControllerTest {
 
         //create vote
         when(voteRepo.save(any(Vote.class))).thenAnswer(inv -> inv.getArgument(0));
-        when(voteRepo.findAll()).thenReturn((Iterable<Vote>)mock(List.class));
-        when(voteRepo.findVotesByPoll(anyLong())).thenReturn((Iterable<Vote>)mock(List.class));
+        when(voteRepo.findAll()).thenReturn((Iterable<Vote>) mock(List.class));
+        when(voteRepo.findVotesByPoll(anyLong())).thenReturn((Iterable<Vote>) mock(List.class));
     }
 
     @Test