From e43ba82e5af00c0f1d16bf927755274c78fbc986 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Mon, 16 Aug 2021 22:08:39 -0400
Subject: [PATCH 01/13] First Commit. Created Option class, completed section
 1.1

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

From fbf9e1fb77189e559c24d1ca6722eb7f0af26dfd Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Mon, 16 Aug 2021 22:12:35 -0400
Subject: [PATCH 02/13] Completed Part 1.2

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

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
new file mode 100644
index 0000000..2519aa1
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
@@ -0,0 +1,42 @@
+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;
+    }
+}

From faba42174ee7cc6801fad9c639539b7a4c675a6f Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Mon, 16 Aug 2021 22:22:31 -0400
Subject: [PATCH 03/13] Completed part 1.3, added Vote class

---
 .../domain/Vote.java                          | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 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/Vote.java b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
new file mode 100644
index 0000000..c379966
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java
@@ -0,0 +1,30 @@
+package io.zipcoder.tc_spring_poll_application.domain;
+
+import javax.persistence.*;
+
+@Entity
+public class Vote {
+    @Id
+    @GeneratedValue
+    @Column(name = "VOTE_ID")
+    private Long id;
+    @ManyToOne
+    @JoinColumn(name = "OPTION_ID")
+    private Option option;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+
+    public void setOption(Option option) {
+        this.option = option;
+    }
+}

From c83b1b24f6625ca1668b1201d57cd9e4e5ef400f Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Mon, 16 Aug 2021 22:27:47 -0400
Subject: [PATCH 04/13] Completed part 2, added repository interfaces for
 Option, Poll and Vote

---
 .../repositories/OptionRepository.java                     | 7 +++++++
 .../repositories/PollRepository.java                       | 7 +++++++
 .../repositories/VoteRepository.java                       | 7 +++++++
 3 files changed, 21 insertions(+)
 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/repositories/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
new file mode 100644
index 0000000..b2ca52a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+
+public interface OptionRepository extends CrudRepository<Option, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
new file mode 100644
index 0000000..bb1b087
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+
+public interface PollRepository extends CrudRepository<Poll, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
new file mode 100644
index 0000000..b435e33
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.repository.CrudRepository;
+
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+}

From 252d14eaa1f26e304760e6d469451d902e6884d0 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Mon, 16 Aug 2021 22:44:28 -0400
Subject: [PATCH 05/13] completed part 3.1.2, created RestController for Poll,
 added getAllPolls method that calls findAll method implemented by
 CrudRepository interface

---
 .../controller/PollController.java            | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 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..5994a5f
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -0,0 +1,28 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class PollController {
+
+    PollRepository pollRepository;
+
+    @Autowired
+    public PollController(PollRepository pollRepository) {
+        this.pollRepository = pollRepository;
+    }
+
+    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+        Iterable<Poll> allPolls = pollRepository.findAll();
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+}

From 9ec825ad65f428fee0f0796931cffe9d90027ae1 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Mon, 16 Aug 2021 23:09:15 -0400
Subject: [PATCH 06/13] Completed up to part 3.1.7, added create, update and
 delete CRUD operations

---
 .../controller/PollController.java            | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 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 5994a5f..c1cb0ee 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
@@ -3,12 +3,13 @@
 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.GetMapping;
-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 java.net.URI;
 
 @RestController
 public class PollController {
@@ -25,4 +26,36 @@ 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) {
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        poll = pollRepository.save(poll);
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setLocation(newPollUri);
+        return new ResponseEntity<>(null, HttpStatus.CREATED);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+        Poll p = pollRepository.findOne(pollId);
+        return new ResponseEntity<> (p, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
+        // Save the entity
+        Poll p = pollRepository.save(poll);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.DELETE)
+    public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
+        pollRepository.delete(pollId);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }

From 0fd37bb8009eb8aaf4c7c9c7607393b0de4e9c2c Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 10:47:43 -0400
Subject: [PATCH 07/13] Completed section 3, noticed vote is not tallying
 correctly via method provided in instructions, a vote for Black Mirror is
 going to The Get Down

---
 .../controller/VoteController.java            | 45 +++++++++++++++++++
 .../repositories/VoteRepository.java          |  7 +++
 2 files changed, 52 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..6b569d3
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
@@ -0,0 +1,45 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+    @RestController
+    public class VoteController {
+
+        private VoteRepository voteRepository;
+
+        @Autowired
+        public VoteController(VoteRepository voteRepository) {
+            this.voteRepository = voteRepository;
+        }
+
+        @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
+        public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote
+                vote) {
+            vote = voteRepository.save(vote);
+            // Set the headers for the newly created resource
+            HttpHeaders responseHeaders = new HttpHeaders();
+            responseHeaders.setLocation(ServletUriComponentsBuilder.
+                    fromCurrentRequest().path("/{id}").buildAndExpand(vote.getId()).toUri());
+            return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
+        }
+
+        @RequestMapping(value="/polls/votes", method=RequestMethod.GET)
+        public Iterable<Vote> getAllVotes() {
+            return voteRepository.findAll();
+        }
+
+        @RequestMapping(value="/polls/{pollId}/votes", method=RequestMethod.GET)
+        public Iterable<Vote> getVote(@PathVariable Long pollId) {
+            return voteRepository.findVotesByPoll(pollId);
+        }
+
+    }
+
+
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java
index b435e33..8d98d82 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,14 @@
 package io.zipcoder.tc_spring_poll_application.repositories;
 
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 public interface VoteRepository extends CrudRepository<Vote, Long> {
+    @Query(value = "SELECT v.* " +
+            "FROM Option o, Vote v " +
+            "WHERE o.POLL_ID = ?1 " +
+            "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
+    public Iterable<Vote> findVotesByPoll(Long pollId);
 }
+

From fe11cc7f843d6174bf1558c1642715fb1b019cde Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 11:12:16 -0400
Subject: [PATCH 08/13] Finished part 4, votes still seeming to apply at random

---
 src/main/java/dtos/OptionCount.java           | 23 ++++++++
 src/main/java/dtos/VoteResult.java            | 24 +++++++++
 .../controller/ComputeResultController.java   | 53 +++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 src/main/java/dtos/OptionCount.java
 create mode 100644 src/main/java/dtos/VoteResult.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java

diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..b9cc64f
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,23 @@
+package dtos;
+
+public class OptionCount {
+    private Long optionId;
+    private int count;
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
+
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..f8287bc
--- /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..29174b4
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -0,0 +1,53 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import dtos.OptionCount;
+import dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+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) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+        OptionCount optionCount;
+        Integer allVotesCount = 0;
+        //Map<OptionCount, Long> voteCounts = new HashMap<OptionCount, Long>();
+        Map<Long, OptionCount> voteCounts = new HashMap<>();
+        for (Vote element : allVotes) {
+            //voteResult.setTotalVotes(voteResult.getTotalVotes() + 1);
+            allVotesCount++;
+            optionCount = voteCounts.get(element.getOption().getId());
+            if (optionCount == null) {
+                optionCount = new OptionCount();
+                optionCount.setOptionId(element.getOption().getId());
+                voteCounts.put(element.getOption().getId(), optionCount);
+            }
+            optionCount.setCount(optionCount.getCount() + 1);
+        }
+        voteResult.setTotalVotes(allVotesCount);
+        voteResult.setResults(voteCounts.values());
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+}
+

From 6fb1db3b14d9813e813317da13ba4c99fa607184 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 13:49:08 -0400
Subject: [PATCH 09/13] Completed 5.1, created ResourceNotFoundExcep

---
 src/main/java/dtos/error/ErrorDetail.java     | 49 +++++++++++++++++++
 src/main/java/dtos/error/ValidationError.java |  2 +
 .../controller/PollController.java            | 11 +++--
 .../controller/VoteController.java            |  9 ++--
 .../exception/ResourceNotFoundException.java  | 18 +++++++
 .../exception/RestExceptionHandler.java       |  7 +++
 6 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/dtos/error/ErrorDetail.java
 create mode 100644 src/main/java/dtos/error/ValidationError.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/dtos/error/ErrorDetail.java b/src/main/java/dtos/error/ErrorDetail.java
new file mode 100644
index 0000000..30aac5d
--- /dev/null
+++ b/src/main/java/dtos/error/ErrorDetail.java
@@ -0,0 +1,49 @@
+package dtos;
+
+public class ErrorDetail {
+    String title;
+    int status;
+    String detail;
+    long timeStamp;
+    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/dtos/error/ValidationError.java b/src/main/java/dtos/error/ValidationError.java
new file mode 100644
index 0000000..148dacf
--- /dev/null
+++ b/src/main/java/dtos/error/ValidationError.java
@@ -0,0 +1,2 @@
+package dtos.error;public class ValidationError {
+}
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 c1cb0ee..b941add 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
@@ -28,20 +28,23 @@ public ResponseEntity<Iterable<Poll>> getAllPolls() {
     }
 
     @RequestMapping(value="/polls", method=RequestMethod.POST)
-    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+    public ResponseEntity<?> createPoll(
+            @RequestBody Poll poll) {
+        poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
                 .fromCurrentRequest()
                 .path("/{id}")
                 .buildAndExpand(poll.getId())
                 .toUri();
-        poll = pollRepository.save(poll);
+
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setLocation(newPollUri);
-        return new ResponseEntity<>(null, HttpStatus.CREATED);
+        return new ResponseEntity<>(newPollUri, HttpStatus.CREATED);
     }
 
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
-    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+    public ResponseEntity<?> getPoll(
+            @PathVariable Long pollId) {
         Poll p = pollRepository.findOne(pollId);
         return new ResponseEntity<> (p, HttpStatus.OK);
     }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java
index 6b569d3..be99b00 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
@@ -20,13 +20,16 @@ public VoteController(VoteRepository voteRepository) {
         }
 
         @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
-        public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote
-                vote) {
+        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());
+                    fromCurrentRequest()
+                    .path("/{id}")
+                    .buildAndExpand(vote.getId()).toUri());
             return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED);
         }
 
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..e6c5a67
--- /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..c2bfb5a
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import org.springframework.web.bind.annotation.ControllerAdvice;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+}

From 1f92c98f79e6a33199d0599c3de80b61b0e590a8 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 13:50:21 -0400
Subject: [PATCH 10/13] Completed 5.5, added ValidationError class and added
 field to ErrorDetail of a map that holds String, List<ValidationError>

---
 src/main/java/dtos/error/ErrorDetail.java     | 14 +++++++++++-
 src/main/java/dtos/error/ValidationError.java | 22 ++++++++++++++++++-
 .../controller/ComputeResultController.java   |  2 --
 .../controller/PollController.java            | 17 +++++++++++++-
 .../domain/Poll.java                          |  5 +++++
 .../exception/RestExceptionHandler.java       | 22 ++++++++++++++++++-
 6 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/src/main/java/dtos/error/ErrorDetail.java b/src/main/java/dtos/error/ErrorDetail.java
index 30aac5d..c10d3a2 100644
--- a/src/main/java/dtos/error/ErrorDetail.java
+++ b/src/main/java/dtos/error/ErrorDetail.java
@@ -1,4 +1,7 @@
-package dtos;
+package dtos.error;
+
+import java.util.List;
+import java.util.Map;
 
 public class ErrorDetail {
     String title;
@@ -6,6 +9,7 @@ public class ErrorDetail {
     String detail;
     long timeStamp;
     String developerMessage;
+    Map<String, List<ValidationError>> errors;
 
     public String getTitle() {
         return title;
@@ -46,4 +50,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/dtos/error/ValidationError.java b/src/main/java/dtos/error/ValidationError.java
index 148dacf..d06f8b8 100644
--- a/src/main/java/dtos/error/ValidationError.java
+++ b/src/main/java/dtos/error/ValidationError.java
@@ -1,2 +1,22 @@
-package dtos.error;public class ValidationError {
+package dtos.error;
+
+public class ValidationError {
+    String code;
+    String message;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
 }
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
index 29174b4..1a2a4f6 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/ComputeResultController.java
@@ -32,10 +32,8 @@ public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
         Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
         OptionCount optionCount;
         Integer allVotesCount = 0;
-        //Map<OptionCount, Long> voteCounts = new HashMap<OptionCount, Long>();
         Map<Long, OptionCount> voteCounts = new HashMap<>();
         for (Vote element : allVotes) {
-            //voteResult.setTotalVotes(voteResult.getTotalVotes() + 1);
             allVotesCount++;
             optionCount = voteCounts.get(element.getOption().getId());
             if (optionCount == null) {
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 b941add..2c3fe95 100644
--- a/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java
@@ -1,6 +1,7 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -9,6 +10,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
@@ -29,6 +31,7 @@ public ResponseEntity<Iterable<Poll>> getAllPolls() {
 
     @RequestMapping(value="/polls", method=RequestMethod.POST)
     public ResponseEntity<?> createPoll(
+            @Valid
             @RequestBody Poll poll) {
         poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
@@ -45,20 +48,32 @@ public ResponseEntity<?> createPoll(
     @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) {
+    public ResponseEntity<?> updatePoll(
+            @Valid
+            @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 id) throws ResourceNotFoundException{
+        Poll p = pollRepository.findOne(id);
+        if(p == null)
+            throw new ResourceNotFoundException("No poll with id of " + 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 2519aa1..166b9fb 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
@@ -9,8 +12,10 @@ public class Poll {
     @GeneratedValue
     @Column(name = "POLL_ID")
     private Long id;
+    @NotEmpty
     @Column(name = "QUESTION")
     private String question;
+    @Size(min = 2, max = 6)
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
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 c2bfb5a..d4cef0a 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,7 +1,27 @@
-package io.zipcoder.tc_spring_poll_application.controller;
+package io.zipcoder.tc_spring_poll_application.exception;
 
+import dtos.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) {
+        ErrorDetail eDetail = new ErrorDetail();
+        eDetail.setTimeStamp(new Date().getTime());
+        eDetail.setDetail("Unable to locate resource, resource does not exist");
+        eDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        eDetail.setDeveloperMessage(rnfe.getMessage());
+        eDetail.setTitle("Cannot locate resource");
+
+        return new ResponseEntity<>(eDetail, null, HttpStatus.NOT_FOUND);
+    }
+
 }

From 73812941cdc0e088dd0909398bc173cdab3475c6 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 14:16:53 -0400
Subject: [PATCH 11/13] Completed section 5.6 createed handleValidationError
 method in RestExceptionhandler class

---
 .../exception/RestExceptionHandler.java       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

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 d4cef0a..9a1646a 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,29 @@
 package io.zipcoder.tc_spring_poll_application.exception;
 
 import dtos.error.ErrorDetail;
+import dtos.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.inject.Inject;
 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) {
         ErrorDetail eDetail = new ErrorDetail();
@@ -24,4 +36,31 @@ public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundExcepti
         return new ResponseEntity<>(eDetail, null, HttpStatus.NOT_FOUND);
     }
 
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?>
+    handleValidationError( MethodArgumentNotValidException manve,
+                           HttpServletRequest request){
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDetail("Unable to locate resource, resource does not exist");
+        errorDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        errorDetail.setDeveloperMessage(manve.getMessage());
+        errorDetail.setTitle("Cannot locate resource");
+
+        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);
+    }
+
 }

From cb3f19d8d6adaf365ac58011ee9ffd0888aa3239 Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 14:22:56 -0400
Subject: [PATCH 12/13] Completed 5.7, created message.properties text file in
 resources package

---
 src/main/resources/message.properties | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/main/resources/message.properties

diff --git a/src/main/resources/message.properties b/src/main/resources/message.properties
new file mode 100644
index 0000000..3f51f36
--- /dev/null
+++ b/src/main/resources/message.properties
@@ -0,0 +1,2 @@
+NotEmpty.poll.question=Question is a required field
+Size.poll.options=Options must be greater than {2} and less than {1}
\ No newline at end of file

From 01e4d716e1a0c6d229a0d385b5b0525ec0220bee Mon Sep 17 00:00:00 2001
From: Zach <zach@zipcodes-MacBook-Pro-6.local>
Date: Tue, 17 Aug 2021 14:38:28 -0400
Subject: [PATCH 13/13] completed lab

---
 src/main/resources/import.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/main/resources/import.sql

diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..c472f11
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,2 @@
+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);
\ No newline at end of file