From b38687a1f0062d161ea1a0dc420196be89e5233b Mon Sep 17 00:00:00 2001
From: wes <wes.jones1597@gmail.com>
Date: Tue, 10 Dec 2019 08:30:57 -0500
Subject: [PATCH 1/2] pt 5.4 readme

---
 src/main/java/dtos/OptionCount.java           | 22 +++++++
 src/main/java/dtos/VoteResult.java            | 24 +++++++
 .../controller/ComputeResultController.java   | 31 +++++++++
 .../controller/PollController.java            | 63 +++++++++++++++++++
 .../controller/VoteController.java            | 41 ++++++++++++
 .../domain/Option.java                        | 35 +++++++++++
 .../domain/Poll.java                          | 50 +++++++++++++++
 .../domain/Vote.java                          | 36 +++++++++++
 .../dto/error/ErrorDetail.java                | 49 +++++++++++++++
 .../exception/ResourceNotFoundException.java  | 20 ++++++
 .../repositories/OptionRepository.java        | 10 +++
 .../repositories/PollRepository.java          |  9 +++
 .../repositories/VoteRepository.java          | 12 ++++
 13 files changed, 402 insertions(+)
 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/controller/PollController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.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/dto/error/ErrorDetail.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.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/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..5965d67
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..b3d873d
--- /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..9e3f77f
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,31 @@
+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 org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ComputeResultController {
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public ComputeResultController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+
+        //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
new file mode 100644
index 0000000..40b0319
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,63 @@
+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 java.net.URI;
+
+@RestController
+public class PollController {
+    @Autowired
+    PollRepository pollRepository;
+
+
+//    public 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", method = RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+        poll = pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(poll.getId()).toUri();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setLocation(newPollUri);
+        return new ResponseEntity<>(headers, 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 Poll poll, @PathVariable Long pollId) {
+        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) {
+        if (!pollRepository.exists(pollId))
+            throw new ResourceNotFoundException();
+
+    }
+}
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..9f93872
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,41 @@
+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);
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.setLocation(ServletUriComponentsBuilder.fromCurrentRequest().path("/{pollId}").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);
+    }
+    //valid value required to post vote, but it gets vote data from id not value. and id changes depending on springs mood between reloads
+
+
+}
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..e7830b6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,35 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Option {
+    @Column(name = "OPTION_ID")
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    Long id;
+
+    @Column(name = "OPTION_VALUE")
+    String value;
+
+//    public Option() {}
+//    public Option(String value) {
+//        this.value = 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;
+    }
+}
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..3382292
--- /dev/null
+++ b/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 javax.persistence.*;
+import java.util.Set;
+
+@Entity
+public class Poll {
+    @Id
+    @GeneratedValue//(strategy = GenerationType.AUTO)
+    @Column(name = "POLL_ID")
+    private Long id;
+
+    @Column(name = "QUESTION")
+    private String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    private Set<Option> options;
+
+//    public Poll() {}
+//    public Poll(String question, Set options) {
+//        this.question = question;
+//        this.options = 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;
+    }
+}
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..3f9f5ce
--- /dev/null
+++ b/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")
+     Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+     Option option;
+
+//    public Vote() {}
+//    public Vote(Option option) {
+//        this.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;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
new file mode 100644
index 0000000..e34868a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
@@ -0,0 +1,49 @@
+package io.zipcoder.tc_spring_poll_application.dto.error;
+
+public class ErrorDetail {
+    private String title;
+    private int status;
+    private String detail;
+    private long timeStamp;
+    private String developerMessage;
+
+    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;
+    }
+}
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..eac7a4c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,20 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+
+    public ResourceNotFoundException() {
+
+    }
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
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..d27984d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,10 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+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..1ac5b7e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,9 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+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..636979d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,12 @@
+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;
+import org.springframework.stereotype.Repository;
+
+@Repository
+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);
+}

From e274848e0a3233e417ce7c261dd442fbbd197267 Mon Sep 17 00:00:00 2001
From: wes <wes.jones1597@gmail.com>
Date: Thu, 12 Dec 2019 18:15:19 -0500
Subject: [PATCH 2/2] done

---
 README.md                                     |  2 +-
 src/main/java/dtos/VoteResult.java            | 24 ------
 .../controller/ComputeResultController.java   |  5 +-
 .../controller/PollController.java            | 11 ++-
 .../controller/RestExceptionHandler.java      | 69 ++++++++++++++++
 .../domain/Poll.java                          |  5 ++
 .../dto}/OptionCount.java                     |  7 +-
 .../dto/VoteResult.java                       | 51 ++++++++++++
 .../dto/error/ErrorDetail.java                | 25 ++++++
 .../dto/error/ValidationError.java            | 29 +++++++
 .../repositories/OptionRepository.java        |  3 +-
 .../repositories/PollRepository.java          |  3 +-
 .../repositories/VoteRepository.java          |  5 +-
 src/main/resources/import.sql                 | 81 +++++++++++++++++++
 src/main/resources/messages.properties        |  2 +
 15 files changed, 285 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/java/dtos/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/RestExceptionHandler.java
 rename src/main/java/{dtos => io/zipcoder/tc_spring_poll_application/dto}/OptionCount.java (67%)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dto/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ValidationError.java
 create mode 100644 src/main/resources/import.sql
 create mode 100644 src/main/resources/messages.properties

diff --git a/README.md b/README.md
index 2c6950e..21a1c87 100644
--- a/README.md
+++ b/README.md
@@ -358,7 +358,7 @@ public Iterable<Vote> getVote(@PathVariable Long pollId) {
 
 * The final piece remaining for us is the implementation of the ComputeResult resource.
 * Because we don’t have any domain objects that can directly help generate this resource representation, we implement two Data Transfer Objects or DTOs—OptionCount and VoteResult
-* Create a sub package of `java` named `dtos`
+* Create a sub package of `java` named `io.zipcoder.tc_spring_poll_application.dto.error.dtos`
 
 
 ## Part 4.1 - Create class `OptionCount`
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
deleted file mode 100644
index b3d873d..0000000
--- a/src/main/java/dtos/VoteResult.java
+++ /dev/null
@@ -1,24 +0,0 @@
-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
index 9e3f77f..3fc71fe 100644
--- 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
@@ -1,6 +1,6 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
-import dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.dto.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;
@@ -24,8 +24,7 @@ public ComputeResultController(VoteRepository voteRepository) {
     public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
         VoteResult voteResult = new VoteResult();
         Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
-
-        //TODO: Implement algorithm to count votes
+        voteResult.mapVotes(allVotes);
         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 40b0319..fbb7a9c 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
@@ -4,12 +4,15 @@
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 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
@@ -23,13 +26,13 @@ public class PollController {
 //    }
 
     @RequestMapping(value = "/polls", method = RequestMethod.GET)
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll();
+    public ResponseEntity<Page<Poll>> getAllPolls(Pageable p) {
+        Page<Poll> allPolls = pollRepository.findAll(p);
         return new ResponseEntity<>(allPolls, HttpStatus.OK);
     }
 
     @RequestMapping(value = "/polls", method = RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+    public ResponseEntity<?> createPoll(@Valid @RequestBody Poll poll) {
         poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(poll.getId()).toUri();
         HttpHeaders headers = new HttpHeaders();
@@ -44,7 +47,7 @@ public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
     }
 
     @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.PUT)
-    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+    public ResponseEntity<?> updatePoll(@Valid @RequestBody Poll poll, @PathVariable Long pollId) {
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/RestExceptionHandler.java
new file mode 100644
index 0000000..b236b17
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/RestExceptionHandler.java
@@ -0,0 +1,69 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.dto.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.dto.error.ValidationError;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+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 ed = new ErrorDetail(rnfe.getClass().getSimpleName(),404,rnfe.getStackTrace().toString(), (new Date()).getTime(), rnfe.getMessage());
+        return new ResponseEntity<ErrorDetail>(ed, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        manve.printStackTrace(pw);
+
+        ErrorDetail errorDetail = new ErrorDetail(
+                "Resource Validation Failed",
+                HttpStatus.BAD_REQUEST.value(),
+                manve.getMessage(),
+                (new Date()).getTime(),
+                sw.toString());
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+            List<ValidationError> validationErrorList;
+            try{
+                validationErrorList = errorDetail.getErrors().get(fe.getField());
+            } catch (NullPointerException npe) {
+                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<>(fieldErrors, HttpStatus.BAD_REQUEST);
+    }
+
+
+}
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 3382292..21c417b 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,6 +1,9 @@
 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
@@ -10,10 +13,12 @@ public class Poll {
     @Column(name = "POLL_ID")
     private Long id;
 
+    @NotEmpty
     @Column(name = "QUESTION")
     private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
+    @Size(min=2, max=6)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
     private Set<Option> options;
diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/OptionCount.java
similarity index 67%
rename from src/main/java/dtos/OptionCount.java
rename to src/main/java/io/zipcoder/tc_spring_poll_application/dto/OptionCount.java
index 5965d67..c1c3016 100644
--- a/src/main/java/dtos/OptionCount.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/OptionCount.java
@@ -1,9 +1,14 @@
-package dtos;
+package io.zipcoder.tc_spring_poll_application.dto;
 
 public class OptionCount {
     private Long optionId;
     private int count;
 
+    public OptionCount(Long optionId, int count) {
+        this.optionId = optionId;
+        this.count = count;
+    }
+
     public Long getOptionId() {
         return optionId;
     }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dto/VoteResult.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/VoteResult.java
new file mode 100644
index 0000000..9359247
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/VoteResult.java
@@ -0,0 +1,51 @@
+package io.zipcoder.tc_spring_poll_application.dto;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+
+import java.util.*;
+
+public class VoteResult {
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public VoteResult() {
+        this.results = new ArrayList<>();
+        this.totalVotes = 0;
+    }
+
+    public int getTotalVotes() {
+        return totalVotes;
+    }
+
+    public void setTotalVotes(int totalVotes) {
+        this.totalVotes = totalVotes;
+    }
+
+    public void addTotalVotes(int votes) {
+        this.totalVotes += votes;
+    }
+
+    public Collection<OptionCount> getResults() {
+        return results;
+    }
+
+    public void setResults(Collection<OptionCount> results) {
+        this.results = results;
+    }
+
+    public void addResult(OptionCount optionCount){
+        this.results.add(optionCount);
+        this.addTotalVotes(optionCount.getCount());
+    }
+
+    public void mapVotes(Iterable<Vote> votes) {
+        Map<Option, Integer> map = new HashMap<>();
+        for (Vote vote : votes) {
+            if (map.containsKey(vote.getOption())) map.put(vote.getOption(), map.get(vote.getOption()) + 1);
+            else map.put(vote.getOption(), 1);
+        }
+        for (Option option : map.keySet()) this.addResult(new OptionCount(option.getId(), map.get(option)));
+//        return getResults();
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
index e34868a..72dde89 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ErrorDetail.java
@@ -1,5 +1,8 @@
 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;
@@ -7,6 +10,16 @@ public class ErrorDetail {
     private long timeStamp;
     private String developerMessage;
 
+    private Map<String, List<ValidationError>> errors;
+
+    public ErrorDetail(String title, int status, String detail, long timeStamp, String developerMessage) {
+        this.title = title;
+        this.status = status;
+        this.detail = detail;
+        this.timeStamp = timeStamp;
+        this.developerMessage = developerMessage;
+    }
+
     public String getTitle() {
         return title;
     }
@@ -46,4 +59,16 @@ public String getDeveloperMessage() {
     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;
+    }
+
+    public void addError(String field, ValidationError ve) {
+        this.errors.get(field).add(ve);
+    }
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dto/error/ValidationError.java
new file mode 100644
index 0000000..24d0a2a
--- /dev/null
+++ b/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;
+
+public class ValidationError {
+    private String code;
+    private String message;
+
+
+    public ValidationError() {}
+    public ValidationError(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
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
index d27984d..37c4388 100644
--- 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
@@ -2,9 +2,10 @@
 
 import io.zipcoder.tc_spring_poll_application.domain.Option;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface OptionRepository extends CrudRepository<Option, Long> {
+public interface OptionRepository extends PagingAndSortingRepository<Option, Long> {//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
index 1ac5b7e..ca8f4ce 100644
--- 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
@@ -2,8 +2,9 @@
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface PollRepository extends CrudRepository<Poll, Long> {
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {//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
index 636979d..dc6cf39 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
@@ -3,10 +3,11 @@
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface VoteRepository extends CrudRepository<Vote, Long> {
+public interface VoteRepository extends PagingAndSortingRepository<Vote, Long> {//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);
+    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..b01bf22
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,81 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into option (option_id, option_value, poll_id) values (1, 'Yellow', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Blue', 1);
+
+insert into poll (poll_id, question) values (2, 'What is your favorite food?');
+insert into option (option_id, option_value, poll_id) values (4, 'Sushi', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Tacos', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Fries', 2);
+
+insert into poll (poll_id, question) values (3, 'What is your favorite season?');
+insert into option (option_id, option_value, poll_id) values (7, 'Autumn', 3);
+insert into option (option_id, option_value, poll_id) values (8, 'Spring', 3);
+insert into option (option_id, option_value, poll_id) values (9, 'Winter', 3);
+insert into option (option_id, option_value, poll_id) values (10, 'Summer', 3);
+
+insert into poll (poll_id, question) values (4, 'What is your favorite drink?');
+insert into option (option_id, option_value, poll_id) values (11, 'Vodka', 4);
+insert into option (option_id, option_value, poll_id) values (12, 'Rum', 4);
+insert into option (option_id, option_value, poll_id) values (13, 'Brandy', 4);
+
+insert into poll (poll_id, question) values (5, 'What is your favorite tree?');
+insert into option (option_id, option_value, poll_id) values (14, 'Birch', 5);
+insert into option (option_id, option_value, poll_id) values (15, 'Maple', 5);
+insert into option (option_id, option_value, poll_id) values (16, 'Oak', 5);
+
+insert into poll (poll_id, question) values (6, 'What is your favorite movie?');
+insert into option (option_id, option_value, poll_id) values (17, 'Corpse Bride', 6);
+insert into option (option_id, option_value, poll_id) values (18, 'Clerks', 6);
+insert into option (option_id, option_value, poll_id) values (19, 'Fast and Furious', 6);
+
+insert into poll (poll_id, question) values (7, 'What is your favorite car?');
+insert into option (option_id, option_value, poll_id) values (20, 'Tesla', 7);
+insert into option (option_id, option_value, poll_id) values (21, 'Toyota', 7);
+insert into option (option_id, option_value, poll_id) values (22, 'Honda', 7);
+
+insert into poll (poll_id, question) values (8, 'What is your favorite candy?');
+insert into option (option_id, option_value, poll_id) values (23, 'Skittles', 8);
+insert into option (option_id, option_value, poll_id) values (24, 'Sour Patch', 8);
+insert into option (option_id, option_value, poll_id) values (25, 'Chocolate', 8);
+
+insert into poll (poll_id, question) values (9, 'What is your favorite number?');
+insert into option (option_id, option_value, poll_id) values (26, 'One', 9);
+insert into option (option_id, option_value, poll_id) values (27, 'Two', 9);
+insert into option (option_id, option_value, poll_id) values (28, 'Three', 9);
+
+insert into poll (poll_id, question) values (10, 'What is your favorite animal?');
+insert into option (option_id, option_value, poll_id) values (29, 'Dog', 10);
+insert into option (option_id, option_value, poll_id) values (30, 'Cat', 10);
+insert into option (option_id, option_value, poll_id) values (31, 'Bear', 10);
+
+insert into poll (poll_id, question) values (11, 'What is your favorite sport?');
+insert into option (option_id, option_value, poll_id) values (32, 'Cycling', 11);
+insert into option (option_id, option_value, poll_id) values (33, 'Basketball', 11);
+insert into option (option_id, option_value, poll_id) values (34, 'Soccer', 11);
+
+insert into poll (poll_id, question) values (12, 'What is your favorite game?');
+insert into option (option_id, option_value, poll_id) values (35, 'Final Fantasy', 12);
+insert into option (option_id, option_value, poll_id) values (36, 'Call of Duty', 12);
+insert into option (option_id, option_value, poll_id) values (37, 'Skyrim', 12);
+
+insert into poll (poll_id, question) values (13, 'What is your favorite desert?');
+insert into option (option_id, option_value, poll_id) values (38, 'Ice cream', 13);
+insert into option (option_id, option_value, poll_id) values (39, 'Chocolate cake', 13);
+insert into option (option_id, option_value, poll_id) values (40, 'Mochi', 13);
+
+insert into poll (poll_id, question) values (14, 'What is your favorite day of the week?');
+insert into option (option_id, option_value, poll_id) values (41, 'Monday', 14);
+insert into option (option_id, option_value, poll_id) values (42, 'Tuesday', 14);
+insert into option (option_id, option_value, poll_id) values (43, 'Wednesday', 14);
+insert into option (option_id, option_value, poll_id) values (44, 'Thursday', 14);
+insert into option (option_id, option_value, poll_id) values (45, 'Friday', 14);
+insert into option (option_id, option_value, poll_id) values (46, 'Saturday', 14);
+insert into option (option_id, option_value, poll_id) values (47, 'Sunday', 14);
+
+insert into poll (poll_id, question) values (15, 'What is your favorite instructor?');
+insert into option (option_id, option_value, poll_id) values (48, 'Froilan', 15);
+insert into option (option_id, option_value, poll_id) values (49, 'Dolio', 15);
+insert into option (option_id, option_value, poll_id) values (50, 'Chris', 15);
+insert into option (option_id, option_value, poll_id) values (51, 'Roberto', 15);
+insert into option (option_id, option_value, poll_id) values (52, 'Kris', 15);
\ No newline at end of file
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
new file mode 100644
index 0000000..15f3a7e
--- /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 {6}
\ No newline at end of file