Merge d865a9530c8405383431adc6458204af1de26819 into f91a622cc731197181dd1b1e4b17c9bcb450ae8a

src/main/java/dtos/OptionCount.java

@@ -0,0 +1,23 @@
+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,25 @@
+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/QuickPollApplication.java

@@ -2,10 +2,33 @@ package io.zipcoder.tc_spring_poll_application;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
+@ComponentScan
 public class QuickPollApplication {
     public static void main(String[] args) {
         SpringApplication.run(QuickPollApplication.class, args);
     }
-}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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 totalVotes = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<Long, OptionCount>();
+        for(Vote v : allVotes) {
+            totalVotes ++;
+            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.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;
+
+    @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) {
+        poll = pollRepository.save(poll);
+        HttpHeaders httpHeaders = new HttpHeaders();
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        httpHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(httpHeaders, 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 Poll poll, @PathVariable Long pollId) {
+        verifyPoll(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) {
+        verifyPoll(pollId);
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public void verifyPoll(@PathVariable Long pollId){
+       if(!pollRepository.exists(pollId)){
+           throw new ResourceNotFoundException("Poll with id does not exist");
+       }
+    }
+}
+
+//checks if a specific poll id exists and throws a
+//        ResourceNotFoundException if not. Use this in any
+//        method that searches for or updates an existing poll
+//        (eg: Get, Put, and Delete methods).
+
+

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

@@ -0,0 +1,48 @@
+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;
+
+@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);
+        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,36 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Column;
+
+@Entity
+public class Option {
+
+    @Id  //denotes primary key of this entity
+    @GeneratedValue //configures increment of the specified column(field)
+    @Column(name = "OPTION_ID")  //specifies mapped column for a persistent property or field
+    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,58 @@
+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.HashSet;
+import java.util.Set;
+
+@Entity
+public class Poll {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    private long id;
+
+    @Column(name = "QUESTION")
+    @NotEmpty
+    private String questions;
+
+    @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 getQuestions() {
+        return questions;
+    }
+
+    public void setQuestions(String questions) {
+        this.questions = questions;
+    }
+
+    public Set<Option> getOptions() {
+        return options;
+    }
+
+    public void setOptions(Set<Option> options) {
+        this.options = options;
+    }
+}
+
+// In the Poll class:
+// options should be @Size(min=2, max = 6)
+//question should be @NotEmpty
+//To enforce these validations, add @Valid annotations to Poll objects in
+//RequestMapping-annotated controller methods
+// (there should be 2)...only found one check this!!!!!

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/dto/error/ErrorDetail.java

@@ -0,0 +1,85 @@
+package io.zipcoder.tc_spring_poll_application.dto.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;
+
+    /**
+     *
+     * @return a brief title of the error condition, eg: "Validation Failure" or "Internal Server Error"
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     *
+     * @return the HTTP status code for the current request; redundant but useful for client-side error handling
+     */
+    public int getStatus() {
+        return status;
+    }
+
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    /**
+     *
+     * @return A short, human-readable description of the error that may be presented to a user
+     */
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    /**
+     *
+     * @return the time in milliseconds when the error occurred
+     */
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    /**
+     *
+     * @return detailed information such as exception class name or a stack trace useful for developers to debug
+     */
+    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/ValidationError.java

@@ -0,0 +1,29 @@
+package io.zipcoder.tc_spring_poll_application.dto.error;
+
+import java.util.List;
+import java.util.Map;
+
+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/exception/ResourceNotFoundException.java

@@ -0,0 +1,21 @@
+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/exception/RestExceptionHandler.java

@@ -0,0 +1,78 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.dto.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.dto.error.ValidationError;
+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 {
+
+    @Inject
+     private MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(
+            ResourceNotFoundException rnfe,
+            HttpServletRequest request) {
+        ErrorDetail customError = new ErrorDetail();
+        customError.setDetail(rnfe.getMessage());
+        customError.setDeveloperMessage(rnfe.getStackTrace().toString());
+        customError.setStatus(404);
+        customError.setTimeStamp(new Date().getTime());
+        customError.setTitle("Resource Not Found");
+
+        return new ResponseEntity<>(customError, null, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(
+            MethodArgumentNotValidException manve,
+            HttpServletRequest request){
+        ErrorDetail customError = new ErrorDetail();
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = customError.getErrors().get(fe.getField());
+            if(validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                customError.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<>(customError, null, HttpStatus.NOT_FOUND);
+        }
+}
+
+
+//Create RestExceptionHandler class annotated with @ControllerAdvice
+//Create a handler method with the header shown below
+// Populate an ErrorDetail object in the method, and
+//return a ResponseEntity containing the ErrorDetail and an HTTP NOT_FOUND status
+//Use java.util's new Date().getTime() for the timestamp
+//Provide the detail and developer messages from the ResourceNotFoundException
+
+
+//In this handler we need to do the following:
+//
+// Create the ErrorDetail object (similar to before)
+//  Get the list of field validation errors
+// For each field error, add it to the appropriate list in the ErrorDetail (see below)
+// Return a ResponseEntity containing the error detail and the appropriate HTTP status code (400 Bad Request)
+

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

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

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

@@ -0,0 +1,15 @@
+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/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}