finished

src/main/Resources/import.sql

@@ -0,0 +1,16 @@
+insert into poll (poll_id, question) values (1, 'Who is your favorite music artist?');
+insert into option (option_id, option_value, poll_id) values (1, 'Beyonce', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'The Weeknd', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Drake', 1);
+insert into option (option_id, option_value, poll_id) values (4, 'Rihanna', 1);
+insert into option (option_id, option_value, poll_id) values (5, 'Ariana Grande', 1);
+insert into option (option_id, option_value, poll_id) values (6, 'Miguel', 1);
+insert into option (option_id, option_value, poll_id) values (7, 'Ed Sheeran', 1);
+insert into option (option_id, option_value, poll_id) values (8, 'Demi Lovato', 1);
+insert into option (option_id, option_value, poll_id) values (9, 'Selena Gomez', 1);
+insert into option (option_id, option_value, poll_id) values (10, 'Justin Bieber', 1);
+insert into option (option_id, option_value, poll_id) values (11, 'Bruno Mars', 1);
+insert into option (option_id, option_value, poll_id) values (12, 'Imagine Dragons', 1);
+insert into option (option_id, option_value, poll_id) values (13, 'Halsey', 1);
+insert into option (option_id, option_value, poll_id) values (14, 'J. Cole', 1);
+insert into option (option_id, option_value, poll_id) values (15, 'Kendrick Lamar', 1);

src/main/Resources/messages.properties

@@ -0,0 +1,2 @@
+NotEmpty.poll.question=Question is a required field
+Size.poll.options=Options must be greater than {2} and less than {1}

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

@@ -3,6 +3,7 @@ package io.zipcoder.tc_spring_poll_application.Controller;
 import io.zipcoder.tc_spring_poll_application.Domain.Poll;
 import io.zipcoder.tc_spring_poll_application.Exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.Repositories.PollRepository;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 import javax.inject.Inject;
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -17,17 +19,19 @@ public class PollController {
     @Inject
     PollRepository pollRepository;
 
-    public PollController(){
+    @Autowired
+    public PollController() {
         this.pollRepository = pollRepository;
     }
 
-    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    @RequestMapping(value = "/polls", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
         Iterable<Poll> allPolls = pollRepository.findAll(); // reads all the polls using the poll repository
         return new ResponseEntity<>(allPolls, HttpStatus.OK); // poll data becomes part of the response body & responds as OK (200)
     }
-    @RequestMapping(value="/polls", method=RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll) { // ensures client has some way of knowing the URI of the newly created poll
+
+    @RequestMapping(value = "/polls", method = RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll) { // ensures client has some way of knowing the URI of the newly created poll
         poll = (Poll) pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest()
@@ -38,26 +42,30 @@ public class PollController {
         httpHeaders.setLocation(newPollUri);
         return new ResponseEntity<>(httpHeaders, HttpStatus.CREATED);
     }
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET) // enables us to access an individual poll
+
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET) // enables us to access an individual poll
     public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
         Poll p = pollRepository.findOne(pollId);
-        return new ResponseEntity<> (p, HttpStatus.OK);
+        return new ResponseEntity<>(p, HttpStatus.OK);
     }
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
-    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) { // enables us to update a poll
+
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId) { // enables us to update a poll
         // Save the entity
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE) // enables us to delete a poll
+
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.DELETE) // enables us to delete a poll
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    public void verifyPoll() throws ResourceNotFoundException{
-        Poll poll = pollRepository.findOne(pollId);
-        if(poll == null){
+    public void verifyPoll(Long pollId) throws ResourceNotFoundException {
+        Poll p = pollRepository.findOne(pollId);
+        if (p == null) {
             throw new ResourceNotFoundException("Poll with id " + pollId + " not found");
+        }
     }
-}}
+}

src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java

@@ -1,6 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.Domain;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.util.Set;
 
 @Entity
@@ -11,11 +14,13 @@ public class Poll {
     private long id;
 
     @Column(name = "QUESTION")
+    @NotEmpty
     private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
+    @Size(min = 2, max = 6)
     private Set<Option> options;
 
     public Poll(){

src/main/java/io/zipcoder/tc_spring_poll_application/Dto/Error/ErrorDetail.java

@@ -0,0 +1,69 @@
+package io.zipcoder.tc_spring_poll_application.Dto.Error;
+
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+
+    String title;
+    int status;
+    String detail;
+    long timeStamp;
+    String developerMessage;
+    Map<String, List<ValidationError>> errors;
+
+    public ErrorDetail(){
+        this.detail = detail;
+        this.developerMessage = developerMessage;
+        this.status = status;
+        this.title = title;
+        this.timeStamp = timeStamp;
+        this.errors = errors;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
+}

src/main/java/io/zipcoder/tc_spring_poll_application/Dto/Error/RestExceptionHandler.java

@@ -0,0 +1,67 @@
+package io.zipcoder.tc_spring_poll_application.Dto.Error;
+
+import io.zipcoder.tc_spring_poll_application.Exception.ResourceNotFoundException;
+import org.springframework.context.MessageSource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+    private final MessageSource messageSource;
+
+    @Inject
+    public RestExceptionHandler(MessageSource messageSource){
+        this.messageSource = messageSource;
+    }
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        errorDetail.setTitle("Resource Not Found");
+        errorDetail.setDetail(rnfe.getMessage());
+        errorDetail.setDeveloperMessage(rnfe.getClass().getName());
+
+        return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?>
+    handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Bad Request");
+        errorDetail.setDetail(manve.getMessage());
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setTimeStamp(new Date().getTime());
+
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
+        for (FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if (validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                errorDetail.getErrors().put(fe.getField(), validationErrorList);
+            }
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(fe.getCode());
+            validationError.setMessage(messageSource.getMessage(fe, null));
+            validationErrorList.add(validationError);
+        }
+        return new ResponseEntity<>(errorDetail, HttpStatus.BAD_REQUEST);
+    }
+
+}

src/main/java/io/zipcoder/tc_spring_poll_application/Dto/Error/ValidationError.java

@@ -0,0 +1,25 @@
+package io.zipcoder.tc_spring_poll_application.Dto.Error;
+
+public class ValidationError {
+    String code;
+    String message;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+
+}