Merge e93c539bc9fc7a9d91d2339a0c931656795cfdac into f91a622cc731197181dd1b1e4b17c9bcb450ae8a

pom.xml

@@ -37,6 +37,11 @@
             <artifactId>hsqldb</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>javax.inject</groupId>

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,24 @@
+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/dtos/error/ErrorDetail.java

@@ -0,0 +1,62 @@
+package 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;
+    }
+
+    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/dtos/error/RestExceptionHandler.java

@@ -0,0 +1,65 @@
+package dtos.error;
+
+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()
+    private 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, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(  MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        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());
+        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/dtos/error/ValidationError.java

@@ -0,0 +1,22 @@
+package dtos.error;
+
+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/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java

@@ -0,0 +1,45 @@
+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);
+
+        int totalVotes = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<Long, OptionCount>();
+        for(Vote v : allVotes) {
+            totalVotes ++;
+            // Get the OptionCount corresponding to this Option
+            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/io/zipcoder/tc_spring_poll_application/controller/PollController.java

@@ -0,0 +1,75 @@
+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
+    private 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/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        verifyPoll(pollId);
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @Valid
+    @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();
+        HttpHeaders location = new HttpHeaders();
+        location.setLocation(newPollUri);
+        return new ResponseEntity<>(location, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody 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);
+    }
+
+    public void verifyPoll(Long pollId){
+        if (pollRepository.findOne(pollId) == null){
+            throw new ResourceNotFoundException();
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+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 javax.inject.Inject;
+import javax.validation.Valid;
+
+@RestController
+public class VoteController {
+    @Inject
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public VoteController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @Valid
+    @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<>(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,33 @@
+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;
+
+    @Column(name = "POLL_ID")
+    private Long pollId;
+
+    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,32 @@
+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 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/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/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,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+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/application.properties

@@ -0,0 +1,2 @@
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2-console

src/main/resources/import.sql

@@ -0,0 +1,88 @@
+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, 'Black', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Green', 1);
+
+
+insert into poll (poll_id, question) values (2, 'What is your favorite band?');
+insert into option (option_id, option_value, poll_id) values (4, 'Tool', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Carpenter Brut', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Fleetwood Mac', 2);
+
+
+insert into poll (poll_id, question) values (3, 'What is your favorite tv show?');
+insert into option (option_id, option_value, poll_id) values (7, 'Altered Carbon', 3);
+insert into option (option_id, option_value, poll_id) values (8, 'My Little Pony', 3);
+insert into option (option_id, option_value, poll_id) values (9, 'Game of Thrones', 3);
+
+
+insert into poll (poll_id, question) values (4, 'What is your favorite flower?');
+insert into option (option_id, option_value, poll_id) values (10, 'Lilly', 4);
+insert into option (option_id, option_value, poll_id) values (11, 'Rose', 4);
+insert into option (option_id, option_value, poll_id) values (12, 'Tulip', 4);
+
+
+insert into poll (poll_id, question) values (5, 'What is your favorite type of tree?');
+insert into option (option_id, option_value, poll_id) values (13, 'Oak', 5);
+insert into option (option_id, option_value, poll_id) values (14, 'Birch', 5);
+insert into option (option_id, option_value, poll_id) values (15, 'Willow', 5);
+
+
+insert into poll (poll_id, question) values (6, 'What is your favorite type of alcohol?');
+insert into option (option_id, option_value, poll_id) values (16, 'Whiskey', 6);
+insert into option (option_id, option_value, poll_id) values (17, 'Vodka', 6);
+insert into option (option_id, option_value, poll_id) values (18, 'Gin', 6);
+
+
+insert into poll (poll_id, question) values (7, 'What is your favorite pizza topping?');
+insert into option (option_id, option_value, poll_id) values (19, 'Pineapple', 7);
+insert into option (option_id, option_value, poll_id) values (20, 'Pepperoni', 7);
+insert into option (option_id, option_value, poll_id) values (21, 'Chicken', 7);
+
+
+insert into poll (poll_id, question) values (8, 'What is your favorite cheese?');
+insert into option (option_id, option_value, poll_id) values (22, 'Brie', 8);
+insert into option (option_id, option_value, poll_id) values (23, 'Pepper Jack', 8);
+insert into option (option_id, option_value, poll_id) values (24, 'American', 8);
+
+
+insert into poll (poll_id, question) values (9, 'What is your favorite snimsl?');
+insert into option (option_id, option_value, poll_id) values (25, 'Cat', 9);
+insert into option (option_id, option_value, poll_id) values (26, 'Tiger', 9);
+insert into option (option_id, option_value, poll_id) values (27, 'Pony', 9);
+
+
+insert into poll (poll_id, question) values (10, 'What is your favorite Lovecraft monster?');
+insert into option (option_id, option_value, poll_id) values (28, 'Cthulu', 10);
+insert into option (option_id, option_value, poll_id) values (29, 'Azathoth', 10);
+insert into option (option_id, option_value, poll_id) values (30, 'Dagon', 10);
+
+
+insert into poll (poll_id, question) values (11, 'What is your favorite Roman Emperor?');
+insert into option (option_id, option_value, poll_id) values (31, 'Tiberius', 11);
+insert into option (option_id, option_value, poll_id) values (32, 'Caligula', 11);
+insert into option (option_id, option_value, poll_id) values (33, 'Nero', 11);
+
+
+insert into poll (poll_id, question) values (12, 'What is your favorite Batman villian?');
+insert into option (option_id, option_value, poll_id) values (34, 'Joker', 12);
+insert into option (option_id, option_value, poll_id) values (35, 'Bane', 12);
+insert into option (option_id, option_value, poll_id) values (36, 'Clayface', 12);
+
+
+insert into poll (poll_id, question) values (13, 'What is your favorite American President?');
+insert into option (option_id, option_value, poll_id) values (37, 'Donald Trumo', 13);
+insert into option (option_id, option_value, poll_id) values (38, 'William Taft', 13);
+insert into option (option_id, option_value, poll_id) values (39, 'William Henry Harrison', 13);
+
+
+insert into poll (poll_id, question) values (14, 'What is your favorite phone brand?');
+insert into option (option_id, option_value, poll_id) values (40, 'iPhone', 14);
+insert into option (option_id, option_value, poll_id) values (41, 'Android', 14);
+insert into option (option_id, option_value, poll_id) values (42, 'Windows', 14);
+
+
+insert into poll (poll_id, question) values (15, 'What is your favorite landmark?');
+insert into option (option_id, option_value, poll_id) values (43, 'Pyramids', 15);
+insert into option (option_id, option_value, poll_id) values (44, 'Hanging Gardens', 15);
+insert into option (option_id, option_value, poll_id) values (45, 'Colossus of Rhodes', 15);

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}