commited

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

@@ -2,6 +2,7 @@ package io.zipcoder.tc_spring_poll_application.controller;
 
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import io.zipcoder.tc_spring_poll_application.domain.repositories.VoteRepository;
+import io.zipcoder.tc_spring_poll_application.dtos.OptionCount;
 import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+
 @RestController
 public class ComputeResultController {
 
@@ -18,6 +21,7 @@ public class ComputeResultController {
 
     @Autowired
     public ComputeResultController(VoteRepository voteRepository) {
+
         this.voteRepository = voteRepository;
     }
 
@@ -25,9 +29,30 @@ public class ComputeResultController {
 
     public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
         VoteResult voteResult = new VoteResult();
+        voteResult.setResults(new ArrayList<OptionCount>());
         Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+        for(Vote vote : allVotes){
+                       OptionCount optionCount = new OptionCount();
+                       optionCount.setCount(1);
+                     optionCount.setOptionId(vote.getOption().getId());
+
+                                if(voteResult.getOptionCount(optionCount) != null){
+                               OptionCount optionCount1 = voteResult.getOptionCount(optionCount);
+                             int amount = optionCount1.getCount();
+                              amount = amount + 1;
+                               optionCount1.setCount(amount);
+                             int votes = voteResult.getTotalVotes();
+                            votes = votes + 1;
+                           voteResult.setTotalVotes(votes);
+                        } else {
+                              voteResult.addOptionCount(optionCount);
+                              voteResult.setTotalVotes(1);
+                        }
+                  }
+
+                       return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+         }
+
+
 
-        //TODO: Implement algorithm to count votes
-        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
-    }
 }

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

@@ -4,11 +4,15 @@ import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import io.zipcoder.tc_spring_poll_application.domain.repositories.PollRepository;
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 /*
@@ -24,57 +28,116 @@ Create a `PollController` class in the `controller` sub package.
 public class PollController {
 
 
-    PollRepository pollRepository;
+    private PollRepository pollRepository;
+
+
+    //    @Autowired
+//    public PollController(PollRepository pollRepository1) {
+//        this.pollRepository = pollRepository1;
+//
+//    }
+//
+//    @RequestMapping(value = "/polls", method = RequestMethod.GET)
+//    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+//        Iterable<Poll> allPolls = pollRepository.findAll();
+//        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+//    }
+//
+//    @RequestMapping(value = "/polls", method = RequestMethod.POST)
+//
+//    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+//        poll = pollRepository.save(poll);
+//
+//        URI newPollUri = ServletUriComponentsBuilder
+//                .fromCurrentRequest()
+//                .path("/{id}")
+//                .buildAndExpand(poll.getId())
+//                .toUri();
+//
+//        return new ResponseEntity<>(null, HttpStatus.CREATED);
+//    }
+//
+//    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
+//    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+//        Poll p = pollRepository.findOne(pollId);
+//        return new ResponseEntity<>(p, HttpStatus.OK);
+//    }
+//
+//    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.PUT)
+//    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+//        // Save the entity
+//        Poll p = pollRepository.save(poll);
+//        return new ResponseEntity<>(HttpStatus.OK);
+//    }
+//
+//    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.DELETE)
+//    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+//        pollRepository.delete(pollId);
+//        return new ResponseEntity<>(HttpStatus.OK);
+//    }
+//
+////    public void verifypoll() throws ResourceNotFoundException {
+////        throw new ResourceNotFoundException();
+////    }
+//}
+    public void pollExists(Long pollId) throws ResourceNotFoundException {
+        if (pollRepository.findOne(pollId) == null) {
+            throw new ResourceNotFoundException("The poll specified does not exist.");
+        }
 
+    }
 
     @Autowired
-    public PollController(PollRepository pollRepository1) {
-        this.pollRepository = pollRepository1;
-
+    public PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
     }
 
-    @RequestMapping(value = "/polls", method = RequestMethod.GET)
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+    @GetMapping("/polls")
+    public ResponseEntity<Iterable<Poll>> getPolls() {
         Iterable<Poll> allPolls = pollRepository.findAll();
         return new ResponseEntity<>(allPolls, HttpStatus.OK);
     }
 
-    @RequestMapping(value = "/polls", method = RequestMethod.POST)
-
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
-        poll = pollRepository.save(poll);
-
-        URI newPollUri = ServletUriComponentsBuilder
-                .fromCurrentRequest()
-                .path("/{id}")
-                .buildAndExpand(poll.getId())
-                .toUri();
-
-        return new ResponseEntity<>(null, HttpStatus.CREATED);
-    }
-
-    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
-    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
-        Poll p = pollRepository.findOne(pollId);
-        return new ResponseEntity<>(p, HttpStatus.OK);
-    }
+    @GetMapping("/polls/{size}/{pageNum}")
+    public ResponseEntity<Page<Poll>> getPollsPaged(@PathVariable int size, @PathVariable int pageNum) {
 
-    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.PUT)
-    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
-        // Save the entity
-        Poll p = pollRepository.save(poll);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
+        PageRequest pageRequest = new PageRequest(pageNum, size);
+        Page<Poll> page = pollRepository.findAll(pageRequest);
 
-    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.DELETE)
-    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
-        pollRepository.delete(pollId);
-        return new ResponseEntity<>(HttpStatus.OK);
+        return new ResponseEntity<>(page, HttpStatus.OK);
     }
-
-    public void verifypoll() throws ResourceNotFoundException {
-        throw new ResourceNotFoundException();
+        @PostMapping("/polls")
+        @Valid
+        public ResponseEntity<?> createPoll (@RequestBody Poll poll){
+            poll = pollRepository.save(poll);
+            HttpHeaders httpHeaders = new HttpHeaders();
+            httpHeaders.setLocation(ServletUriComponentsBuilder
+                    .fromCurrentRequest()
+                    .path("/{id}")
+                    .buildAndExpand(poll.getId())
+                    .toUri());
+            return new ResponseEntity<>(null, HttpStatus.CREATED);
+        }
+
+        @GetMapping("/polls/{pollId}")
+        public ResponseEntity<?> getPoll (@PathVariable Long pollId){
+            Poll p = pollRepository.findOne(pollId);
+            return new ResponseEntity<>(p, HttpStatus.OK);
+
+        }
+
+        @PutMapping("/polls/{pollId}")
+        @Valid
+        public ResponseEntity<?> updatePoll (@RequestBody Poll poll, @PathVariable Long pollId){
+            Poll p = pollRepository.save(poll);
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
+
+        @DeleteMapping("/polls/{pollId}")
+        public ResponseEntity<?> deletePoll (@PathVariable Long pollId){
+            pollRepository.delete(pollId);
+            return new ResponseEntity<>(HttpStatus.OK);
+        }
     }
-}
 
 

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

@@ -43,6 +43,7 @@ public class Poll {
     @OneToMany(cascade = CascadeType.ALL)
 		 @JoinColumn(name = "POLL_ID")
 		@OrderBy
+       @Size(min=2,max=6)
       private  Set<Option> options;
 
 
@@ -66,7 +67,7 @@ public class Poll {
 
         this.question = question;
     }
-    @Size(min=2, max = 6)
+
     public Set<Option> getOptions() {
         return options;
     }

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java

@@ -23,13 +23,13 @@ Create a `Vote` class in the `domain` sub-package.
 @Entity
 public class Vote {
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.AUTO )
     @Column (name="VOTE_ID")
     private Long id;
 
     @ManyToOne
             @JoinColumn (name="OPTION_ID")
-    Option option;
+    private Option option;
 
 
     public Long getId() {

src/main/java/io/zipcoder/tc_spring_poll_application/domain/repositories/PollRepository.java

@@ -2,9 +2,10 @@ package io.zipcoder.tc_spring_poll_application.domain.repositories;
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface PollRepository extends CrudRepository<Poll, Long> {
+public interface PollRepository extends CrudRepository<Poll, Long>, PagingAndSortingRepository<Poll, Long> {
 
 }

src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ErrorDetail.java

@@ -15,11 +15,25 @@ import java.util.List;
 import java.util.Map;
 
 public class ErrorDetail {
-    String title;
-    int status;
-    String detail;
-    Long timeStamp;
-    String developerMessage;
+   private String title;
+  private  int status;
+  private  String detail;
+  private  Long timeStamp;
+ private   String developerMessage;
+ private Map<String, List<ValidationError>> errors;
+
+    public ErrorDetail() {
+    }
+
+    public ErrorDetail(String title, int status, String detail, Long timestamp, String developerMessage, Map<String, List<ValidationError>> errors) {
+                this.title = title;
+              this.status = status;
+              this.detail = detail;
+             this.timeStamp = timestamp;
+             this.developerMessage = developerMessage;
+               this.errors = errors;
+        }
+
 
     public String getTitle() {
         return title;
@@ -61,7 +75,11 @@ public class ErrorDetail {
         this.developerMessage = developerMessage;
     }
 
-    public Map<String, List<ValidationError>> getErrors() {
-        return null;
+    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/dtos/OptionCount.java

@@ -6,18 +6,22 @@ public class OptionCount {
         private int count;
 
         public Long getOptionId() {
+
             return optionId;
         }
 
         public void setOptionId(Long optionId) {
+
             this.optionId = optionId;
         }
 
         public int getCount() {
+
             return count;
         }
 
         public void setCount(int count) {
+
             this.count = count;
         }
 

src/main/java/io/zipcoder/tc_spring_poll_application/dtos/RestExceptionHandler.java

@@ -1,19 +1,56 @@
 package io.zipcoder.tc_spring_poll_application.dtos;
 
+import io.zipcoder.tc_spring_poll_application.error.ValidationError;
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @ControllerAdvice
 public class RestExceptionHandler {
+    @Autowired
+
+    MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+
+            public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request){
+               ErrorDetail errorDetail = new ErrorDetail();
+
+                  errorDetail.setDetail(rnfe.getCause().toString());
+               errorDetail.setTitle(rnfe.getMessage());
+             errorDetail.setDeveloperMessage(rnfe.getLocalizedMessage());
+             errorDetail.setTimeStamp(new Date().getTime());
+              return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
+           }
+   @ExceptionHandler(MethodArgumentNotValidException.class)
+           public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+             ErrorDetail errorDetail = new ErrorDetail();
+
+                      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);
+          }
+}
 
-    @ExceptionHandler(ResourceNotFoundException .class)
-    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
-        return new ResponseEntity<>(null,  HttpStatus.NOT_FOUND );
-    }
-    }
 

src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java

@@ -18,6 +18,21 @@ public class VoteResult {
     }
 
     public void setResults(Collection<OptionCount> results) {
+
         this.results = results;
     }
+    public OptionCount getOptionCount(OptionCount optionCount){
+               if(results.size() > 0) {
+                      for (OptionCount optionCount1 : results) {
+                          if (optionCount.getOptionId().equals(optionCount1.getOptionId())) {
+                                    return optionCount1;
+                               }
+                        }
+                 }
+             return null;
+          }
+
+           public void addOptionCount(OptionCount optionCount){
+            results.add(optionCount);
+         }
 }

src/main/java/io/zipcoder/tc_spring_poll_application/error/MethodAr1gumentNotValidException.java

@@ -1,4 +1,5 @@
 package io.zipcoder.tc_spring_poll_application.error;
 
 public class MethodAr1gumentNotValidException extends Throwable {
-}
+
+}

src/main/java/io/zipcoder/tc_spring_poll_application/error/RestExceptionHandler.java

@@ -1,4 +1,51 @@
 package io.zipcoder.tc_spring_poll_application.error;
 
-public @interface RestExceptionHandler {
+import io.zipcoder.tc_spring_poll_application.dtos.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+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.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+public class RestExceptionHandler {
+
+    @Autowired
+   private  MessageSource messageSource;
+
+   @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request){
+            ErrorDetail errorDetail = new ErrorDetail();
+              errorDetail.setDetail(rnfe.getCause().toString());
+              errorDetail.setTitle(rnfe.getMessage());
+               errorDetail.setDeveloperMessage(rnfe.getLocalizedMessage());
+               errorDetail.setTimeStamp(new Date().getTime());
+               return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
+          }
+   @ExceptionHandler(MethodArgumentNotValidException.class)
+           public ResponseEntity<?> handleValidationError(  MethodArgumentNotValidException manve, HttpServletRequest request) {
+              ErrorDetail errorDetail = new ErrorDetail();
+              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/error/Validationerrorhandler.java

@@ -16,41 +16,41 @@ import java.util.List;
 
 //@RestExceptionHandler
 public class Validationerrorhandler<RestExceptionHandler> {
-    @Autowired
-
-    private  MessageSource  messageSource ;
-    @ExceptionHandler(MethodAr1gumentNotValidException.class)
-
-
-
-
-    public ResponseEntity<?>
-    handleValidationError(  MethodArgumentNotValidException manve,
-                            HttpServletRequest request){
-
-
-
-        List<FieldError> fieldErrors =  manve .getBindingResult().getFieldErrors();
-        for(FieldError fe : fieldErrors) {
-
-            ErrorDetail  errorDetail=new ErrorDetail() ;
-
-            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);
-        }
-        ResponseEntity responseEntity = new ResponseEntity<>( HttpStatus.BAD_REQUEST);
-        return responseEntity;
-    }
+//    @Autowired
+//
+//    private  MessageSource  messageSource ;
+//    @ExceptionHandler(MethodAr1gumentNotValidException.class)
+//
+//
+//
+//
+//    public ResponseEntity<?>
+//    handleValidationError(  MethodArgumentNotValidException manve,
+//                            HttpServletRequest request){
+//
+//
+//
+//        List<FieldError> fieldErrors =  manve .getBindingResult().getFieldErrors();
+//        for(FieldError fe : fieldErrors) {
+//
+//            ErrorDetail  errorDetail=new ErrorDetail() ;
+//
+//            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);
+//        }
+//        ResponseEntity responseEntity = new ResponseEntity<>( HttpStatus.BAD_REQUEST);
+//        return responseEntity;
+//    }
     }
 
 

src/main/resources/import.sql

@@ -0,0 +1,34 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (1, 'Red', 1);
+
+
+
+insert into poll (poll_id, question) values (2, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (2, 'Red', 2);
+
+
+insert into poll (poll_id, question) values (3, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (3, 'Red', 3);
+
+insert into poll (poll_id, question) values (4, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (4, 'Red', 4);
+
+insert into poll (poll_id, question) values (5, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (5, 'Red', 5);
+
+insert into poll (poll_id, question) values (6, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (6, 'Red', 6);
+
+insert into poll (poll_id, question) values (7, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (7, 'Red', 7);
+
+insert into poll (poll_id, question) values (8, 'What is your favorite color?');
+
+insert into option (option_id, option_value, poll_id) values (8, 'Red', 8);

src/main/resources/message.properties

@@ -1,4 +1,8 @@
 spring.datasource.url=jdbc:h2:mem:testdb;Mode=Oracle
 spring.datasource.platform=h2
 spring.jpa.hibernate.ddl-auto=none
-spring.datasource.continue-on-error=true
+spring.datasource.continue-on-error=true
+
+NotEmpty.poll.question=Question is a required field
+
+Size.poll.options=Options must be greater than {2} and less than {1}