GET one poll by pollId

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

@@ -6,14 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
+import java.util.Optional;
 
 /**
  * project: spring-demo
@@ -21,6 +18,7 @@ import java.net.URI;
  * author: https://github.com/vvmk
  * date: 4/5/18
  */
+
 @RestController
 public class PollController {
 
@@ -57,10 +55,15 @@ public class PollController {
                     .toUri();
         }
 
-
         HttpHeaders headers = new HttpHeaders();
         headers.setLocation(newPollUri);
 
         return new ResponseEntity<>(createdPoll, headers, HttpStatus.CREATED);
     }
-}
+
+    @RequestMapping(name = "/polls/{pollId}", method = RequestMethod.GET)
+    public ResponseEntity<Poll> getPoll(@PathVariable Long pollId) {
+        Optional<Poll> poll = pollRepository.findById(pollId);
+        return new ResponseEntity<>(poll.orElse(new Poll()), HttpStatus.OK);
+    }
+}

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

@@ -6,27 +6,20 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.util.Assert;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.*;
 
 /**
  * project: spring-demo
@@ -51,6 +44,9 @@ public class PollControllerTest {
         // GET all polls
         when(pollRepo.findAll()).thenReturn(polls);
 
+        // GET one poll
+        when(pollRepo.findById(anyLong())).thenReturn(Optional.of(new Poll()));
+
         //POST create poll
         when(pollRepo.save(any(Poll.class))).thenAnswer(inv -> inv.getArgument(0));
 
@@ -101,4 +97,13 @@ public class PollControllerTest {
         verify(pollRepo).save(any(Poll.class));
         assertTrue(expected.matcher(actual).find());
     }
+
+    @Test
+    public void getPollReturnsPoll() {
+        HttpStatus expected = HttpStatus.OK;
+        HttpStatus actual = pollCtrl.getPoll(anyLong()).getStatusCode();
+
+        verify(pollRepo).findById(anyLong());
+        assertEquals(expected, actual);
+    }
 }