Revert "Revert "compute result worked and then stopped working""

This reverts commit 7b432ab76b347e642d6f7eea972d9f26fb0800ea.

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

@@ -38,11 +38,23 @@ public class ComputeResultController {
         long voteCount = StreamSupport.stream(allVotes.spliterator(), false).count();
         HashMap<Long, OptionCount> optionCountsMap = new HashMap<>();
 
+        // Ok now it's grabbing all the votes, BUT the option ID is null??
+//        {
+//            "totalVotes": 3,
+//                "results": [
+//            {
+//                "optionId": null,
+//                    "count": 3
+//            }
+//    ]
+//        }
+
         for (Vote v: allVotes) {
             Long optionID = (v.getOption().getId());
             OptionCount temp;
             if (!optionCountsMap.keySet().contains(optionID)) {
                 temp = new OptionCount();
+                temp.setOptionId(optionID);
                 temp.setCount(1);
                 optionCountsMap.put(optionID,temp);
             } else {

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

@@ -9,6 +9,6 @@ public interface VoteRepository extends CrudRepository<Vote, Long> {
             "FROM Option o, Vote v " +
             "WHERE o.POLL_ID = ?1 " +
             "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
-    Iterable<Vote> findVotesByPoll(Long pollId);
-
+    public Iterable<Vote> findVotesByPoll(Long pollId);
 }
+

src/test/java/io/zipcoder/tc_spring_poll_application/controller/PollControllerTest.java

@@ -118,32 +118,34 @@ public class PollControllerTest {
      postURLtemplate URL */
     public void testCreatePollSuccess() throws Exception {
         Poll testPoll2 = new Poll();
-//        String expected = "http://localhost/polls/2/";
+        String expected = "http://localhost/polls/2/";
 
-//        HttpHeaders responseHeader =  new HttpHeaders();
-//        responseHeader.setLocation(URI.create(expected));
+        HttpHeaders responseHeader =  new HttpHeaders();
+        responseHeader.setLocation(URI.create(expected));
 
         given(pollController.createPoll(testPoll2)).willReturn(null);
-//        doNothing().when(pollController).createPoll(testPoll2);
-
-//        MockHttpServletResponse response = mvc.perform(post("/polls/2")
-//                .content(asJsonString(testPoll2))
-//                .contentType(MediaType.APPLICATION_JSON)
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
 
-        mvc.perform(post("/polls/{id}",2)
+        MockHttpServletResponse response = mvc.perform(post("/polls/2")
+                .content(asJsonString(testPoll2))
                 .contentType(MediaType.APPLICATION_JSON)
-                .contentType(asJsonString(testPoll2)))
-                .andExpect(status().isCreated())
-                .andExpect(header().string("location", containsString("/polls/2")));
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
 
-        verify(pollController, times(1)).createPoll(testPoll2);
+        String header = response.getHeader("Location");
 
-//        String header = response.getHeader("Location");
+        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
+        Assert.assertEquals(expected, header);
+
+        // =============== Mockito Version to implement
+
+//        doNothing().when(pollController).createPoll(testPoll2);
+//        mvc.perform(post("/polls/{id}",2)
+//                .contentType(MediaType.APPLICATION_JSON)
+//                .contentType(asJsonString(testPoll2)))
+//                .andExpect(status().isCreated())
+//                .andExpect(header().string("location", containsString("/polls/2")));
 //
-//        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
-//        Assert.assertEquals(expected, header);
+//        verify(pollController, times(1)).createPoll(testPoll2);
     }
 
     @Test

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

@@ -140,19 +140,4 @@ public class VoteControllerTest {
 
         verify(voteController, times(1)).createVote(pollId, testVote2);
     }
-//
-//    @Test
-//    public void test_create_user_fail_404_not_found() throws Exception {
-//        User user = new User("username exists");
-//
-//        when(userService.exists(user)).thenReturn(true);
-//
-//        mockMvc.perform(
-//                post("/users")
-//                        .contentType(MediaType.APPLICATION_JSON)
-//                        .content(asJsonString(user)))
-//                .andExpect(status().isConflict());
-//
-//        verify(userService, times(1)).exists(user);
-//        verifyNoMoreInteractions(userService);
     }