From fbc5b77a7fa0824977e772aa6d5bcdcc329a4f31 Mon Sep 17 00:00:00 2001
From: SandyPham823 <sandydupham@gmail.com>
Date: Mon, 9 Dec 2019 10:39:31 -0500
Subject: [PATCH 1/6] made domain sub-folder and option class w/ getters and
 setters

---
 .../domain/Option.java                        | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java

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..5aa5701
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,40 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_ID")
+    private Long id;
+
+    @Column(name = "OPTION_ID")
+    private 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;
+    }
+}

From bea3e28793635845819b3f380d04c573ce75f495 Mon Sep 17 00:00:00 2001
From: SandyPham823 <sandydupham@gmail.com>
Date: Mon, 9 Dec 2019 10:53:44 -0500
Subject: [PATCH 2/6] made Poll class w/ getters and setters

---
 .../domain/Poll.java                          | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java

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..e1589eb
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,51 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+import java.util.Set;
+
+@Entity
+public class Poll {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_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){
+        this.question = question;
+    }
+
+    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;
+    }
+}

From fdf0e6e707bc52a87385cab56323fee4c29c5920 Mon Sep 17 00:00:00 2001
From: SandyPham823 <sandydupham@gmail.com>
Date: Mon, 9 Dec 2019 12:05:35 -0500
Subject: [PATCH 3/6] working on VoteController

---
 .../controller/PollController.java            | 60 +++++++++++++++++++
 .../controller/VoteController.java            | 32 ++++++++++
 .../domain/Option.java                        |  8 +--
 .../domain/Poll.java                          |  8 +--
 .../domain/Vote.java                          | 32 ++++++++++
 .../repositories/OptionRepository.java        |  7 +++
 .../repositories/PollRepository.java          |  7 +++
 .../repositories/VoteRepository.java          |  7 +++
 8 files changed, 147 insertions(+), 14 deletions(-)
 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/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..2315ffc
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,60 @@
+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.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 {
+    private PollRepository pollRepository;
+
+    @Autowired
+    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 httpResult = new HttpHeaders();
+        httpResult.setLocation(newPollUri);
+        return new ResponseEntity<>(httpResult, 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) {
+        // 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);
+    }
+}
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..2bf1f19
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,32 @@
+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);
+    }
+}
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
index 5aa5701..4bc7623 100644
--- 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
@@ -13,15 +13,9 @@ public class Option {
     @Column(name = "OPTION_ID")
     private Long id;
 
-    @Column(name = "OPTION_ID")
+    @Column(name = "OPTION_VALUE")
     private String value;
 
-    public Option(){}
-
-    public Option(String value){
-        this.value = value;
-    }
-
     public Long getId(){
         return id;
     }
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 e1589eb..ab9d1fb 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
@@ -8,7 +8,7 @@ public class Poll {
 
     @Id
     @GeneratedValue
-    @Column(name = "OPTION_ID")
+    @Column(name = "POLL_ID")
     private Long id;
 
     @Column(name = "QUESTION")
@@ -19,12 +19,6 @@ public class Poll {
     @OrderBy
     private Set<Option> options;
 
-    public Poll(){}
-
-    public Poll(String question){
-        this.question = question;
-    }
-
     public Long getId(){
         return id;
     }
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..ee1180d
--- /dev/null
+++ b/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;
+    }
+}
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..b2ca52a
--- /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..bb1b087
--- /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..b435e33
--- /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 485324207b51001445843ca85b9dc09fee6c5fbe Mon Sep 17 00:00:00 2001
From: SandyPham823 <sandydupham@gmail.com>
Date: Wed, 11 Dec 2019 18:52:46 -0500
Subject: [PATCH 4/6] at part 5.2

---
 src/main/java/dtos/OptionCount.java           | 22 +++++++++++++
 src/main/java/dtos/VoteResult.java            | 24 ++++++++++++++
 .../controller/ComputeResultController.java   | 31 +++++++++++++++++++
 .../controller/PollController.java            |  4 +++
 .../controller/VoteController.java            | 10 ++++++
 .../exception/ResourceNotFoundException.java  | 19 ++++++++++++
 .../repositories/VoteRepository.java          |  6 ++++
 7 files changed, 116 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/exception/ResourceNotFoundException.java

diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..71b0c9d
--- /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
index 2315ffc..a872171 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
@@ -57,4 +57,8 @@ public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    public void verifyPoll(Long pollId){
+        if (getAllPolls(pollId))
+    }
 }
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 2bf1f19..83a3406 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
@@ -29,4 +29,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/exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..16c6edd
--- /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);
+    }
+
+}
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 b435e33..2bbce0e 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,13 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 public interface VoteRepository extends CrudRepository<Vote, Long> {
+    @Query(value = "SELECT v.* " +
+            "FROM Option o, Vote v " +
+            "WHERE o.POLL_ID = ?1 " +
+            "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
+    public Iterable<Vote> findVotesByPoll(Long pollId);
 }

From d600cb8bf0cef985e1122e239983746991a59e2a Mon Sep 17 00:00:00 2001
From: SandyPham823 <sandydupham@gmail.com>
Date: Wed, 11 Dec 2019 23:17:57 -0500
Subject: [PATCH 5/6] Got to part 6

---
 README.md                                     |  2 +-
 src/main/java/{dtos => dto}/OptionCount.java  |  2 +-
 src/main/java/{dtos => dto}/VoteResult.java   |  2 +-
 src/main/java/dto/error/ErrorDetail.java      | 62 ++++++++++++++++
 .../java/dto/error/RestExceptionHandler.java  | 73 +++++++++++++++++++
 src/main/java/dto/error/ValidationError.java  | 22 ++++++
 .../controller/ComputeResultController.java   |  2 +-
 .../controller/PollController.java            | 14 +++-
 .../domain/Poll.java                          |  5 ++
 src/main/resources/message.properties         |  0
 src/main/resources/messages.properties        |  2 +
 11 files changed, 180 insertions(+), 6 deletions(-)
 rename src/main/java/{dtos => dto}/OptionCount.java (96%)
 rename src/main/java/{dtos => dto}/VoteResult.java (97%)
 create mode 100644 src/main/java/dto/error/ErrorDetail.java
 create mode 100644 src/main/java/dto/error/RestExceptionHandler.java
 create mode 100644 src/main/java/dto/error/ValidationError.java
 create mode 100644 src/main/resources/message.properties
 create mode 100644 src/main/resources/messages.properties

diff --git a/README.md b/README.md
index 2c6950e..c401106 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 `dto`
 
 
 ## Part 4.1 - Create class `OptionCount`
diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dto/OptionCount.java
similarity index 96%
rename from src/main/java/dtos/OptionCount.java
rename to src/main/java/dto/OptionCount.java
index 71b0c9d..7a5f2d6 100644
--- a/src/main/java/dtos/OptionCount.java
+++ b/src/main/java/dto/OptionCount.java
@@ -1,4 +1,4 @@
-package dtos;
+package dto;
 
 public class OptionCount {
         private Long optionId;
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dto/VoteResult.java
similarity index 97%
rename from src/main/java/dtos/VoteResult.java
rename to src/main/java/dto/VoteResult.java
index b3d873d..0992de7 100644
--- a/src/main/java/dtos/VoteResult.java
+++ b/src/main/java/dto/VoteResult.java
@@ -1,4 +1,4 @@
-package dtos;
+package dto;
 
 import java.util.Collection;
 
diff --git a/src/main/java/dto/error/ErrorDetail.java b/src/main/java/dto/error/ErrorDetail.java
new file mode 100644
index 0000000..adfb1e9
--- /dev/null
+++ b/src/main/java/dto/error/ErrorDetail.java
@@ -0,0 +1,62 @@
+package dto.error;
+
+import java.util.HashMap;
+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 = new HashMap<>();
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
+}
diff --git a/src/main/java/dto/error/RestExceptionHandler.java b/src/main/java/dto/error/RestExceptionHandler.java
new file mode 100644
index 0000000..15216d9
--- /dev/null
+++ b/src/main/java/dto/error/RestExceptionHandler.java
@@ -0,0 +1,73 @@
+package dto.error;
+
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import org.springframework.context.MessageSource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+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 extends ResponseEntityExceptionHandler {
+    @Inject
+    private MessageSource messageSource;
+    private Object HttpStatus;
+
+    @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;
+    }
+}
diff --git a/src/main/java/dto/error/ValidationError.java b/src/main/java/dto/error/ValidationError.java
new file mode 100644
index 0000000..67064f6
--- /dev/null
+++ b/src/main/java/dto/error/ValidationError.java
@@ -0,0 +1,22 @@
+package dto.error;
+
+public class ValidationError {
+    private String code;
+    private String message;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
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..886759b 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 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;
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 a872171..a2fb6a9 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,6 +1,7 @@
 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;
@@ -9,6 +10,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -20,12 +22,14 @@ public PollController(PollRepository pollRepository){
         this.pollRepository = pollRepository;
     }
 
+    @Valid
     @RequestMapping(value="/polls", method= RequestMethod.GET)
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
         Iterable<Poll> allPolls = pollRepository.findAll();
         return new ResponseEntity<>(allPolls, HttpStatus.OK);
     }
 
+    @Valid
     @RequestMapping(value="/polls", method=RequestMethod.POST)
     public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
         poll = pollRepository.save(poll);
@@ -39,12 +43,14 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
         return new ResponseEntity<>(httpResult, HttpStatus.CREATED);
     }
 
+    @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);
     }
 
+    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
         // Save the entity
@@ -52,13 +58,17 @@ public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long p
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @Valid
     @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 (getAllPolls(pollId))
+    public void verifyPoll(Long pollId) throws ResourceNotFoundException {
+        Poll poll = pollRepository.findOne(pollId);
+        if (poll == null){
+            throw new ResourceNotFoundException("Poll with id" + pollId + " not found.");
+        }
     }
 }
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 ab9d1fb..2210b78 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
@@ -12,11 +15,13 @@ public class Poll {
     private Long id;
 
     @Column(name = "QUESTION")
+    @NotEmpty
     private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
+    @Size(min = 2, max = 6)
     private Set<Option> options;
 
     public Long getId(){
diff --git a/src/main/resources/message.properties b/src/main/resources/message.properties
new file mode 100644
index 0000000..e69de29
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 dede49efff4a79e62808703cf75a33bc56ffb0c1 Mon Sep 17 00:00:00 2001
From: SandyPham823 <sandydupham@gmail.com>
Date: Wed, 11 Dec 2019 23:26:03 -0500
Subject: [PATCH 6/6] finishe lab

---
 src/main/resources/import.sql         | 6 ++++++
 src/main/resources/message.properties | 0
 2 files changed, 6 insertions(+)
 create mode 100644 src/main/resources/import.sql
 delete mode 100644 src/main/resources/message.properties

diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..42dfb87
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,6 @@
+insert into poll (poll_id, question) values (2, 'Which drink do you prefer?');
+
+insert into option (option_id, option_value, poll_id) values (4, 'Coffee', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Tea', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Juice', 2);
+
diff --git a/src/main/resources/message.properties b/src/main/resources/message.properties
deleted file mode 100644
index e69de29..0000000