From dd28897006349e530e8dacb7bd1af37de0bd9a1a Mon Sep 17 00:00:00 2001
From: NicholasWolak <nick.wolak@hotmail.com>
Date: Mon, 16 Aug 2021 14:49:11 -0400
Subject: [PATCH 1/4] implemented domains and repos

---
 .../domain/Option.java                        | 42 ++++++++++++++
 .../domain/Poll.java                          | 55 +++++++++++++++++++
 .../domain/Vote.java                          | 41 ++++++++++++++
 .../repositories/OptionRepository.java        | 10 ++++
 .../repositories/PollRepository.java          | 11 ++++
 .../repositories/VoteRepository.java          |  9 +++
 6 files changed, 168 insertions(+)
 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/domain/Option.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
new file mode 100644
index 0000000..0fa978f
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,42 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+
+import javax.persistence.*;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "OPTION_ID")
+    private Long id;
+
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+    public Option() {
+    }
+
+    public Option(Long id, String value) {
+        this.id = id;
+        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..11d675e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,55 @@
+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(Long id, String question, Set<Option> options) {
+        this.id = id;
+        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..1356220
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,41 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+
+import javax.persistence.*;
+
+@Entity
+public class Vote {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "VOTE_ID")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    private Option option;
+
+    public Vote() {
+    }
+
+    public Vote(Long id, Option option) {
+        this.id = id;
+        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/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
new file mode 100644
index 0000000..a8399ab
--- /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..d648d16
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,11 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+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..8a84b5a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,9 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+}

From ab096add2b1692ca280fea8584f943190daa6337 Mon Sep 17 00:00:00 2001
From: NicholasWolak <nick.wolak@hotmail.com>
Date: Mon, 16 Aug 2021 15:26:48 -0400
Subject: [PATCH 2/4] on to DTO implementation

---
 pom.xml                                       | 23 ++++++
 src/main/application.properties.properties    |  4 +
 .../controller/PollController.java            | 76 +++++++++++++++++++
 .../controller/VoteController.java            | 48 ++++++++++++
 .../repositories/VoteRepository.java          |  6 ++
 5 files changed, 157 insertions(+)
 create mode 100644 src/main/application.properties.properties
 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

diff --git a/pom.xml b/pom.xml
index ed84c9b..bd9c78b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,29 @@
             <artifactId>javax.inject</artifactId>
             <version>1</version>
         </dependency>
+
+
+
+
+
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>5.1.3.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
 
diff --git a/src/main/application.properties.properties b/src/main/application.properties.properties
new file mode 100644
index 0000000..85dd4b9
--- /dev/null
+++ b/src/main/application.properties.properties
@@ -0,0 +1,4 @@
+server.port=8080
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.h2.console.enabled=true
+spring.h2.console.view=/h2-console
\ No newline at end of file
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..35a1bf3
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,76 @@
+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.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 {
+
+//    public void setLocation () {
+//        URI newPollUri = ServletUriComponentsBuilder
+//                .fromCurrentRequest()
+//                .path("/{id}")
+//                .buildAndExpand(poll.getId())
+//                .toUri();
+//    }
+
+    @Autowired
+    private PollRepository pollRepository;
+
+    public PollController() {
+    }
+
+    @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();
+        return new ResponseEntity<>(newPollUri, 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..775ef0b
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,48 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+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);
+    }
+
+    @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/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
index 8a84b5a..d4730e5 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,9 +1,15 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 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 1ec0492b8e3a5318e9ea8be9520d5b730445bb43 Mon Sep 17 00:00:00 2001
From: NicholasWolak <nick.wolak@hotmail.com>
Date: Mon, 16 Aug 2021 16:14:09 -0400
Subject: [PATCH 3/4] completed lab, researching pagination

---
 README.md                                     |  2 +-
 .../controller/ComputeResultController.java   | 34 +++++++++
 .../controller/PollController.java            | 18 +++++
 .../domain/Poll.java                          |  5 ++
 .../dtos/OptionCount.java                     | 31 ++++++++
 .../dtos/VoteResult.java                      | 34 +++++++++
 .../dtos/error/ErrorDetail.java               | 75 +++++++++++++++++++
 .../dtos/error/RestExceptionHandler.java      | 56 ++++++++++++++
 .../dtos/error/ValidationError.java           | 32 ++++++++
 .../exception/ResourceNotFoundException.java  | 19 +++++
 .../application.properties.properties         |  0
 src/main/resources/import.sql                 |  4 +
 src/main/resources/message.properties         |  2 +
 13 files changed, 311 insertions(+), 1 deletion(-)
 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/dtos/OptionCount.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/RestExceptionHandler.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
 rename src/main/{ => resources}/application.properties.properties (100%)
 create mode 100644 src/main/resources/import.sql
 create mode 100644 src/main/resources/message.properties

diff --git a/README.md b/README.md
index 2c6950e..f8269af 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.dtos`
 
 
 ## Part 4.1 - Create class `OptionCount`
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..241f529
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,34 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+
+import io.zipcoder.tc_spring_poll_application.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 35a1bf3..29d79d1 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.HttpStatus;
@@ -8,6 +9,9 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.annotation.Resource;
+import javax.validation.OverridesAttribute;
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -32,12 +36,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) {
@@ -50,27 +56,39 @@ public ResponseEntity<?> createPoll(
         return new ResponseEntity<>(newPollUri, HttpStatus.CREATED);
     }
 
+    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
     public ResponseEntity<?> getPoll(
             @PathVariable Long pollId) {
+        verifyPoll(pollId);
+
         Poll p = pollRepository.findOne(pollId);
         return new ResponseEntity<> (p, HttpStatus.OK);
     }
 
+    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(
             @RequestBody Poll poll,
             @PathVariable Long pollId) {
+        verifyPoll(pollId);
+
         // Save the entity
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(
             @PathVariable Long pollId) {
+        verifyPoll(pollId);
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
+    public void verifyPoll(Long pollId) {
+        if(pollRepository.findOne(pollId) == null)
+            throw new ResourceNotFoundException("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 11d675e..55f2a93 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,7 +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
@@ -13,11 +16,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 Poll() {
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
new file mode 100644
index 0000000..7bc570c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
@@ -0,0 +1,31 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+
+public class OptionCount {
+    private Long optionId;
+    private int count;
+
+
+    public OptionCount() {
+    }
+
+    public OptionCount(Long optionId, int count) {
+        this.optionId = optionId;
+        this.count = 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/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
new file mode 100644
index 0000000..de74597
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
@@ -0,0 +1,34 @@
+package io.zipcoder.tc_spring_poll_application.dtos;
+
+import java.util.Collection;
+
+public class VoteResult {
+
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+
+    public VoteResult() {
+    }
+
+    public VoteResult(int totalVotes, Collection<OptionCount> results) {
+        this.totalVotes = totalVotes;
+        this.results = 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/dtos/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java
new file mode 100644
index 0000000..f12520d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ErrorDetail.java
@@ -0,0 +1,75 @@
+package io.zipcoder.tc_spring_poll_application.dtos.error;
+
+
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+
+    private String title; // brief error condition - "Validation Failure" or "Internal Server Error"
+    private int status;  // HTTP status code
+    private String detail; // human-readable desc. of error
+    private long timeStamp; // in milliseconds when it happened
+    private String developerMessage; // deatiled info for a dev to understand
+
+    private Map<String, List<ValidationError>> errors;
+
+    public ErrorDetail() {
+    }
+
+    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;
+    }
+
+    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/io/zipcoder/tc_spring_poll_application/dtos/error/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/RestExceptionHandler.java
new file mode 100644
index 0000000..5ad30ce
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/RestExceptionHandler.java
@@ -0,0 +1,56 @@
+package io.zipcoder.tc_spring_poll_application.dtos.error;
+
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    @Autowired
+    private MessageSource messageSource;
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe,
+                                                             HttpServletRequest request) {
+        ErrorDetail error = new ErrorDetail(
+                "NOT_FOUND",
+                404,
+                rnfe.getMessage(),
+                new Date().getTime(),
+                rnfe.getLocalizedMessage());
+        return new ResponseEntity<>(error, HttpStatus.NOT_FOUND);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve,
+                                                   HttpServletRequest request) {
+        ErrorDetail error = new ErrorDetail();
+        List<FieldError> fieldErrors = manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+            List<ValidationError> validationErrorList = error.getErrors()
+                    .get(fe.getField());
+            if(validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                error.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<>(error, HttpStatus.BAD_REQUEST);
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java
new file mode 100644
index 0000000..d2be269
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/error/ValidationError.java
@@ -0,0 +1,32 @@
+package io.zipcoder.tc_spring_poll_application.dtos.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/exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..d7ddb5c
--- /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/application.properties.properties b/src/main/resources/application.properties.properties
similarity index 100%
rename from src/main/application.properties.properties
rename to src/main/resources/application.properties.properties
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..cf709a1
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,4 @@
+ 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/message.properties b/src/main/resources/message.properties
new file mode 100644
index 0000000..3f51f36
--- /dev/null
+++ b/src/main/resources/message.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 91d36ab479f1568f7de3d89a06e1ed1fc82c5a1c Mon Sep 17 00:00:00 2001
From: NicholasWolak <nick.wolak@hotmail.com>
Date: Tue, 17 Aug 2021 13:46:02 -0400
Subject: [PATCH 4/4] (feat:popeyes)

---
 .../controller/ComputeResultController.java   | 24 +++++++++++++++----
 .../controller/PollController.java            | 17 +++++++------
 2 files changed, 28 insertions(+), 13 deletions(-)

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 241f529..dd09f5c 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,7 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
 
+import io.zipcoder.tc_spring_poll_application.dtos.OptionCount;
 import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
@@ -12,6 +13,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 public class ComputeResultController {
 
@@ -23,12 +27,24 @@ public ComputeResultController(VoteRepository voteRepository) {
     }
 
     @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
-    public ResponseEntity<?> computeResult(
-            @RequestParam Long pollId) {
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
         VoteResult voteResult = new VoteResult();
         Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
-
-        //TODO: Implement algorithm to count votes
+        OptionCount optionCount;
+        Integer allVotesCount = 0;
+        Map<Long, OptionCount> voteCounts = new HashMap<>();
+        for (Vote element : allVotes) {
+            allVotesCount++;
+            optionCount = voteCounts.get(element.getOption().getId());
+            if (optionCount == null) {
+                optionCount = new OptionCount();
+                optionCount.setOptionId(element.getOption().getId());
+                voteCounts.put(element.getOption().getId(), optionCount);
+            }
+            optionCount.setCount(optionCount.getCount() + 1);
+        }
+        voteResult.setTotalVotes(allVotesCount);
+        voteResult.setResults(voteCounts.values());
         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 29d79d1..f4a9c66 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,6 +4,7 @@
 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.*;
@@ -25,7 +26,7 @@ public class PollController {
 //                .toUri();
 //    }
 
-    @Autowired
+
     private PollRepository pollRepository;
 
     public PollController() {
@@ -36,27 +37,27 @@ 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) {
+            @RequestBody @Valid Poll poll) {
         poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest()
                 .path("/{id}")
                 .buildAndExpand(poll.getId())
                 .toUri();
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(newPollUri);
         return new ResponseEntity<>(newPollUri, HttpStatus.CREATED);
     }
 
-    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
     public ResponseEntity<?> getPoll(
             @PathVariable Long pollId) {
@@ -66,10 +67,9 @@ public ResponseEntity<?> getPoll(
         return new ResponseEntity<> (p, HttpStatus.OK);
     }
 
-    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(
-            @RequestBody Poll poll,
+            @RequestBody @Valid Poll poll,
             @PathVariable Long pollId) {
         verifyPoll(pollId);
 
@@ -77,8 +77,7 @@ public ResponseEntity<?> updatePoll(
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
     }
-
-    @Valid
+    
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(
             @PathVariable Long pollId) {