Merge cefd0a95522f5b2e028102662838add27b68a8ac into f91a622cc731197181dd1b1e4b17c9bcb450ae8a

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/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/VoteResult.java

@@ -0,0 +1,22 @@
+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,46 @@
+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.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 javax.inject.Inject;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class ComputeResultController {
+    @Inject
+    private VoteRepository voteRepository;
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+
+        //TODO: Implement algorithm to count votes
+
+        int counter = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<>(); // create new hashmap that contains the long id and option count that contains long id and count
+        for (Vote v: allVotes) { // for every vote add to the counter
+            counter++;
+            OptionCount optionCount = tempMap.get(v.getOption().getId()); // assign the option count to the id of the vote's option
+            if(optionCount == null){
+                optionCount = new OptionCount(); // if we dont have that option then create it
+                optionCount.setOptionId(v.getOption().getId());
+                tempMap.put(v.getOption().getId(), optionCount);
+            }
+            optionCount.setCount(optionCount.getCount()+1); // then set the count
+        }
+        voteResult.setTotalVotes(counter); // set the total votes to the counter we created
+        voteResult.setResults(tempMap.values()); // get the values of the results
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+}

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

@@ -0,0 +1,71 @@
+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;
+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
+public class PollController {
+    @Inject
+    PollRepository pollRepository;
+
+    @Autowired
+    public PollController() {
+        this.pollRepository = pollRepository;
+    }
+
+    @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(@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()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(httpHeaders, HttpStatus.CREATED);
+    }
+
+    @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);
+    }
+
+    @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
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    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/Controller/VoteController.java

@@ -0,0 +1,40 @@
+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.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.inject.Inject;
+import java.net.URI;
+
+@RestController
+public class VoteController {
+    @Inject
+    private 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();
+        responseHeaders.setLocation(ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(vote.getId())
+                .toUri());
+        return new ResponseEntity<>(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,37 @@
+package io.zipcoder.tc_spring_poll_application.Domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_ID")
+    private long id;
+
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+
+    public Option(){
+        this.id = id;
+        this.value = value;
+    }
+
+    public long getId(){
+        return this.id;
+    }
+    public String getValue(){
+        return this.value;
+    }
+    public void setId(long id1){
+        this.id = id1;
+    }
+    public void setValue(String value1){
+        this.value = value1;
+    }
+}

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

@@ -0,0 +1,52 @@
+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 Poll(){
+        this.id = id;
+        this.question = question;
+        this.options = options;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public Set<Option> getOptions() {
+        return options;
+    }
+    public void setId(long id1){
+        this.id = id1;
+    }
+    public void setQuestion(String question1){
+        this.question = question1;
+    }
+    public void setOptions(Set<Option> options1){
+        this.options = options1;
+    }
+}

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

@@ -0,0 +1,36 @@
+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(){
+        this.id = id;
+        this.option = option;
+    }
+    public long getId() {
+        return id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+    public void setId(long id1){
+        this.id = id1;
+    }
+    public void setOption(Option option1){
+        this.option = option1;
+    }
+
+
+
+}

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;
+    }
+
+
+}

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

@@ -0,0 +1,18 @@
+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 message) {
+        super(message);
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -1,5 +1,6 @@
 package io.zipcoder.tc_spring_poll_application;
 
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

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

@@ -0,0 +1,7 @@
+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 com.sun.xml.internal.bind.v2.model.core.ID;
+import io.zipcoder.tc_spring_poll_application.Domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+
+public interface PollRepository extends CrudRepository<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);
+}