From 7fe492a47dd4572530781c5d1e31b7217313257a Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Wed, 4 Apr 2018 16:29:48 -0400
Subject: [PATCH 01/12] add option class

---
 .../domain/Option.java                        | 33 +++++++++++++++++++
 1 file changed, 33 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..9e700c6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,33 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class Option {
+    @Id
+    @GeneratedValue
+    @Column(name = "OPTION_ID")
+    Long id;
+
+    @Column(name = "OPTION_VALUE")
+    String value;
+
+    public 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 b9aedd5c9f1c47d04d3a604327548d89128a3a5a Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Wed, 4 Apr 2018 17:26:06 -0400
Subject: [PATCH 02/12] add poll class

---
 .../domain/Poll.java                          | 44 +++++++++++++++++++
 .../domain/Vote.java                          |  4 ++
 2 files changed, 48 insertions(+)
 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

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..cf0959b
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,44 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+import java.util.Set;
+
+@Entity
+public class Poll {
+    @Id
+    @GeneratedValue
+    @Column(name = "POLL_ID")
+    Long id;
+
+    @Column(name = "QUESTION")
+    String question;
+
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "POLL_ID")
+    @OrderBy
+    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 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..2fd21fc
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,4 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+public class Vote {
+}

From 8f1ba5067b2f11670cdde8e9f2954f8fef1186fb Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Wed, 4 Apr 2018 17:27:54 -0400
Subject: [PATCH 03/12] add vote class

---
 .../domain/Vote.java                          | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

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
index 2fd21fc..5c7f3ff 100644
--- 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
@@ -1,4 +1,31 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
+import javax.persistence.*;
+
+@Entity
 public class Vote {
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    Long id;
+
+    @ManyToMany
+    @JoinColumn(name = "OPTION_ID")
+    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;
+    }
 }

From bcea00383b04e29242f05ba45aac735b58f7989b Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Wed, 4 Apr 2018 17:32:14 -0400
Subject: [PATCH 04/12] add optionrepo interface

---
 .../repositories/OptionRepository.java                        | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java

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..ba6b63e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,4 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+public interface OptionRepository {
+}

From ae6060b3b56782eb742b395ffa2be3546220ffae Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Wed, 4 Apr 2018 17:33:14 -0400
Subject: [PATCH 05/12] add pollrepo interface

---
 .../repositories/PollRepository.java                          | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java

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..51819d3
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,4 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+public interface PollRepository {
+}

From 5894f260c81c97259c039be25f016e97e07adf2c Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Wed, 4 Apr 2018 17:33:52 -0400
Subject: [PATCH 06/12] add voterepo interface

---
 .../repositories/OptionRepository.java                     | 6 +++++-
 .../repositories/PollRepository.java                       | 5 ++++-
 .../repositories/VoteRepository.java                       | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 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/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
index ba6b63e..7af40e0 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -1,4 +1,8 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
-public interface OptionRepository {
+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
index 51819d3..88bff0a 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -1,4 +1,7 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
-public interface PollRepository {
+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..f26234d
--- /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 76abffa831f7fa664111759644fc9549dbcc4d21 Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Thu, 5 Apr 2018 15:57:32 -0400
Subject: [PATCH 07/12] build process working, adding rest methods to
 controller

---
 .../controller/PollController.java            | 32 +++++++++++++++++++
 .../domain/Option.java                        | 12 +++++--
 .../domain/Poll.java                          | 19 ++++++++---
 .../domain/Vote.java                          | 14 +++++---
 4 files changed, 66 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.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..1510242
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,32 @@
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.inject.Inject;
+
+@RestController
+public class PollController {
+
+    @Inject
+    private 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);
+        return new ResponseEntity<>(null, 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 9e700c6..775c2da 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
@@ -7,13 +7,14 @@
 
 @Entity
 public class Option {
+
     @Id
     @GeneratedValue
     @Column(name = "OPTION_ID")
-    Long id;
+    private Long id;
 
     @Column(name = "OPTION_VALUE")
-    String value;
+    private String value;
 
     public Long getId() {
         return id;
@@ -30,4 +31,9 @@ public String getValue() {
     public void setValue(String value) {
         this.value = value;
     }
-}
+
+    @Override
+    public String toString() {
+        return getId() + "," + getValue();
+    }
+}
\ No newline at end of file
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 cf0959b..dcfa914 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,22 +1,28 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.util.Set;
 
 @Entity
 public class Poll {
+
     @Id
     @GeneratedValue
     @Column(name = "POLL_ID")
-    Long id;
+    private Long id;
 
     @Column(name = "QUESTION")
-    String question;
+    @NotEmpty
+    private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
-    Set<Option> options;
+    @Size(min=2, max = 6)
+    private Set<Option> options;
 
     public Long getId() {
         return id;
@@ -41,4 +47,9 @@ public Set<Option> getOptions() {
     public void setOptions(Set<Option> options) {
         this.options = options;
     }
-}
+
+    @Override
+    public String toString() {
+        return getId() + ", " + getQuestion() + ", " + getOptions();
+    }
+}
\ No newline at end of file
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
index 5c7f3ff..dbae10c 100644
--- 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
@@ -4,14 +4,15 @@
 
 @Entity
 public class Vote {
+
     @Id
     @GeneratedValue
     @Column(name = "VOTE_ID")
-    Long id;
+    private Long id;
 
-    @ManyToMany
+    @ManyToOne
     @JoinColumn(name = "OPTION_ID")
-    Option option;
+    private Option option;
 
     public Long getId() {
         return id;
@@ -28,4 +29,9 @@ public Option getOption() {
     public void setOption(Option option) {
         this.option = option;
     }
-}
+
+    @Override
+    public String toString() {
+        return getId() + ", " + getOption();
+    }
+}
\ No newline at end of file

From 17fb1dbc2d855050d8f78bf90b62107cf4021418 Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Thu, 5 Apr 2018 16:45:45 -0400
Subject: [PATCH 08/12] adding starter methods

---
 .../controller/PollController.java            | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

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 1510242..d4a1b2b 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
@@ -2,14 +2,14 @@
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 import javax.inject.Inject;
+import java.net.URI;
 
 @RestController
 public class PollController {
@@ -25,8 +25,34 @@ public ResponseEntity<Iterable<Poll>> getAllPolls() {
 
     @RequestMapping(value="/polls", method=RequestMethod.POST)
     public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.setLocation(newPollUri);
         poll = pollRepository.save(poll);
-        return new ResponseEntity<>(null, HttpStatus.CREATED);
+        return new ResponseEntity<>(null, responseHeaders, 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);
     }
 
 }

From 58ebc2e5703ec0aaacb11dce715e788be259d7c2 Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Fri, 6 Apr 2018 08:56:27 -0400
Subject: [PATCH 09/12] add findbyid integration

---
 .../controller/PollController.java            |  2 +-
 .../controller/VoteController.java            | 39 +++++++++++++++++++
 .../repositories/VoteRepository.java          |  8 +++-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
index d4a1b2b..e45c6ab 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
@@ -33,7 +33,7 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.setLocation(newPollUri);
         poll = pollRepository.save(poll);
-        return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+        return new ResponseEntity<>(responseHeaders, HttpStatus.CREATED);
     }
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
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..ff4647a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,39 @@
+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.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import javax.inject.Inject;
+
+@RestController
+public class VoteController {
+    @Inject
+    private 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/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
index f26234d..204e1dd 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>{
+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> findById(Long pollId);
 }

From b25f24a12c7b0813a5c1511456157bead309185b Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Fri, 6 Apr 2018 09:57:51 -0400
Subject: [PATCH 10/12] add optioncount and voteresult classes to dtos

---
 src/main/java/dtos/OptionCount.java | 22 ++++++++++++++++++++++
 src/main/java/dtos/VoteResult.java  | 23 +++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 src/main/java/dtos/OptionCount.java
 create mode 100644 src/main/java/dtos/VoteResult.java

diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..5965d67
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,22 @@
+package dtos;
+
+public class OptionCount {
+    private Long optionId;
+    private int count;
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..bd3cd39
--- /dev/null
+++ b/src/main/java/dtos/VoteResult.java
@@ -0,0 +1,23 @@
+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;
+    }
+}
\ No newline at end of file

From 660ec53e72f39e8f7788580932288472bb72508c Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Fri, 6 Apr 2018 19:10:50 -0400
Subject: [PATCH 11/12] add error handling, vote counting

---
 .../controller/ComputeResultController.java   | 44 ++++++++++++++++
 .../controller/PollController.java            | 19 ++++++-
 .../exception/ErrorDetail.java                | 50 +++++++++++++++++++
 .../exception/ResourceNotFoundException.java  | 18 +++++++
 .../exception/RestExceptionHandler.java       | 24 +++++++++
 5 files changed, 153 insertions(+), 2 deletions(-)
 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/ErrorDetail.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java

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..ec199c7
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,44 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import dtos.OptionCount;
+import dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+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;
+
+import javax.inject.Inject;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class ComputeResultController {
+    @Inject
+    private VoteRepository voteRepository;
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findById(pollId);
+        int totalVotes = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<>();
+        for(Vote v : allVotes) {
+            totalVotes ++;
+            OptionCount optionCount = tempMap.get(v.getOption().getId());
+            if(optionCount == null) {
+                optionCount = new OptionCount();
+                optionCount.setOptionId(v.getOption().getId());
+                tempMap.put(v.getOption().getId(), optionCount);
+            }
+            optionCount.setCount(optionCount.getCount() + 1);
+        }
+        voteResult.setTotalVotes(totalVotes);
+        voteResult.setResults(tempMap.values());
+        return new ResponseEntity<>(voteResult, HttpStatus.OK);
+    }
+}
\ 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
index e45c6ab..bb98ee8 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,8 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
+import io.zipcoder.tc_spring_poll_application.domain.Option;
 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.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -32,27 +34,40 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
                 .toUri();
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.setLocation(newPollUri);
+        for (Option option:poll.getOptions()) {
+            System.out.println(option.toString());
+        }
         poll = pollRepository.save(poll);
-        return new ResponseEntity<>(responseHeaders, HttpStatus.CREATED);
+        return new ResponseEntity<>(poll, responseHeaders, HttpStatus.CREATED);
     }
 
     @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);
     }
 
     @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);
+        return new ResponseEntity<>(p, HttpStatus.OK);
     }
 
     @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){
+        Poll poll = pollRepository.findOne(pollid);
+        if (poll == null){
+            throw new ResourceNotFoundException("Unable to verify poll");
+        }
+    }
+
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java
new file mode 100644
index 0000000..84d1991
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java
@@ -0,0 +1,50 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+public class ErrorDetail {
+    private String title;
+    private int status;
+    private String detail;
+    private long timeStamp;
+    private String developerMessage;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..3969aa7
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,18 @@
+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/exception/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
new file mode 100644
index 0000000..ffd29f5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,24 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setDetail(rnfe.getMessage());
+        errorDetail.setDeveloperMessage(rnfe.getLocalizedMessage());
+        errorDetail.setTitle(rnfe.getClass().toString());
+        errorDetail.setTimeStamp(new Date().getTime());
+        return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
+    }
+
+}

From 63b0ddee50fae4d0df1b498d74fb3c425a1d4867 Mon Sep 17 00:00:00 2001
From: Patrick Glavin <patjglavin@gmail.com>
Date: Sun, 8 Apr 2018 14:31:53 -0400
Subject: [PATCH 12/12] finalize error messaging

---
 .../exception/ErrorDetail.java                | 12 +++++++
 .../exception/RestExceptionHandler.java       | 31 ++++++++++++++++++-
 .../exception/ValidationError.java            | 22 +++++++++++++
 src/main/resources/messages.properties        |  2 ++
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/ValidationError.java
 create mode 100644 src/main/resources/messages.properties

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java
index 84d1991..2e0da7e 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ErrorDetail.java
@@ -1,11 +1,23 @@
 package io.zipcoder.tc_spring_poll_application.exception;
 
+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;
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
 
     public String getTitle() {
         return title;
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 ffd29f5..82f99f0 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
@@ -2,14 +2,24 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.FieldError;
+import org.springframework.context.MessageSource;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+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 {
+public class RestExceptionHandler extends ResponseEntityExceptionHandler {
+
+    @Inject
+    private MessageSource messageSource;
 
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
@@ -21,4 +31,23 @@ public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundExcepti
         return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
     }
 
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        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, HttpStatus.BAD_REQUEST);
+    }
+
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ValidationError.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ValidationError.java
new file mode 100644
index 0000000..e957236
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ValidationError.java
@@ -0,0 +1,22 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+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/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