commit

pom.xml

@@ -7,17 +7,28 @@
     <groupId>io.zipcoder</groupId>
     <artifactId>spring-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.3.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <start-class>io.zipcoder.springdemo.QuickPollApplication</start-class>
-        <!--<start-class>io.zipcoder.tc_spring_poll_application.QuickPollApplication</start-class> -->
-        <java.version>1.7</java.version>
+        <start-class>io.zipcoder.tc_spring_poll_application.QuickPollApplication</start-class>
+        <java.version>1.8</java.version>
     </properties>
     <dependencies>
         <dependency>
@@ -34,8 +45,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
 
@@ -44,7 +55,13 @@
             <artifactId>javax.inject</artifactId>
             <version>1</version>
         </dependency>
+        <!-- Jackson JSON Mapper -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.7</version>
+        </dependency>
     </dependencies>
 
 
-</project>
+</project>

src/main/java/dtos/ErrorDetail.java

@@ -0,0 +1,66 @@
+package dtos;
+
+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 ErrorDetail(){
+
+    }
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        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;
+    }
+}

src/main/java/dtos/OptionCount.java

@@ -0,0 +1,22 @@
+package dtos;
+
+public class OptionCount {
+    private Long optionId;
+    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/dtos/RestExceptionHandler.java

@@ -0,0 +1,57 @@
+package dtos;
+
+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 {
+
+    MessageSource messageSource;
+
+    RestExceptionHandler(@Autowired MessageSource messageSource){
+        this.messageSource = messageSource;
+    }
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request){
+        ErrorDetail detail = new ErrorDetail();
+        detail.setTitle(rnfe.getMessage());
+        detail.setStatus(rnfe.hashCode());
+        detail.setDetail(rnfe.getMessage());
+        detail.setDeveloperMessage(rnfe.getLocalizedMessage());
+        detail.setTimeStamp(new Date().getTime());
+        return new ResponseEntity<>(detail, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail detail = new ErrorDetail();
+
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
+
+        for (FieldError f: fieldErrors) {
+
+            List<ValidationError> validationErrorList = detail.getErrors().get(f.getField());
+            if (validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                detail.getErrors().put(f.getField(), validationErrorList);
+            }
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(f.getCode());
+            validationError.setMessage(messageSource.getMessage(f, null));
+            validationErrorList.add(validationError);
+        }
+        return new ResponseEntity<>(detail, HttpStatus.BAD_REQUEST);
+    }
+}

src/main/java/dtos/ValidationError.java

@@ -0,0 +1,23 @@
+package dtos;
+
+public class ValidationError {
+
+    private String code;
+    private 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;
+    }
+}

src/main/java/dtos/VoteResult.java

@@ -0,0 +1,23 @@
+package dtos;
+import java.util.Collection;
+
+public class VoteResult {
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public int getTotalVotes() {
+        return totalVotes;
+    }
+
+    public void setTotalVotes(int totalVotes) {
+        this.totalVotes = totalVotes;
+    }
+
+    public Collection<OptionCount> getResults() {
+        return results;
+    }
+
+    public void setResults(Collection<OptionCount> results) {
+        this.results = results;
+    }
+}

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

@@ -0,0 +1,42 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import dtos.OptionCount;
+import dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+@RestController
+public class ComputeResultController {
+
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public ComputeResultController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+//        Collection<OptionCount> countCollection = new H
+
+        int count = 0;
+        for (Vote v: allVotes) {
+            count++;
+//            countCollection.add(v);
+        }
+        voteResult.setTotalVotes(count);
+//        voteResult.setResults(allVotes);
+
+        //TODO: Implement algorithm to count votes
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+}

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

@@ -0,0 +1,21 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import io.zipcoder.tc_spring_poll_application.repositories.OptionRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class OptionsController {
+
+    @Autowired
+    OptionRepository optionRepository;
+
+    @GetMapping
+    public ResponseEntity<Iterable<Option>> index() {
+        return new ResponseEntity<>(optionRepository.findAll(), HttpStatus.OK);
+    }
+}

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

@@ -1,65 +1,93 @@
-package io.zipcoder.tc_spring_poll_application.controllers;
+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.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;
 
 @RestController
 public class PollController {
 
-    @Autowired
     PollRepository pollRepository;
 
-    PollController(@Autowired PollRepository pollRepository){
+    @Autowired
+    PollController(PollRepository pollRepository){
         this.pollRepository = pollRepository;
     }
 
-    @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(@Valid @RequestBody Poll poll){
 
-    @RequestMapping(value = "/polls", method = RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll){
+        poll = pollRepository.save(poll);
 
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest()
-                .path("{id}")
+                .path("/{id}")
                 .buildAndExpand(poll.getId())
                 .toUri();
 
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setLocation(newPollUri);
 
-        poll = pollRepository.save(poll);
         return new ResponseEntity<>(httpHeaders, HttpStatus.CREATED);
     }
 
-    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
+    @RequestMapping(value ="/polls/{pollId}", method = RequestMethod.GET)
     public ResponseEntity<?> getPoll(@PathVariable Long pollId){
-        Poll p = pollRepository.findOne(pollId);
+
+        verifyPoll(pollId);
+
+        Poll p = pollRepository.findById(pollId).get();
         return new ResponseEntity<>(p, HttpStatus.OK);
     }
 
-    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.PUT)
-    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId){
+    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls(){
+
+        Iterable<Poll> allPolls = pollRepository.findAll();
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
+    @RequestMapping("/polls/{size}/{pageNum}")
+    public ResponseEntity<Page<Poll>> getPollsPaged(@PathVariable int size, @PathVariable int pageNum){
+
+        PageRequest pageRequest = new PageRequest(pageNum, size);
+        Page<Poll> page = pollRepository.findAll(pageRequest);
+
+        return new ResponseEntity<>(page, HttpStatus.OK);
+    }
+
+    @RequestMapping(value ="/polls/{pollId}", method = RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId){
+        verifyPoll(pollId);
+
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @RequestMapping(value = "/polls{pollId}", method = RequestMethod.DELETE)
+    @RequestMapping(value ="/polls/{pollId}", method = RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId){
-        pollRepository.delete(pollId);
+        verifyPoll(pollId);
+
+        pollRepository.deleteById(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    public void verifyPoll(Long pollId){
+        if(!pollRepository.existsById(pollId)){
+            throw new ResourceNotFoundException();
+        }
+    }
+
 
 }

src/main/java/io/zipcoder/tc_spring_poll_application/controllers/VoteController.java → src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java

@@ -1,5 +1,6 @@
-package io.zipcoder.tc_spring_poll_application.controllers;
+package io.zipcoder.tc_spring_poll_application.controller;
 
+import io.zipcoder.tc_spring_poll_application.domain.Option;
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,25 +10,40 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import java.util.Collections;
+import java.util.Optional;
+
 @RestController
 public class VoteController {
 
-    @Autowired
     VoteRepository voteRepository;
 
-    VoteController(@Autowired VoteRepository voteRepository){
+    @Autowired
+    VoteController(VoteRepository voteRepository){
         this.voteRepository = voteRepository;
     }
 
     @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
-    public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote vote){
+    public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote vote) {
         vote = voteRepository.save(vote);
+        // Set the headers for the newly created resource
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.setLocation(ServletUriComponentsBuilder
-            .fromCurrentRequest()
-            .path("{id}")
-            .buildAndExpand(vote.getId())
-            .toUri());
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(vote.getId())
+                .toUri());
         return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
     }
+
+    @RequestMapping(value="/polls/votes", method=RequestMethod.GET)
+    public Iterable<Vote> getAllVotes() {
+        return voteRepository.findAll();
+    }
+
+    @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.GET)
+    public Optional<Vote> getVote(@PathVariable Long pollId){
+        return voteRepository.findById(pollId);
+
+    }
 }

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

@@ -9,6 +9,7 @@ public class Option {
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "OPTION_ID")
     private Long id;
+
     @Column(name = "OPTION_VALUE")
     private String value;
 

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 javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import java.util.List;
 import java.util.Set;
 
 @Entity
@@ -11,13 +14,14 @@ public class Poll {
     @Column(name = "POLL_ID")
     private Long id;
 
+    @NotEmpty
     @Column(name = "QUESTION")
     private String question;
 
+    @Size(min = 2, max = 6)
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
-    @OrderBy
-    private Set<Option> options;
+    private List<Option> options;
 
     public Poll() {
     }
@@ -38,11 +42,11 @@ public class Poll {
         this.question = question;
     }
 
-    public Set<Option> getOptions() {
+    public List<Option> getOptions() {
         return options;
     }
 
-    public void setOptions(Set<Option> options) {
+    public void setOptions(List<Option> options) {
         this.options = options;
     }
 }

src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java

@@ -0,0 +1,20 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+
+    public ResourceNotFoundException(){
+
+    }
+
+    public ResourceNotFoundException(String string){
+        super(string);
+    }
+
+    public ResourceNotFoundException(String string, Throwable throwable){
+        super(string, throwable);
+    }
+}

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java

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

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

@@ -2,8 +2,9 @@ package io.zipcoder.tc_spring_poll_application.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 PagingAndSortingRepository<Poll, Long> {
 }

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java

@@ -1,9 +1,16 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface VoteRepository extends CrudRepository<Vote, Long> {
+public interface VoteRepository extends PagingAndSortingRepository<Vote, Long> {
+    @Query(value = "SELECT v.* " +
+            "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);
 }

src/main/java/resources/import.sql

@@ -0,0 +1,2 @@
+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);

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