From b599574cd04c5934956b37feb89aa8aa65128402 Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Thu, 5 Apr 2018 07:45:41 -0400
Subject: [PATCH 1/9] Made Option class and tarted Poll class

---
 .../domain/Option.java                        | 35 +++++++++++++++++++
 .../domain/Poll.java                          |  4 +++
 2 files changed, 39 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

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..7b87a58
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
@@ -0,0 +1,35 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity // this means that a class can be mapped to a table. Just is a marker like Serializable
+public class Option {
+
+    @Id // specifies primary key of entity
+    @GeneratedValue // configures the way of increment of the specified column (field)
+    @Column(name = "OPTION_ID")// specifies mapped column for a persisitence property. Without this annotation the framework assumes the field's variable-name is the persistent property
+    private long id;
+
+    @Column(name = "OPTION_VALUE")// specifies mapped column for persistence 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..aeb93af
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,4 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+public class Poll {
+}

From 956579ebad7649a1800f05999e2d4a0797a3d74e Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Thu, 5 Apr 2018 13:18:06 -0400
Subject: [PATCH 2/9] Made repositores and classes

---
 .../controller/PollController.java            | 14 +++++++
 .../domain/Poll.java                          | 41 +++++++++++++++++++
 .../domain/Vote.java                          |  8 ++++
 .../repositories/OptionRepository.java        |  7 ++++
 .../repositories/PollRepository.java          |  7 ++++
 .../repositories/VoteRepository.java          |  7 ++++
 6 files changed, 84 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/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..9c52b52
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,14 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.inject.Inject;
+
+@RestController
+public class PollController {
+
+    @Inject
+    private PollRepository pollRepository;
+
+}
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 aeb93af..06f0341 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,4 +1,45 @@
 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 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..cb0d880
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,8 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.Entity;
+
+@Entity
+public class Vote {
+
+}
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..d6d6214
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+
+public interface OptionRepository extends CrudRepository<Vote, 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..7764822
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+
+public interface PollRepository extends CrudRepository<Vote, Long>{
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
new file mode 100644
index 0000000..b435e33
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+}

From c05929044decd620c272a2dcaa16f14999299a8c Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Thu, 5 Apr 2018 17:33:47 -0400
Subject: [PATCH 3/9] Made a controller

---
 pom.xml                                       |  2 +-
 .../controller/PollController.java            | 11 ++++++++
 .../domain/Option.java                        |  6 ++---
 .../domain/Poll.java                          |  8 +++---
 .../domain/Vote.java                          | 25 ++++++++++++++++++-
 .../repositories/OptionRepository.java        |  6 +++--
 .../repositories/PollRepository.java          |  6 +++--
 .../repositories/VoteRepository.java          |  2 ++
 8 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed84c9b..fab15cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     </parent>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <start-class>io.zipcoder.tc_spring_poll_application.QuickPollApplication</start-class>
+        <start-class>io.zipcoder.springdemo.QuickPollApplication</start-class>
         <java.version>1.7</java.version>
     </properties>
     <dependencies>
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 9c52b52..d835cae 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,11 @@
 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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.inject.Inject;
@@ -11,4 +16,10 @@ 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);
+    }
+
 }
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 7b87a58..51a7563 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
@@ -11,16 +11,16 @@ public class Option {
     @Id // specifies primary key of entity
     @GeneratedValue // configures the way of increment of the specified column (field)
     @Column(name = "OPTION_ID")// specifies mapped column for a persisitence property. Without this annotation the framework assumes the field's variable-name is the persistent property
-    private long id;
+    private Long id;
 
     @Column(name = "OPTION_VALUE")// specifies mapped column for persistence value
     private String value;
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
index 06f0341..de05b1f 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -8,8 +8,8 @@ public class Poll {
 
     @Id
     @GeneratedValue
-    @Column(name = "Poll_ID")
-    private long id;
+    @Column(name = "POLL_ID")
+    private Long id;
 
     @Column(name = "QUESTION")
     private String question;
@@ -19,11 +19,11 @@ public class Poll {
     @OrderBy
     private Set<Option> options;
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
index cb0d880..fda7aee 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,8 +1,31 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
-import javax.persistence.Entity;
+import javax.persistence.*;
 
 @Entity
 public class Vote {
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    private Long id;
 
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    private Option option;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+
+    public void setOption(Option option) {
+        this.option = option;
+    }
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
index d6d6214..b6d1cea 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,7 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
-import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.domain.Option;
 import org.springframework.data.repository.CrudRepository;
 
-public interface OptionRepository extends CrudRepository<Vote, Long>{
+public interface OptionRepository extends CrudRepository<Option, Long>{
+    //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
+    // ypu have usually one repository per domain object
 }
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 7764822..8838966 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,7 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
-import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import org.springframework.data.repository.CrudRepository;
 
-public interface PollRepository extends CrudRepository<Vote, Long>{
+public interface PollRepository extends CrudRepository<Poll, Long>{
+    //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
+    // ypu have usually one repository per domain object
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
index b435e33..4840bf7 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
@@ -4,4 +4,6 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface VoteRepository extends CrudRepository<Vote, Long> {
+    //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
+    // ypu have usually one repository per domain object
 }

From 1c55714de95f72c82e585c20a65a0855b2dc292a Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Thu, 5 Apr 2018 23:17:44 -0400
Subject: [PATCH 4/9] Making Vote Controller

---
 .../controller/PollController.java            | 47 +++++++++++++++++--
 1 file changed, 44 insertions(+), 3 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 d835cae..4da5085 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,13 +2,15 @@
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.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 {
@@ -16,10 +18,49 @@ public class PollController {
     @Inject
     private PollRepository pollRepository;
 
+    @Autowired //The @Autowired annotation allows you to skip configurations elsewhere of what to inject and just does it for you
+
+    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) { //@RequestBody tells Spring that the entire request body needs to be converted to an instance of Poll
+        poll = pollRepository.save(poll);
+        HttpHeaders newHeaders = new HttpHeaders();
+
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+                newHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(newHeaders, 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 f0d3174e5bcb7ec58ac82f2ab96a02d024bdaa89 Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Thu, 5 Apr 2018 23:31:18 -0400
Subject: [PATCH 5/9] Saving for the night

---
 .../controller/VoteController.java            | 41 +++++++++++++++++++
 .../repositories/VoteRepository.java          |  7 ++++
 2 files changed, 48 insertions(+)
 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/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
new file mode 100644
index 0000000..650de72
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,41 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+@RestController
+public class VoteController {
+    private VoteRepository voteRepository;
+
+    @Autowired
+    public VoteController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
+    @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
+    public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote
+            vote) {
+        vote = voteRepository.save(vote);
+        // 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 4840bf7..34d8bff 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,16 @@
 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> {
     //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
     // ypu have usually one repository per domain object
+
+    @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 9206e5cb4530ec9f783475638becfcaa7753092a Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Sat, 7 Apr 2018 21:07:59 -0400
Subject: [PATCH 6/9] Haven't saved in a while

---
 src/main/java/dtos/OptionCount.java           | 22 ++++++++
 src/main/java/dtos/VoteResult.java            | 24 +++++++++
 .../controller/ComputeResultController.java   | 51 +++++++++++++++++++
 .../controller/PollController.java            | 11 ++--
 .../controller/VoteController.java            |  4 +-
 .../domain/Option.java                        |  4 +-
 .../domain/Poll.java                          |  6 +--
 .../domain/Vote.java                          |  2 +-
 .../exception/ResourceNotFoundException.java  | 20 ++++++++
 9 files changed, 130 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/dtos/OptionCount.java
 create mode 100644 src/main/java/dtos/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java

diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..cdf9522
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,22 @@
+package dtos;
+
+public class OptionCount {
+    private  Long optionId;
+    private int count;
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..b3d873d
--- /dev/null
+++ b/src/main/java/dtos/VoteResult.java
@@ -0,0 +1,24 @@
+package dtos;
+
+import java.util.Collection;
+
+public class VoteResult {
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public int getTotalVotes() {
+        return totalVotes;
+    }
+
+    public void setTotalVotes(int totalVotes) {
+        this.totalVotes = totalVotes;
+    }
+
+    public Collection<OptionCount> getResults() {
+        return results;
+    }
+
+    public void setResults(Collection<OptionCount> results) {
+        this.results = results;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
new file mode 100644
index 0000000..385ebc5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,51 @@
+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.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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@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){ //requestparam annotation instructs SPring to retrieve the pollId value from a HTTP query
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+
+        int totalVotes = 0;
+        Map<Long, OptionCount> tempMap = new HashMap<>();
+        for(Vote v : allVotes) {
+            totalVotes ++;
+            // Get the OptionCount corresponding to this Option
+            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); //computes results sent to client using new response entity
+    }
+}
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 4da5085..4a9e5bf 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,24 +9,21 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.inject.Inject;
 import java.net.URI;
 
-@RestController
+@RestController// marks entity as a controller following REST specs
 public class PollController {
 
-    @Inject
     private PollRepository pollRepository;
 
     @Autowired //The @Autowired annotation allows you to skip configurations elsewhere of what to inject and just does it for you
-
     public PollController(PollRepository pollRepository){
         this.pollRepository = pollRepository;
     }
 
-    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    @RequestMapping(value="/polls", method= RequestMethod.GET)//maps web requests to entities with the @RequestMapping
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll();
+        Iterable<Poll> allPolls = pollRepository.findAll(); // reads all the polls using poll repository
         return new ResponseEntity<>(allPolls, HttpStatus.OK);
     }
 
@@ -35,7 +32,7 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) { //@RequestBody tel
         poll = pollRepository.save(poll);
         HttpHeaders newHeaders = new HttpHeaders();
 
-        URI newPollUri = ServletUriComponentsBuilder
+        URI newPollUri = ServletUriComponentsBuilder //allows the client to have a way to know the uri of the created poll
                 .fromCurrentRequest()
                 .path("/{id}")
                 .buildAndExpand(poll.getId())
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
index 650de72..7a9bb10 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -9,8 +9,10 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+
 @RestController
 public class VoteController {
+
     private VoteRepository voteRepository;
 
     @Autowired
@@ -36,6 +38,6 @@ public Iterable<Vote> getAllVotes() {
 
     @RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET)
     public Iterable<Vote> getVote(@PathVariable Long pollId) {
-        return voteRepository.findById(pollId);
+        return voteRepository.findVotesByPoll(pollId);
     }
 }
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 51a7563..82ca99d 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
@@ -8,9 +8,9 @@
 @Entity // this means that a class can be mapped to a table. Just is a marker like Serializable
 public class Option {
 
-    @Id // specifies primary key of entity
+    @Id // specifies primary key of entity (primary key is a special column)
     @GeneratedValue // configures the way of increment of the specified column (field)
-    @Column(name = "OPTION_ID")// specifies mapped column for a persisitence property. Without this annotation the framework assumes the field's variable-name is the persistent property
+    @Column(name = "OPTION_ID")// specifies mapped column for a persistence property. Without this annotation the framework assumes the field's variable-name is the persistent property
     private Long id;
 
     @Column(name = "OPTION_VALUE")// specifies mapped column for persistence 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
index de05b1f..84a20fd 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
@@ -14,9 +14,9 @@ public class Poll {
     @Column(name = "QUESTION")
     private String question;
 
-    @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn(name = "POLL_ID")
-    @OrderBy
+    @OneToMany(cascade = CascadeType.ALL)// indicates that a Poll instance can contain zero or more Option instances. The CascadeType.All indicates that any database operations such as persist, remove, or merge on a Poll instance needs to be propagated to all related Option instances
+    @JoinColumn(name = "POLL_ID")// indicates this entity is the owner of the relationship. It has a key to the column with options
+    @OrderBy// orders by ASC default
     private Set<Option> options;
 
     public Long getId() {
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 fda7aee..8c64785 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
@@ -9,7 +9,7 @@ public class Vote {
     @Column(name = "VOTE_ID")
     private Long id;
 
-    @ManyToOne
+    @ManyToOne // indicates tha the option instance can have zero or more Vote instances associated with it
     @JoinColumn(name = "OPTION_ID")
     private Option option;
 
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..88b4a69
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,20 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class ResourceNotFoundException extends  RuntimeException{
+
+    public ResourceNotFoundException(){
+
+    }
+
+    public ResourceNotFoundException(String message){
+        super(message);
+    }
+
+    public ResourceNotFoundException(String message, Throwable cause){
+        super(message, cause);
+    }
+}

From cdb3651f049bc81efa744a8c4bf47f6105e02325 Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Sat, 7 Apr 2018 22:17:45 -0400
Subject: [PATCH 7/9] Added Errors/Exception Handling

---
 .../controller/PollController.java            | 11 ++++
 .../error/ErrorDetail.java                    | 50 +++++++++++++++++++
 .../exception/RestExceptionHandler.java       | 26 ++++++++++
 3 files changed, 87 insertions(+)
 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/exception/RestExceptionHandler.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 4a9e5bf..91bb44c 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -1,6 +1,7 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -43,6 +44,7 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) { //@RequestBody tel
 
     @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);
     }
@@ -50,14 +52,23 @@ public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
         // Save the entity
+        verifyPoll(pollId);
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(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(pollId == null){
+            throw new ResourceNotFoundException("The given poll id" + pollId + "does not exist!");
+        }
+    }
+
 }
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..987dc51
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -0,0 +1,50 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+public class ErrorDetail {
+
+    private String title; // title of error condition
+    private int status; // HTTP status code for current request
+    private String detail; // short readable description of error
+    private long timeStamp; // time in milliseconds when error occured
+    private String developerMessage; // detailed info as such exception class or trace
+
+    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/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
new file mode 100644
index 0000000..f56efa5
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,26 @@
+package io.zipcoder.tc_spring_poll_application.exception;
+
+import io.zipcoder.tc_spring_poll_application.error.ErrorDetail;
+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){
+        //make error detail object and fill it?
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Resource Not Found");
+        errorDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        errorDetail.setDetail(rnfe.getMessage());
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(rnfe.getClass().getName());
+        return new ResponseEntity<>(errorDetail, null,  HttpStatus.NOT_FOUND);
+    }
+}

From cc91c9252fb1f77bf0f4122d887eeefc3f9cb1fc Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Sat, 7 Apr 2018 23:21:20 -0400
Subject: [PATCH 8/9] Started part 6

---
 .../controller/PollController.java            |  7 +++-
 .../domain/Poll.java                          |  5 +++
 .../error/ErrorDetail.java                    | 14 ++++++-
 .../error/ValidationError.java                | 23 +++++++++++
 .../exception/RestExceptionHandler.java       | 40 +++++++++++++++++++
 src/main/resources/messages.properties        |  2 +
 6 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
 create mode 100644 src/main/resources/messages.properties

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 91bb44c..1fe1252 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
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController// marks entity as a controller following REST specs
@@ -42,6 +43,7 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) { //@RequestBody tel
         return new ResponseEntity<>(newHeaders, HttpStatus.CREATED);
     }
 
+    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
     public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
         verifyPoll(pollId);
@@ -49,6 +51,7 @@ public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
         return new ResponseEntity<> (p, HttpStatus.OK);
     }
 
+    @Valid
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
         // Save the entity
@@ -66,8 +69,8 @@ public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
 
     public void verifyPoll(Long pollId){
         Poll poll = pollRepository.findOne(pollId);
-        if(pollId == null){
-            throw new ResourceNotFoundException("The given poll id" + pollId + "does not exist!");
+        if(poll == null){
+            throw new ResourceNotFoundException("The given poll id " + pollId + " does not exist!");
         }
     }
 
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 84a20fd..c3e8b3f 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -1,6 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.util.Set;
 
 @Entity
@@ -11,9 +14,11 @@ public class Poll {
     @Column(name = "POLL_ID")
     private Long id;
 
+    @NotEmpty
     @Column(name = "QUESTION")
     private String question;
 
+    @Size(min=2, max = 6)
     @OneToMany(cascade = CascadeType.ALL)// indicates that a Poll instance can contain zero or more Option instances. The CascadeType.All indicates that any database operations such as persist, remove, or merge on a Poll instance needs to be propagated to all related Option instances
     @JoinColumn(name = "POLL_ID")// indicates this entity is the owner of the relationship. It has a key to the column with options
     @OrderBy// orders by ASC default
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 987dc51..dba4308 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
@@ -1,12 +1,16 @@
 package io.zipcoder.tc_spring_poll_application.error;
 
+import java.util.List;
+import java.util.Map;
+
 public class ErrorDetail {
 
     private String title; // title of error condition
     private int status; // HTTP status code for current request
     private String detail; // short readable description of error
-    private long timeStamp; // time in milliseconds when error occured
+    private long timeStamp; // time in milliseconds when error occurred
     private String developerMessage; // detailed info as such exception class or trace
+    private Map<String, List<ValidationError>> errors;
 
     public String getTitle() {
         return title;
@@ -47,4 +51,12 @@ public String getDeveloperMessage() {
     public void setDeveloperMessage(String developerMessage) {
         this.developerMessage = developerMessage;
     }
+
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
 }
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..742892c
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
@@ -0,0 +1,23 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+public class ValidationError {
+
+    private String code;
+    private String message;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
index f56efa5..37e9e97 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,17 +1,27 @@
 package io.zipcoder.tc_spring_poll_application.exception;
 
 import io.zipcoder.tc_spring_poll_application.error.ErrorDetail;
+import io.zipcoder.tc_spring_poll_application.error.ValidationError;
+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
+    MessageSource messageSource;
+
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request){
         //make error detail object and fill it?
@@ -23,4 +33,34 @@ public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundExcepti
         errorDetail.setDeveloperMessage(rnfe.getClass().getName());
         return new ResponseEntity<>(errorDetail, null,  HttpStatus.NOT_FOUND);
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?> handleValicationError(MethodArgumentNotValidException manve, HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Validation Failed");
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setDetail("Input validation failed");
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
+
+        String requestPath = (String) request.getAttribute("javax.servlet.error. request_uri");
+        if(requestPath == null) {
+            requestPath = request.getRequestURI();
+        }
+
+        List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        for(FieldError fe : fieldErrors) {
+
+            List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
+            if(validationErrorList == null) {
+                validationErrorList = new ArrayList<>();
+                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/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 18ab6b14446f0919f7066d513068cc14fda364fc Mon Sep 17 00:00:00 2001
From: CWinarski <Winarski70@yahoo.com>
Date: Sun, 8 Apr 2018 11:53:55 -0400
Subject: [PATCH 9/9] Finished Lab

---
 .../controller/PollController.java            |  8 +-
 .../repositories/PollRepository.java          |  3 +-
 src/main/resources/import.sql                 | 74 +++++++++++++++++++
 3 files changed, 81 insertions(+), 4 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 1fe1252..0b0ad2d 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,8 @@
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -24,9 +26,9 @@ public PollController(PollRepository pollRepository){
     }
 
     @RequestMapping(value="/polls", method= RequestMethod.GET)//maps web requests to entities with the @RequestMapping
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll(); // reads all the polls using poll repository
-        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    public ResponseEntity<Page<Poll>> getAllPolls(Pageable pageable) {
+        Page<Poll> allPolls = pollRepository.findAll(pageable); //essentially pages the data
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);// returns paged data
     }
 
     @RequestMapping(value="/polls", method=RequestMethod.POST)
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 8838966..64437f3 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -2,8 +2,9 @@
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 
-public interface PollRepository extends CrudRepository<Poll, Long>{
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {
     //these are DAOs pr Data Access Objects they provide abstraction for interacting with data stores
     // ypu have usually one repository per domain object
 }
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..5c5050b
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,74 @@
+ 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, 'Blue', 1);
+ insert into option (option_id, option_value, poll_id) values (3, 'Purple', 1);
+
+ insert into poll (poll_id, question) values (2, 'What is your favorite car brand?');
+ insert into option (option_id, option_value, poll_id) values (4, 'Chevy', 2);
+ insert into option (option_id, option_value, poll_id) values (5, 'Subaru', 2);
+ insert into option (option_id, option_value, poll_id) values (6, 'Honda', 2);
+
+ insert into poll (poll_id, question) values (3, 'What is your favorite warframe?');
+ insert into option (option_id, option_value, poll_id) values (7, 'Saryn', 3);
+ insert into option (option_id, option_value, poll_id) values (8, 'Frost', 3);
+ insert into option (option_id, option_value, poll_id) values (9, 'Titania', 3);
+
+ insert into poll (poll_id, question) values (4, 'What is your favorite book genre?');
+ insert into option (option_id, option_value, poll_id) values (10, 'Sci-Fi', 4);
+ insert into option (option_id, option_value, poll_id) values (11, 'Fantasy', 4);
+ insert into option (option_id, option_value, poll_id) values (12, 'Drama', 4);
+
+ insert into poll (poll_id, question) values (5, 'What is your favorite movie?');
+ insert into option (option_id, option_value, poll_id) values (13, 'Ready Player One', 5);
+ insert into option (option_id, option_value, poll_id) values (14, 'Black Panther', 5);
+ insert into option (option_id, option_value, poll_id) values (15, 'Pacific Rim 2', 5);
+
+ insert into poll (poll_id, question) values (6, 'What is your favorite phone?');
+ insert into option (option_id, option_value, poll_id) values (16, 'Samsung s9', 6);
+ insert into option (option_id, option_value, poll_id) values (17, 'Lg v30', 6);
+ insert into option (option_id, option_value, poll_id) values (18, 'OnePlus 5T', 6);
+
+ insert into poll (poll_id, question) values (7, 'What is your favorite soda?');
+ insert into option (option_id, option_value, poll_id) values (19, 'Dr. Pepper', 7);
+ insert into option (option_id, option_value, poll_id) values (20, 'Coke', 7);
+ insert into option (option_id, option_value, poll_id) values (21, 'Pepsi', 7);
+
+ insert into poll (poll_id, question) values (8, 'What is your favorite console?');
+ insert into option (option_id, option_value, poll_id) values (22, 'PS4', 8);
+ insert into option (option_id, option_value, poll_id) values (23, 'Xbox One', 8);
+ insert into option (option_id, option_value, poll_id) values (24, 'Nintendo Switch', 8);
+
+ insert into poll (poll_id, question) values (9, 'What is your favorite music genre?');
+ insert into option (option_id, option_value, poll_id) values (25, 'Rock', 9);
+ insert into option (option_id, option_value, poll_id) values (26, 'Edm', 9);
+ insert into option (option_id, option_value, poll_id) values (27, 'Pop', 9);
+
+ insert into poll (poll_id, question) values (10, 'What is your favorite pet?');
+ insert into option (option_id, option_value, poll_id) values (28, 'Dog', 10);
+ insert into option (option_id, option_value, poll_id) values (29, 'Cat', 10);
+ insert into option (option_id, option_value, poll_id) values (30, 'Bird', 10);
+
+ insert into poll (poll_id, question) values (11, 'What is your favorite monstercat artist?');
+ insert into option (option_id, option_value, poll_id) values (31, 'Conro', 11);
+ insert into option (option_id, option_value, poll_id) values (32, 'Muzzy', 11);
+ insert into option (option_id, option_value, poll_id) values (33, 'Kuuro', 11);
+
+ insert into poll (poll_id, question) values (12, 'What is your favorite computer brand?');
+ insert into option (option_id, option_value, poll_id) values (34, 'HP', 12);
+ insert into option (option_id, option_value, poll_id) values (35, 'Apple', 12);
+ insert into option (option_id, option_value, poll_id) values (36, 'Purple', 12);
+
+ insert into poll (poll_id, question) values (13, 'What is your favorite gaming brand?');
+ insert into option (option_id, option_value, poll_id) values (37, 'Logitech', 13);
+ insert into option (option_id, option_value, poll_id) values (38, 'Corsair', 13);
+ insert into option (option_id, option_value, poll_id) values (39, 'HyperX', 13);
+
+ insert into poll (poll_id, question) values (14, 'What is your favorite food?');
+ insert into option (option_id, option_value, poll_id) values (40, 'Sushi', 14);
+ insert into option (option_id, option_value, poll_id) values (41, 'Pizza', 14);
+ insert into option (option_id, option_value, poll_id) values (42, 'Fries', 14);
+
+ insert into poll (poll_id, question) values (15, 'What is your favorite chip brand?');
+ insert into option (option_id, option_value, poll_id) values (43, 'Doritos', 15);
+ insert into option (option_id, option_value, poll_id) values (44, 'Lays', 15);
+ insert into option (option_id, option_value, poll_id) values (45, 'Herrs', 15);