From aa02be527e67279fca40a1e10d9ed202297736e1 Mon Sep 17 00:00:00 2001
From: Charlotte Beale <charlottebeale@zipcoders-MacBook-Pro-6.local>
Date: Sat, 7 Dec 2019 15:58:41 -0500
Subject: [PATCH 1/5] Started

---
 .../controller/PollController.java            | 23 ++++++++++
 .../domain/Option.java                        | 31 +++++++++++++
 .../domain/Poll.java                          | 44 +++++++++++++++++++
 .../domain/Vote.java                          | 32 ++++++++++++++
 .../repositories/OptionRepository.java        |  8 ++++
 .../repositories/PollRepository.java          |  8 ++++
 .../repositories/VoteRepository.java          |  8 ++++
 7 files changed, 154 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
new file mode 100644
index 0000000..f689f2f
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,23 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.ResponseEntity;
+
+
+@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, org.springframework.http.HttpStatus.OK);
+    }
+}
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..ab0f8ab
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,31 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Option {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_ID")
+    private Long id;
+
+    @Column(name = "OPTION_VALUE")
+    private String value;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
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..f9b688d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,44 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+import java.util.Set;
+
+@Entity
+public class Poll {
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    private Long id;
+
+    @Column(name = "QUESTION")
+    private String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    private Set<Option> 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 java.util.Set<Option> getOptions() {
+        return options;
+    }
+
+    public void setOptions(java.util.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..88b3903
--- /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 io.zipcoder.tc_spring_poll_application.domain.Option getOption() {
+        return option;
+    }
+
+    public void setOption(io.zipcoder.tc_spring_poll_application.domain.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..5a5e31c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,8 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+import org.springframework.data.repository.CrudRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+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..2e32254
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,8 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+import org.springframework.data.repository.CrudRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PollRepository extends CrudRepository<Poll, Long>{
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
new file mode 100644
index 0000000..48782e3
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,8 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+import org.springframework.data.repository.CrudRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+}

From 6a0786ebe64b218eb9cb84420b0159bdb65e51d1 Mon Sep 17 00:00:00 2001
From: Charlotte Beale <charlottebeale@zipcoders-MacBook-Pro-6.local>
Date: Sun, 8 Dec 2019 15:27:15 -0500
Subject: [PATCH 2/5] On part 5

---
 .../java/dtos/ComputeResultController.java    | 31 +++++++++++
 src/main/java/dtos/OptionCount.java           | 23 ++++++++
 src/main/java/dtos/VoteResult.java            | 25 +++++++++
 .../ResourceNotFoundException.java            | 47 ++++++++++++++++
 .../controller/PollController.java            | 55 ++++++++++++++++++-
 .../controller/VoteController.java            | 45 +++++++++++++++
 .../domain/Poll.java                          |  4 +-
 .../repositories/VoteRepository.java          | 10 ++++
 8 files changed, 236 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/dtos/ComputeResultController.java
 create mode 100644 src/main/java/dtos/OptionCount.java
 create mode 100644 src/main/java/dtos/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java

diff --git a/src/main/java/dtos/ComputeResultController.java b/src/main/java/dtos/ComputeResultController.java
new file mode 100644
index 0000000..25eef2a
--- /dev/null
+++ b/src/main/java/dtos/ComputeResultController.java
@@ -0,0 +1,31 @@
+package dtos;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.http.ResponseEntity;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.http.HttpStatus;
+
+
+public class ComputeResultController {
+    private VoteRepository voteRepository;
+
+
+    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/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..258d080
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,23 @@
+package dtos;
+
+public class OptionCount {
+    private Long optionId;
+    private int count;
+
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..b1bba15
--- /dev/null
+++ b/src/main/java/dtos/VoteResult.java
@@ -0,0 +1,25 @@
+package dtos;
+import java.util.Collection;
+
+public class VoteResult {
+
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public int getTotalVotes() {
+        return totalVotes;
+    }
+
+    public void setTotalVotes(int totalVotes) {
+        this.totalVotes = totalVotes;
+    }
+
+    public Collection<OptionCount> getResults() {
+        return results;
+    }
+
+    public void setResults(Collection<OptionCount> results) {
+        this.results = results;
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java
new file mode 100644
index 0000000..1891237
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java
@@ -0,0 +1,47 @@
+package io.zipcoder.tc_spring_poll_application;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.http.HttpStatus;
+
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends RuntimeException {
+    /**
+     * Constructs a new runtime exception with {@code null} as its
+     * detail message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public ResourceNotFoundException() {
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message and
+     * cause.  <p>Note that the detail message associated with
+     * {@code cause} is <i>not</i> automatically incorporated in
+     * this runtime exception's detail message.
+     *
+     * @param message the detail message (which is saved for later retrieval
+     *                by the {@link #getMessage()} method).
+     * @param cause   the cause (which is saved for later retrieval by the
+     *                {@link #getCause()} method).  (A <tt>null</tt> value is
+     *                permitted, and indicates that the cause is nonexistent or
+     *                unknown.)
+     * @since 1.4
+     */
+    public ResourceNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new runtime exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be initialized by a
+     * call to {@link #initCause}.
+     *
+     * @param message the detail message. The detail message is saved for
+     *                later retrieval by the {@link #getMessage()} method.
+     */
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+
+
+}
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 f689f2f..79be36e 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,15 +1,19 @@
 package io.zipcoder.tc_spring_poll_application.controller;
+import io.zipcoder.tc_spring_poll_application.domain.*;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.beans.factory.annotation.Autowired;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
+import java.net.URI;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 
 @RestController
 public class PollController {
    private PollRepository pollRepository;
 
+
    @Autowired
     public PollController(PollRepository pollRepository) {
         this.pollRepository = pollRepository;
@@ -18,6 +22,53 @@ public PollController(PollRepository pollRepository) {
     @RequestMapping(value = "/polls", method = RequestMethod.GET)
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
         Iterable<Poll> allPolls = pollRepository.findAll();
-        return new ResponseEntity<>(allPolls, org.springframework.http.HttpStatus.OK);
+        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 httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(null, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
     }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    public void verifyPoll(){
+
+    }
+
+/* Create a void method in PollController called verifyPoll that checks if a specific
+ poll id exists and throws a ResourceNotFoundException if not. Use this in any method
+  that searches for or updates an existing poll (eg: Get, Put, and Delete methods).
+
+Note: This means that trying to submit a PUT request for a resource that doesn't exist
+will not implicitly create it; it should throw a 404 instead.
+
+*/
+
+
+
+
 }
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..77c77d5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.*;
+import org.springframework.http.ResponseEntity;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.http.HttpStatus;
+
+
+    @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.findById(pollId);
+        }
+
+    }
+
+
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
index f9b688d..74e2082 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
@@ -34,11 +34,11 @@ public void setQuestion(String question) {
         this.question = question;
     }
 
-    public java.util.Set<Option> getOptions() {
+    public Set<Option> getOptions() {
         return options;
     }
 
-    public void setOptions(java.util.Set<Option> options) {
+    public void setOptions(Set<Option> options) {
         this.options = options;
     }
 }
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 48782e3..ee47063 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
@@ -2,7 +2,17 @@
 import org.springframework.data.repository.CrudRepository;
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.Query;
 
 @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);
+
+    Iterable<Vote> findById(Long pollId);
 }
+
+

From 79c215b61bf9a4d737957c64ce7246e820568a2c Mon Sep 17 00:00:00 2001
From: Charlotte Beale <charlottebeale@zipcoders-MacBook-Pro-6.local>
Date: Sun, 8 Dec 2019 16:52:26 -0500
Subject: [PATCH 3/5] Completed up to 5.7

---
 pom.xml                                       | 12 ++++
 .../java/dtos/ComputeResultController.java    | 20 +++++-
 .../controller/PollController.java            | 19 +++---
 .../domain/Poll.java                          |  4 ++
 .../error/ErrorDetail.java                    | 56 +++++++++++++++++
 .../error/ValidationError.java                | 10 +++
 .../ResourceNotFoundException.java            |  2 +-
 .../exception/RestExceptionHandler.java       | 63 +++++++++++++++++++
 8 files changed, 171 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
 rename src/main/java/io/zipcoder/tc_spring_poll_application/{ => exception}/ResourceNotFoundException.java (96%)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java

diff --git a/pom.xml b/pom.xml
index ed84c9b..55f5e1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,18 @@
     <groupId>io.zipcoder</groupId>
     <artifactId>spring-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
diff --git a/src/main/java/dtos/ComputeResultController.java b/src/main/java/dtos/ComputeResultController.java
index 25eef2a..2bb80d4 100644
--- a/src/main/java/dtos/ComputeResultController.java
+++ b/src/main/java/dtos/ComputeResultController.java
@@ -4,13 +4,20 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.http.ResponseEntity;
-import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.domain.*;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import java.util.ArrayList;
 
-
+@RestController
 public class ComputeResultController {
+    @Autowired
     private VoteRepository voteRepository;
 
+    private PollRepository pollRepository;
+
 
     public ComputeResultController(VoteRepository voteRepository) {
         this.voteRepository = voteRepository;
@@ -20,8 +27,15 @@ public ComputeResultController(VoteRepository voteRepository) {
     public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
         VoteResult voteResult = new VoteResult();
         Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+        io.zipcoder.tc_spring_poll_application.domain.Poll poll = pollRepository.findOne(pollId);
+        voteResult.setResults(new java.util.ArrayList<OptionCount>());
+        for (Option o : poll.getOptions()) {
+            OptionCount optionCount = new OptionCount();
+            optionCount.setOptionId(o.getId());
+            optionCount.setCount(Math.toIntExact(((ArrayList<Vote>) allVotes).stream().filter(v -> v.getOption().equals(o)).count()));
+            voteResult.getResults().add(optionCount);
+        }
 
-        //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 79be36e..3f06167 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
@@ -5,8 +5,10 @@
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.http.*;
+import javax.validation.Valid;
 import java.net.URI;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 
 
 @RestController
@@ -26,7 +28,7 @@ public ResponseEntity<Iterable<Poll>> getAllPolls() {
     }
 
     @RequestMapping(value="/polls", method=RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+    public ResponseEntity<?> createPoll(@RequestBody @Valid Poll poll) {
         poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest().path("/{id}")
@@ -43,7 +45,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(@RequestBody @Valid Poll poll, @PathVariable Long pollId) {
         // Save the entity
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -55,18 +57,13 @@ public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    public void verifyPoll(){
-
+    public void verifyPoll(Long pollId){
+        if(!pollRepository.exists(pollId)) {
+            throw new ResourceNotFoundException();
+        }
     }
 
-/* Create a void method in PollController called verifyPoll that checks if a specific
- poll id exists and throws a ResourceNotFoundException if not. Use this in any method
-  that searches for or updates an existing poll (eg: Get, Put, and Delete methods).
-
-Note: This means that trying to submit a PUT request for a resource that doesn't exist
-will not implicitly create it; it should throw a 404 instead.
 
-*/
 
 
 
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 74e2082..10d8d45 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
@@ -2,6 +2,8 @@
 
 import javax.persistence.*;
 import java.util.Set;
+import javax.validation.constraints.*;
+import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
 public class Poll {
@@ -11,11 +13,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/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
new file mode 100644
index 0000000..d0f4a82
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -0,0 +1,56 @@
+package io.zipcoder.tc_spring_poll_application.error;
+import java.util.*;
+import java.net.*;
+
+public class ErrorDetail {
+
+    private String title;
+    private int status;
+    private String detail;
+    private Long timeStamp;
+    private String developerMessage;
+
+    Map<String, List<ValidationError>> errors;
+
+    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 CookieHandler getErrors() {
+        return null;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
new file mode 100644
index 0000000..a3ad32c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
@@ -0,0 +1,10 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+public class ValidationError {
+
+    private String code;
+    private String message;
+
+
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
similarity index 96%
rename from src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java
rename to src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
index 1891237..543b080 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/ResourceNotFoundException.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -1,4 +1,4 @@
-package io.zipcoder.tc_spring_poll_application;
+package io.zipcoder.tc_spring_poll_application.exception;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.http.HttpStatus;
 
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
new file mode 100644
index 0000000..20cad64
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,63 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.http.HttpStatus;
+import io.zipcoder.tc_spring_poll_application.error.ErrorDetail;
+import java.util.*;
+import java.io.*;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.*;
+import io.zipcoder.tc_spring_poll_application.error.ValidationError;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+        ErrorDetail detail = new ErrorDetail();
+        detail.setTimeStamp(new Date().getTime());
+        detail.setDetail(rnfe.getMessage());
+
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        rnfe.printStackTrace(pw);
+        detail.setDeveloperMessage(sw.toString());
+
+        detail.setTitle("Resource Not Found Exception");
+        detail.setStatus(HttpStatus.NOT_FOUND.value());
+        return new ResponseEntity<ErrorDetail>(detail, HttpStatus.NOT_FOUND);}
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?>
+    handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setTitle("Resource Validation Failed");
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setDetail(manve.getMessage());
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        manve.printStackTrace(pw);
+        errorDetail.setDeveloperMessage(sw.toString());
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if(validationErrorList == null) {
+                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<ErrorDetail>(errorDetail, HttpStatus.BAD_REQUEST);
+    }
+
+}

From 0da382199b3c1a6103766f8567bff8eae25a2071 Mon Sep 17 00:00:00 2001
From: Charlotte Beale <charlottebeale@zipcoders-MacBook-Pro-6.local>
Date: Sun, 8 Dec 2019 17:38:30 -0500
Subject: [PATCH 4/5] Completed up to 6

---
 .../dtos/ComputeResultController.java              |  2 +-
 .../dtos/OptionCount.java                          |  2 +-
 .../dtos/VoteResult.java                           |  2 +-
 .../error/ErrorDetail.java                         |  9 +++++++--
 .../error/ValidationError.java                     | 14 ++++++++++++++
 .../exception/RestExceptionHandler.java            | 14 +++++++-------
 src/main/resources/messages.properties             |  2 ++
 7 files changed, 33 insertions(+), 12 deletions(-)
 rename src/main/java/{ => io/zipcoder/tc_spring_poll_application}/dtos/ComputeResultController.java (97%)
 rename src/main/java/{ => io/zipcoder/tc_spring_poll_application}/dtos/OptionCount.java (87%)
 rename src/main/java/{ => io/zipcoder/tc_spring_poll_application}/dtos/VoteResult.java (89%)
 create mode 100644 src/main/resources/messages.properties

diff --git a/src/main/java/dtos/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ComputeResultController.java
similarity index 97%
rename from src/main/java/dtos/ComputeResultController.java
rename to src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ComputeResultController.java
index 2bb80d4..ff98926 100644
--- a/src/main/java/dtos/ComputeResultController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/ComputeResultController.java
@@ -1,4 +1,4 @@
-package dtos;
+package io.zipcoder.tc_spring_poll_application.dtos;
 import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
similarity index 87%
rename from src/main/java/dtos/OptionCount.java
rename to src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
index 258d080..f30c159 100644
--- a/src/main/java/dtos/OptionCount.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/OptionCount.java
@@ -1,4 +1,4 @@
-package dtos;
+package io.zipcoder.tc_spring_poll_application.dtos;
 
 public class OptionCount {
     private Long optionId;
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
similarity index 89%
rename from src/main/java/dtos/VoteResult.java
rename to src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
index b1bba15..37d9a01 100644
--- a/src/main/java/dtos/VoteResult.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/dtos/VoteResult.java
@@ -1,4 +1,4 @@
-package dtos;
+package io.zipcoder.tc_spring_poll_application.dtos;
 import java.util.Collection;
 
 public class VoteResult {
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
index d0f4a82..9c2450f 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -50,7 +50,12 @@ public void setDeveloperMessage(String developerMessage) {
         this.developerMessage = developerMessage;
     }
 
-    public CookieHandler getErrors() {
-        return null;
+
+    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/error/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
index a3ad32c..59fd6af 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
@@ -6,5 +6,19 @@ public class ValidationError {
     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/exception/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
index 20cad64..10a7b4b 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -1,19 +1,19 @@
 package io.zipcoder.tc_spring_poll_application.exception;
-import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.http.HttpStatus;
-import io.zipcoder.tc_spring_poll_application.error.ErrorDetail;
+import org.springframework.http.*;
+import io.zipcoder.tc_spring_poll_application.error.*;
 import java.util.*;
 import java.io.*;
 import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.validation.FieldError;
+import org.springframework.context.MessageSource;
 import org.springframework.validation.*;
-import io.zipcoder.tc_spring_poll_application.error.ValidationError;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @ControllerAdvice
 public class RestExceptionHandler {
+    @Autowired
+    private MessageSource messageSource;
 
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
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 088b1e72dc4b1b3fcf3fba679e7fcdbbac0607f9 Mon Sep 17 00:00:00 2001
From: Charlotte Beale <charlottebeale@zipcoders-MacBook-Pro-6.local>
Date: Sun, 8 Dec 2019 21:59:37 -0500
Subject: [PATCH 5/5] Complete

---
 .../controller/PollController.java            |  6 ++-
 src/main/resources/import.sql                 | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/import.sql

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 3f06167..18b98c7 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
@@ -9,6 +9,8 @@
 import java.net.URI;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 
 @RestController
@@ -22,8 +24,8 @@ public PollController(PollRepository pollRepository) {
     }
 
     @RequestMapping(value = "/polls", method = RequestMethod.GET)
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll();
+    public ResponseEntity<Iterable<Poll>> getAllPolls(Pageable P) {
+        Iterable<Poll> allPolls = pollRepository.findAll((Iterable<Long>) P);
         return new ResponseEntity<>(allPolls, HttpStatus.OK);
     }
 
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..736bc4b
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,40 @@
+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);
+insert into option (option_id, option_value, poll_id) values (2, 'Orange', 2);
+insert into option (option_id, option_value, poll_id) values (3, 'Blue', 3);
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Netflix Original?');
+insert into option (option_id, option_value, poll_id) values (4, 'Orange is the New Black', 4);
+insert into option (option_id, option_value, poll_id) values (5, 'Stranger things', 5);
+insert into option (option_id, option_value, poll_id) values (6, 'The Get Down', 6);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Book?');
+insert into option (option_id, option_value, poll_id) values (7, 'Gifted Hands', 7);
+insert into option (option_id, option_value, poll_id) values (8, 'You Have A Brain', 8);
+insert into option (option_id, option_value, poll_id) values (9, 'A More Perfect Union', 9);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Surgeon?');
+insert into option (option_id, option_value, poll_id) values (10, 'Ben Carson', 10);
+insert into option (option_id, option_value, poll_id) values (11, 'Miranda Bailey', 11);
+insert into option (option_id, option_value, poll_id) values (12, 'Maggie Pierce', 12);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite TV Show?');
+insert into option (option_id, option_value, poll_id) values (13, 'Greys Anatomy', 13);
+insert into option (option_id, option_value, poll_id) values (14, 'The Good Doctor', 14);
+insert into option (option_id, option_value, poll_id) values (15, 'The Resident', 15);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Store?');
+insert into option (option_id, option_value, poll_id) values (16, 'NY&CO', 16);
+insert into option (option_id, option_value, poll_id) values (17, 'KOHLS', 17);
+insert into option (option_id, option_value, poll_id) values (18, 'ROSS', 18);
+
+
+insert into poll (poll_id, question) values (1, 'What is your favorite Author?');
+insert into option (option_id, option_value, poll_id) values (19, 'Ben Carson', 19);
+insert into option (option_id, option_value, poll_id) values (20, 'Donald Trump', 20);
+insert into option (option_id, option_value, poll_id) values (21, 'Ronald Reagan', 21);
+