README.md

@@ -358,7 +358,7 @@ public Iterable<Vote> getVote(@PathVariable Long pollId) {
 
 * The final piece remaining for us is the implementation of the ComputeResult resource.
 * Because we don’t have any domain objects that can directly help generate this resource representation, we implement two Data Transfer Objects or DTOs—OptionCount and VoteResult
-* Create a sub package of `java` named `dtos`
+* Create a sub package of `java` named `io.zipcoder.tc_spring_poll_application.dtos`
 
 
 ## Part 4.1 - Create class `OptionCount`

pom.xml

@@ -7,6 +7,7 @@
     <groupId>io.zipcoder</groupId>
     <artifactId>spring-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -16,8 +17,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <start-class>io.zipcoder.tc_spring_poll_application.QuickPollApplication</start-class>
-        <java.version>1.7</java.version>
+        <java.version>1.8</java.version>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -0,0 +1,75 @@
+package io.zipcoder.tc_spring_poll_application;
+
+import io.zipcoder.tc_spring_poll_application.dtos.ValidationError;
+
+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 ErrorDetail(String title, int status, String detail, long timestamp, String developerMessage) {
+        this.title = title;
+        this.status = status;
+        this.detail = detail;
+        this.timestamp = timestamp;
+        this.developerMessage = developerMessage;
+    }
+
+    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/io/zipcoder/tc_spring_poll_application/RestExceptionhandler.java

@@ -0,0 +1,52 @@
+package io.zipcoder.tc_spring_poll_application;
+
+import io.zipcoder.tc_spring_poll_application.dtos.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(request.getMethod(), 404, rnfe.getMessage(), new Date().getTime(), rnfe.getStackTrace().toString());
+        return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimestamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(manve.getMessage());
+        errorDetail.setDetail(manve.getCause().getMessage());
+
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+            List<ValidationError> validationErrorList = errorDetail.getErrors().computeIfAbsent(fe.getField(), k -> new ArrayList<>());
+
+            ValidationError validationError = new ValidationError(null, messageSource.getMessage(fe, null));
+            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/controller/PollController.java

@@ -0,0 +1,70 @@
+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.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 {
+
+    private PollRepository pollRepository;
+
+    @Autowired
+    public PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
+    }
+
+    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+        Iterable<Poll> allPolls = pollRepository.findAll(new PageRequest(0,3));
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls", method=RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@RequestBody @Valid Poll poll) {
+        poll = pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        HttpHeaders header = new HttpHeaders();
+                header.setLocation(newPollUri);
+        return new ResponseEntity<>(null, header, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody @Valid Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        verifyPoll(pollId);
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+     void verifyPoll(Long id){
+        if(!pollRepository.exists(id)) throw new ResourceNotFoundException();
+    }
+}

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

@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+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.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 java.net.URI;
+
+@RestController
+public class VoteController {
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public VoteController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
+    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();
+        URI uri = ServletUriComponentsBuilder.
+                fromCurrentRequest().path("/{id}").buildAndExpand(vote.getId()).toUri();
+        responseHeaders.setLocation(uri);
+        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 Iterable<Vote> getVote(@PathVariable Long pollId) {
+        return voteRepository.findVotesByPoll(pollId);
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue
+    @Column(name="OPTION_ID")
+    private long id;
+
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

@@ -0,0 +1,50 @@
+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
+public class Poll {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    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 Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public Set<Option> getOptions() {
+        return options;
+    }
+
+    public void setOptions(Set<Option> options) {
+        this.options = options;
+    }
+}

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

@@ -0,0 +1,37 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Vote {
+
+@Id
+@GeneratedValue
+@Column(name = "VOTE_ID")
+private Long id;
+
+@ManyToOne
+@JoinColumn(name = "OPTION_ID")
+private Option option;
+
+    public Vote() {
+
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+
+    public void setOption(Option option) {
+        this.option = option;
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+
+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.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import java.net.URI;
+import java.util.Spliterator;
+
+@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);
+        Spliterator split = allVotes.spliterator();
+        voteResult.setTotalVotes((int)split.getExactSizeIfKnown());
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{computeresult}")
+                .buildAndExpand(voteResult)
+                .toUri();
+        HttpHeaders header = new HttpHeaders();
+        header.setLocation(newPollUri);
+        //TODO: Implement algorithm to count votes
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+}

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

@@ -0,0 +1,24 @@
+package io.zipcoder.tc_spring_poll_application.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/io/zipcoder/tc_spring_poll_application/dtos/ValidationError.java

@@ -0,0 +1,28 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+
+public class ValidationError {
+
+    private String code;
+    private String message;
+
+    public ValidationError(String code, String message) {
+        this.code = code;
+        this.message = 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/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java

@@ -0,0 +1,25 @@
+package io.zipcoder.tc_spring_poll_application.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/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(){
+        super();
+    }
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -0,0 +1,10 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+
+public interface OptionRepository extends CrudRepository<Option, Long> {
+
+
+
+}

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

@@ -0,0 +1,8 @@
+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;
+
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {
+}

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

@@ -0,0 +1,13 @@
+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;
+
+public interface VoteRepository extends CrudRepository<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/resources/import.sql

@@ -0,0 +1,24 @@
+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 option (option_id, option_value, poll_id) values (2, 'Blue', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Yellow', 1);
+insert into poll (poll_id, question) values (2, 'What is your favorite food?');
+insert into option (option_id, option_value, poll_id) values (4, 'Pizza', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Carrots', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Candy', 2);
+insert into poll (poll_id, question) values (3, 'What is your favorite animal?');
+insert into option (option_id, option_value, poll_id) values (7, 'Dog', 3);
+insert into option (option_id, option_value, poll_id) values (8, 'Cat', 3);
+insert into option (option_id, option_value, poll_id) values (9, 'Mouse', 3);
+insert into poll (poll_id, question) values (4, 'What is your favorite thing?');
+insert into option (option_id, option_value, poll_id) values (10, 'thing1', 4);
+insert into option (option_id, option_value, poll_id) values (11, 'thing2', 4);
+insert into option (option_id, option_value, poll_id) values (3, 'thing3', 4);
+insert into poll (poll_id, question) values (5, 'What is your favorite Cat?');
+insert into option (option_id, option_value, poll_id) values (12, 'cute', 5);
+insert into option (option_id, option_value, poll_id) values (13, 'fluffy', 5);
+insert into option (option_id, option_value, poll_id) values (14, 'mean', 5);
+insert into poll (poll_id, question) values (6, 'What is your favorite road?');
+insert into option (option_id, option_value, poll_id) values (15, 'this road', 6);
+insert into option (option_id, option_value, poll_id) values (16, 'that road', 6);
+insert into option (option_id, option_value, poll_id) values (17, 'no road', 6);

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}