From f8138cc2d244be400bc96b60bcfe2d7d5812d1d1 Mon Sep 17 00:00:00 2001
From: John Tokhi <56596400+tokhij@users.noreply.github.com>
Date: Sat, 14 Dec 2019 23:33:01 -0500
Subject: [PATCH 1/4] part3

---
 .../Controller/PollController.java            | 71 +++++++++++++++++++
 .../Domain/Option.java                        | 39 ++++++++++
 .../Domain/Poll.java                          | 44 ++++++++++++
 .../Domain/Vote.java                          | 31 ++++++++
 .../Repositories/OptionRepository.java        |  7 ++
 .../Repositories/PollRepository.java          |  7 ++
 .../Repositories/VoteRepository.java          |  7 ++
 7 files changed, 206 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Option.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Vote.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/OptionRepository.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/PollRepository.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
new file mode 100644
index 0000000..c33636a
--- /dev/null
+++ b/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.Repositories.PollRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.config.ResourceNotFoundException;
+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 void PollRepository(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(@RequestBody Poll poll) {
+        poll = pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        HttpHeaders httpResult = new HttpHeaders();
+        httpResult.setLocation(newPollUri);
+        return new ResponseEntity<>(null, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    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(@RequestBody @Valid Poll poll, @PathVariable Long 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) {
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public void verifyPoll(Long pollId) throws ResourceNotFoundException {
+        Poll poll = pollRepository.findOne(pollId);
+        if (poll == null){
+            throw new ResourceNotFoundException();
+        }
+    }
+
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Option.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Option.java
new file mode 100644
index 0000000..aafda53
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Option.java
@@ -0,0 +1,39 @@
+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")
+    Long id;
+    @Column(name = "OPTION_VALUE")
+    String value;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+
+
+
+
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java
new file mode 100644
index 0000000..0cff2e8
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java
@@ -0,0 +1,44 @@
+package io.zipcoder.tc_spring_poll_application.Domain;
+import javax.persistence.*;
+import java.util.Set;
+
+
+@Entity
+public class Poll {
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    Long id;
+
+    @Column(name = "QUESTION")
+    String question;
+
+    @OrderBy
+    @JoinColumn(name = "POLL_ID")
+    @OneToMany(cascade = CascadeType.ALL)
+    Set<Option> options;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public Set<Option> getOptions() {
+        return options;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public void setOptions(Set<Option> options) {
+        this.options = options;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Vote.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Vote.java
new file mode 100644
index 0000000..b89e16d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Vote.java
@@ -0,0 +1,31 @@
+package io.zipcoder.tc_spring_poll_application.Domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Vote {
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    Option option;
+
+    public Long getId() {
+        return id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setOption(Option option) {
+        this.option = option;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/OptionRepository.java
new file mode 100644
index 0000000..fafd472
--- /dev/null
+++ b/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> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/PollRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/PollRepository.java
new file mode 100644
index 0000000..104c552
--- /dev/null
+++ b/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.CrudRepository;
+
+public interface PollRepository extends CrudRepository<Poll, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
new file mode 100644
index 0000000..948be82
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.Repositories;
+
+import io.zipcoder.tc_spring_poll_application.Domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+}

From baa362bd08a4f7278b0119575338c6f2ac7ea58b Mon Sep 17 00:00:00 2001
From: John Tokhi <56596400+tokhij@users.noreply.github.com>
Date: Sat, 14 Dec 2019 23:40:08 -0500
Subject: [PATCH 2/4] updated 3

---
 .../Controller/PollController.java            | 29 +++++++++--------
 .../Controller/VoteController.java            | 31 +++++++++++++++++++
 2 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
index c33636a..79e7867 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
@@ -18,17 +18,19 @@ public class PollController {
     private PollRepository pollRepository;
 
     @Autowired
-    public void PollRepository(PollRepository pollRepository){
+    public PollController(PollRepository pollRepository) {
         this.pollRepository = pollRepository;
     }
 
-    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    @Valid
+    @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)
+    @Valid
+    @RequestMapping(value = "/polls", method = RequestMethod.POST)
     public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
         poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
@@ -38,23 +40,26 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
                 .toUri();
         HttpHeaders httpResult = new HttpHeaders();
         httpResult.setLocation(newPollUri);
-        return new ResponseEntity<>(null, HttpStatus.CREATED);
+        return new ResponseEntity<>(httpResult, HttpStatus.CREATED);
     }
 
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    @Valid
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
     public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
         Poll p = pollRepository.findOne(pollId);
-        return new ResponseEntity<> (p, HttpStatus.OK);
+        return new ResponseEntity<>(p, HttpStatus.OK);
     }
 
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
-    public ResponseEntity<?> updatePoll(@RequestBody @Valid Poll poll, @PathVariable Long pollId) {
+    @Valid
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
         // Save the entity
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    @Valid
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -62,10 +67,8 @@ public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
 
     public void verifyPoll(Long pollId) throws ResourceNotFoundException {
         Poll poll = pollRepository.findOne(pollId);
-        if (poll == null){
+        if (poll == null) {
             throw new ResourceNotFoundException();
         }
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
new file mode 100644
index 0000000..0928dc7
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
@@ -0,0 +1,31 @@
+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;
+
+@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();
+        responseHeaders.setLocation(ServletUriComponentsBuilder.
+                fromCurrentRequest().path("/{id}").buildAndExpand(vote.getId()).toUri());
+        return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+    }
+}

From 0419b93d161df772ae5637e94413b95d7c19909c Mon Sep 17 00:00:00 2001
From: John Tokhi <56596400+tokhij@users.noreply.github.com>
Date: Sun, 15 Dec 2019 21:20:01 -0500
Subject: [PATCH 3/4] almost done

---
 pom.xml                                       |  2 +-
 src/main/java/Dtos/Error/ErrorDetail.java     | 63 ++++++++++++++++
 .../java/Dtos/Error/RestExceptionHandler.java | 72 +++++++++++++++++++
 src/main/java/Dtos/Error/ValidationError.java | 23 ++++++
 src/main/java/Dtos/OptionCount.java           | 23 ++++++
 src/main/java/Dtos/VoteResult.java            | 24 +++++++
 .../Controller/ComputeResultController.java   | 33 +++++++++
 .../Controller/PollController.java            |  3 +-
 .../Controller/VoteController.java            | 10 +++
 .../Domain/Poll.java                          |  8 ++-
 .../Exception/ResourceNotFoundException.java  | 19 +++++
 .../Repositories/VoteRepository.java          |  7 ++
 src/main/resources/import.sql                 |  3 +
 src/main/resources/messages.properties        |  2 +
 14 files changed, 288 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/Dtos/Error/ErrorDetail.java
 create mode 100644 src/main/java/Dtos/Error/RestExceptionHandler.java
 create mode 100644 src/main/java/Dtos/Error/ValidationError.java
 create mode 100644 src/main/java/Dtos/OptionCount.java
 create mode 100644 src/main/java/Dtos/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Controller/ComputeResultController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Exception/ResourceNotFoundException.java
 create mode 100644 src/main/resources/import.sql
 create mode 100644 src/main/resources/messages.properties

diff --git a/pom.xml b/pom.xml
index ed84c9b..2395244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,4 +46,4 @@
     </dependencies>
 
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/Dtos/Error/ErrorDetail.java b/src/main/java/Dtos/Error/ErrorDetail.java
new file mode 100644
index 0000000..36f56e4
--- /dev/null
+++ b/src/main/java/Dtos/Error/ErrorDetail.java
@@ -0,0 +1,63 @@
+package Dtos.Error;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+    String title;
+    int status;
+    String detail;
+    long timeStamp;
+    String developerMessage;
+    private Map<String, List<ValidationError>> errors = new HashMap<>();
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
+
+}
diff --git a/src/main/java/Dtos/Error/RestExceptionHandler.java b/src/main/java/Dtos/Error/RestExceptionHandler.java
new file mode 100644
index 0000000..651e539
--- /dev/null
+++ b/src/main/java/Dtos/Error/RestExceptionHandler.java
@@ -0,0 +1,72 @@
+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 org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler extends ResponseEntityExceptionHandler {
+    @Autowired
+    private MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    @ResponseStatus
+    public ResponseEntity<?> handlerResourceNotFoundException(
+            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)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public @ResponseBody
+    ErrorDetail handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Validation Failed");
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setDetail("Input validation failed");
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+
+        String requestPath = (String) request.getAttribute("javax.servlet.error.request_uri");
+
+        if (requestPath == null) {
+            requestPath = request.getRequestURI();
+        }
+
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
+        for (FieldError fe : fieldErrors) {
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if (validationErrorList == null) {
+                validationErrorList = new ArrayList<ValidationError>();
+                errorDetail.getErrors().put(fe.getField(), validationErrorList);
+            }
+            ValidationError validationError = new ValidationError();
+            validationError.setCode(fe.getCode());
+            validationError.setMessage(messageSource.getMessage(fe, null));
+            validationErrorList.add(validationError);
+
+        }
+        return errorDetail;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/Dtos/Error/ValidationError.java b/src/main/java/Dtos/Error/ValidationError.java
new file mode 100644
index 0000000..82ebd5b
--- /dev/null
+++ b/src/main/java/Dtos/Error/ValidationError.java
@@ -0,0 +1,23 @@
+package Dtos.Error;
+
+public class ValidationError {
+    String code;
+    String message;
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+}
diff --git a/src/main/java/Dtos/OptionCount.java b/src/main/java/Dtos/OptionCount.java
new file mode 100644
index 0000000..8fecab5
--- /dev/null
+++ b/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;
+    }
+
+}
diff --git a/src/main/java/Dtos/VoteResult.java b/src/main/java/Dtos/VoteResult.java
new file mode 100644
index 0000000..023ce2d
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/ComputeResultController.java
new file mode 100644
index 0000000..a51e62d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/ComputeResultController.java
@@ -0,0 +1,33 @@
+package io.zipcoder.tc_spring_poll_application.Controller;
+
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.persistence.Entity;
+
+@Entity
+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);
+
+        //TODO: Implement algorithm to count votes
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
index 79e7867..e774b4f 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
@@ -1,9 +1,9 @@
 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.boot.context.config.ResourceNotFoundException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -71,4 +71,5 @@ public void verifyPoll(Long pollId) throws ResourceNotFoundException {
             throw new ResourceNotFoundException();
         }
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
index 0928dc7..1adcc99 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
@@ -28,4 +28,14 @@ public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote
                 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);
+    }
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java
index 0cff2e8..b59c88b 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Domain/Poll.java
@@ -1,8 +1,10 @@
 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
@@ -11,11 +13,13 @@ public class Poll {
     Long id;
 
     @Column(name = "QUESTION")
+    @NotEmpty
     String question;
 
-    @OrderBy
     @JoinColumn(name = "POLL_ID")
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderBy
+    @Size(min=2, max = 6)
     Set<Option> options;
 
     public Long getId() {
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..73c8799
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Exception/ResourceNotFoundException.java
@@ -0,0 +1,19 @@
+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);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
index 948be82..538a254 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
@@ -1,7 +1,14 @@
 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);
+
 }
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..3d5196c
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,3 @@
+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);
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
new file mode 100644
index 0000000..3f51f36
--- /dev/null
+++ b/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}
\ No newline at end of file

From 07c3d4cf7c0b626248508354e0682f47db1a8fd7 Mon Sep 17 00:00:00 2001
From: John Tokhi <56596400+tokhij@users.noreply.github.com>
Date: Sun, 15 Dec 2019 21:27:32 -0500
Subject: [PATCH 4/4] done i guess

---
 src/main/resources/import.sql | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
index 3d5196c..1e9536b 100644
--- a/src/main/resources/import.sql
+++ b/src/main/resources/import.sql
@@ -1,3 +1,6 @@
-insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into poll (poll_id, question) values (2, 'What is your favorite cars?');
 
-insert into option (option_id, option_value, poll_id) values (1, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (4, 'Mustang', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Corvette', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'GTR', 2);
+insert into option (option_id, option_value, poll_id) values (7, 'M6', 2);