Revert "compute result worked and then stopped working"

This reverts commit 075680e064349600417a268e06fadc5b67ca7dba.

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

@@ -38,23 +38,11 @@ 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)
-    public Iterable<Vote> findVotesByPoll(Long pollId);
-}
+    Iterable<Vote> findVotesByPoll(Long pollId);
 
+}

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

@@ -118,34 +118,32 @@ 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();
-
-        String header = response.getHeader("Location");
+//        MockHttpServletResponse response = mvc.perform(post("/polls/2")
+//                .content(asJsonString(testPoll2))
+//                .contentType(MediaType.APPLICATION_JSON)
+//                .accept(MediaType.APPLICATION_JSON))
+//                .andReturn().getResponse();
 
-        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
-        Assert.assertEquals(expected, header);
+        mvc.perform(post("/polls/{id}",2)
+                .contentType(MediaType.APPLICATION_JSON)
+                .contentType(asJsonString(testPoll2)))
+                .andExpect(status().isCreated())
+                .andExpect(header().string("location", containsString("/polls/2")));
 
-        // =============== Mockito Version to implement
+        verify(pollController, times(1)).createPoll(testPoll2);
 
-//        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")));
+//        String header = response.getHeader("Location");
 //
-//        verify(pollController, times(1)).createPoll(testPoll2);
+//        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
+//        Assert.assertEquals(expected, header);
     }
 
     @Test

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

@@ -140,4 +140,19 @@ 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);
     }