saving

src/main/java/quickpoll/dtos/ComputeResultController.java

@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.inject.Inject;
+import java.util.HashMap;
+import java.util.Map;
 
 @RestController
 public class ComputeResultController {
@@ -21,11 +23,21 @@ public class ComputeResultController {
         VoteResult voteResult = new VoteResult();
         Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
 
-        //TODO: count votes
-//        for(Vote v : allVotes){
-//
-//        }
-        voteResult.setTotalVotes(200);
+        int totalVotes = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<>();
+        for(Vote v : allVotes) {
+            totalVotes ++;
+
+            OptionCount optionCount = tempMap.get(v.getOption().getId());
+            if(optionCount == null) {
+                optionCount = new OptionCount();
+                optionCount.setOptionId(v.getOption().getId());
+                tempMap.put(v.getOption().getId(), optionCount);
+            }
+            optionCount.setCount(optionCount.getCount()+1);
+        }
+        voteResult.setTotalVotes(totalVotes);
+        voteResult.setResults(tempMap.values());
 
         return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
     }

src/main/java/quickpoll/dtos/error/ErrorDetail.java

@@ -1,11 +1,15 @@
 package quickpoll.dtos.error;
 
+import java.util.List;
+import java.util.Map;
+
 public class ErrorDetail {
     private String title;
     private int status;
     private String detail;
     private long timeStamp;
     private String developerMessage;
+    private Map<String,List<ValidationError>> errors;
 
     public String getTitle() {
         return title;
@@ -46,4 +50,12 @@ public class ErrorDetail {
     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/quickpoll/io/zipcoder/tc_spring_poll_application/controller/PollController.java

@@ -26,9 +26,9 @@ public class PollController {
    }
 
 
-   @Valid
+
    @RequestMapping(value = "/polls", method = RequestMethod.POST)
-   public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+   public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll) {
        URI newPollUri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(poll.getId()).toUri();
        poll = pollRepository.save(poll);
        HttpHeaders header = new HttpHeaders();
@@ -43,9 +43,9 @@ public class PollController {
        return new ResponseEntity<>(p, HttpStatus.OK);
    }
 
-   @Valid
+
    @RequestMapping(value="/polls/{pollId}", method = RequestMethod.PUT)
-   public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId){
+   public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId){
        verifyPoll(pollId);
        Poll p = pollRepository.save(poll);
        return new ResponseEntity<>(HttpStatus.OK);

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/domain/Poll.java

@@ -3,6 +3,7 @@ package quickpoll.io.zipcoder.tc_spring_poll_application.domain;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Set;
 

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java

@@ -1,16 +1,33 @@
 package quickpoll.io.zipcoder.tc_spring_poll_application.exception;
 
+import org.springframework.beans.factory.annotation.Autowired;
+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 org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import quickpoll.dtos.error.ErrorDetail;
+import quickpoll.dtos.error.ValidationError;
 
+
+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 {
 
+    @Autowired
+    private MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
         ErrorDetail errorDetail = new ErrorDetail();
         errorDetail.setTitle("Resource Not Found");
@@ -21,4 +38,39 @@ public class RestExceptionHandler {
 
         return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class) @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public @ResponseBody
+    ErrorDetail handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        String requestPath = (String) request.getAttribute("javax.servlet.error.request_uri");
+        if(requestPath == null) {
+            requestPath = request.getRequestURI();
+        }
+        errorDetail.setTitle("Validation Failed");
+        errorDetail.setDetail("Input validation failed");
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        //System.out.println(fieldErrors);
+        for(FieldError fe : fieldErrors) {
+            List<ValidationError> validationErrorList = errorDetail.getErrors().
+                    get(fe.getField());
+            if(validationErrorList == null) {
+            }
+            validationErrorList = new ArrayList<ValidationError>();
+            errorDetail.getErrors().put(fe.getField(),
+                    validationErrorList);
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(fe.getCode());
+            validationError.setMessage(messageSource.getMessage(fe, null));
+            validationErrorList.add(validationError);
+        }
+        return errorDetail;
+    }
+
+
 }

src/main/resource/import.sql

@@ -0,0 +1,4 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into option (option_id, option_value, poll_id) values (1, 'Green', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Blue', 1);

src/main/resource/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}