From 65dfc305bf8a2589c786ad95a3410b7add4bee37 Mon Sep 17 00:00:00 2001
From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com>
Date: Sat, 7 Dec 2019 20:00:52 -0500
Subject: [PATCH 1/3] finished third part

---
 .../Controller/OptionController.java          |  7 +++
 .../Controller/PollController.java            | 57 +++++++++++++++++++
 .../Controller/VoteController.java            | 43 ++++++++++++++
 .../Repositories/OptionRepository.java        |  9 +++
 .../Repositories/PollRepository.java          | 10 ++++
 .../Repositories/VoteRepository.java          | 18 ++++++
 .../domain/Option.java                        | 32 +++++++++++
 .../domain/Poll.java                          | 42 ++++++++++++++
 .../domain/Vote.java                          | 30 ++++++++++
 9 files changed, 248 insertions(+)
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Controller/OptionController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
 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
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java

diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/OptionController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/OptionController.java
new file mode 100644
index 0000000..ed0f413
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/OptionController.java
@@ -0,0 +1,7 @@
+package io.zipcoder.tc_spring_poll_application.Controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class OptionController {
+}
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..7d0c4f6
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
@@ -0,0 +1,57 @@
+package io.zipcoder.tc_spring_poll_application.Controller;
+
+import io.zipcoder.tc_spring_poll_application.Repositories.PollRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+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;
+
+import java.net.URI;
+
+@RestController
+public class PollController {
+    PollRepository pollRepository ;
+    Poll poll;
+    @Autowired
+    public PollController(PollRepository pollRepository){
+        this.pollRepository = pollRepository;
+    }
+    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    public ResponseEntity<Iterable<Poll>> getAllPolls() {
+        Iterable<Poll> allPolls = pollRepository.findAll();
+        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    }
+    @RequestMapping(value="/polls", method=RequestMethod.POST)
+    public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
+        poll = pollRepository.save(poll);
+        URI newPollUri = ServletUriComponentsBuilder
+                .fromCurrentRequest()
+                .path("/{id}")
+                .buildAndExpand(poll.getId())
+                .toUri();
+        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);
+    }
+
+
+}
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..2bfff21
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/VoteController.java
@@ -0,0 +1,43 @@
+package io.zipcoder.tc_spring_poll_application.Controller;
+
+import io.zipcoder.tc_spring_poll_application.Repositories.VoteRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+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/OptionRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/OptionRepository.java
new file mode 100644
index 0000000..7e2e2cb
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/OptionRepository.java
@@ -0,0 +1,9 @@
+package io.zipcoder.tc_spring_poll_application.Repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OptionRepository extends CrudRepository<Option, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/PollRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/PollRepository.java
new file mode 100644
index 0000000..67acfef
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/PollRepository.java
@@ -0,0 +1,10 @@
+package io.zipcoder.tc_spring_poll_application.Repositories;
+
+
+import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PollRepository extends CrudRepository<Poll, Long> {
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
new file mode 100644
index 0000000..ecfd92d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Repositories/VoteRepository.java
@@ -0,0 +1,18 @@
+package io.zipcoder.tc_spring_poll_application.Repositories;
+
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface VoteRepository extends CrudRepository<Vote, Long> {
+    @Query(value = "SELECT v.* " +
+            "FROM Option o, Vote v " +
+            "WHERE o.POLL_ID = ?1 " +
+            "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
+    public Iterable<Vote> findVotesByPoll(Long pollId);
+
+    Iterable<Vote> findById(Long 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
new file mode 100644
index 0000000..82728ca
--- /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 String getValue() {
+        return value;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    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..ccb460b
--- /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
+    Set<Option> options;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public Set<Option> getOptions() {
+        return options;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    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..1ffed3b
--- /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")
+   Option option;
+
+    public Long getId() {
+        return id;
+    }
+
+    public Option getOption() {
+        return option;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setOption(Option option) {
+        this.option = option;
+    }
+}

From 804441321f77bcbe3231fec3fc4289e8835d033c Mon Sep 17 00:00:00 2001
From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com>
Date: Thu, 12 Dec 2019 20:52:25 -0500
Subject: [PATCH 2/3] pagination not done

---
 src/main/java/dtos/OptionCount.java           | 26 +++++++
 src/main/java/dtos/VoteResult.java            | 31 ++++++++
 .../Controller/ComputeResultController.java   | 60 ++++++++++++++++
 .../Controller/PollController.java            | 35 +++++++---
 .../domain/Poll.java                          |  8 +++
 .../error/ErrorDetail.java                    | 70 +++++++++++++++++++
 .../error/ValidationError.java                | 30 ++++++++
 .../exception/ResourceNotFoundException.java  | 21 ++++++
 .../exception/RestExceptionHandler.java       | 65 +++++++++++++++++
 src/main/resources/messages.properties        |  2 +
 10 files changed, 338 insertions(+), 10 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/error/ErrorDetail.java
 create mode 100644 src/main/java/io/zipcoder/tc_spring_poll_application/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
 create mode 100644 src/main/resources/messages.properties

diff --git a/src/main/java/dtos/OptionCount.java b/src/main/java/dtos/OptionCount.java
new file mode 100644
index 0000000..b25361e
--- /dev/null
+++ b/src/main/java/dtos/OptionCount.java
@@ -0,0 +1,26 @@
+package dtos;
+
+public class OptionCount {
+    private Long optionId;
+    private int count;
+    public OptionCount(Long optionId, int count){
+        this.optionId = optionId;
+        this.count = count;
+    }
+
+    public Long getOptionId() {
+        return optionId;
+    }
+
+    public void setOptionId(Long optionId) {
+        this.optionId = optionId;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+}
diff --git a/src/main/java/dtos/VoteResult.java b/src/main/java/dtos/VoteResult.java
new file mode 100644
index 0000000..32bd7b8
--- /dev/null
+++ b/src/main/java/dtos/VoteResult.java
@@ -0,0 +1,31 @@
+package dtos;
+
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+
+import java.util.Collection;
+
+public class VoteResult {
+    private int totalVotes;
+    private Collection<OptionCount> results;
+
+    public int getTotalVotes() {
+        int count = 0;
+        for(OptionCount optionCount : results){
+            count = count + optionCount.getCount();
+        }
+        totalVotes = count;
+        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..6ad91fd
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/ComputeResultController.java
@@ -0,0 +1,60 @@
+package io.zipcoder.tc_spring_poll_application.Controller;
+
+import dtos.OptionCount;
+import dtos.VoteResult;
+import io.zipcoder.tc_spring_poll_application.Repositories.VoteRepository;
+import io.zipcoder.tc_spring_poll_application.domain.Option;
+import io.zipcoder.tc_spring_poll_application.domain.Vote;
+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.lang.reflect.Array;
+import java.util.*;
+
+@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);
+        //now we are creating a map of option id and total vote count
+        Map<Long, Integer> map = new HashMap<>();
+        Long optionId;
+        for (Vote vote : allVotes) {
+            optionId = vote.getOption().getId();
+            int updateCount = 0;
+            if (!map.containsKey(optionId))
+                map.put(optionId, 1);
+            else {
+                updateCount = map.get(optionId) + 1;
+                map.put(optionId, updateCount);
+            }
+        }
+        Set<OptionCount> optionCounts = new HashSet<>();
+        for (Long id : map.keySet()) {
+            optionCounts.add(new OptionCount(id, map.get(id)));
+        }
+        voteResult.setResults(optionCounts);
+        voteResult.setTotalVotes(voteResult.getTotalVotes());
+
+
+
+
+    //TODO: Implement algorithm to count votes
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java b/src/main/java/io/zipcoder/tc_spring_poll_application/Controller/PollController.java
index 7d0c4f6..5d9bcc2 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,6 +2,7 @@
 
 import io.zipcoder.tc_spring_poll_application.Repositories.PollRepository;
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
+import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -9,22 +10,27 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
+import javax.validation.Valid;
 import java.net.URI;
 
 @RestController
 public class PollController {
-    PollRepository pollRepository ;
-    Poll poll;
     @Autowired
-    public PollController(PollRepository pollRepository){
+    PollRepository pollRepository;
+    //Poll poll;
+
+    @Autowired
+    public PollController(PollRepository pollRepository) {
         this.pollRepository = pollRepository;
     }
-    @RequestMapping(value="/polls", method= RequestMethod.GET)
+    @Valid
+    @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)
+    @Valid
+    @RequestMapping(value = "/polls", method = RequestMethod.POST)
     public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
         poll = pollRepository.save(poll);
         URI newPollUri = ServletUriComponentsBuilder
@@ -34,24 +40,33 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
                 .toUri();
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setLocation(newPollUri);
-        return new ResponseEntity<>(null, HttpStatus.CREATED);
+        return new ResponseEntity<>("CREATES", HttpStatus.CREATED);
     }
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.GET)
+    @Valid
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
     public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
         Poll p = pollRepository.findOne(pollId);
-        return new ResponseEntity<> (p, HttpStatus.OK);
+        return new ResponseEntity<>(p, HttpStatus.OK);
     }
-    @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
+    @Valid
+    @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)
+    @Valid
+    @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.DELETE)
     public ResponseEntity<?> deletePoll(@PathVariable Long pollId) {
         pollRepository.delete(pollId);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+    public void verifyPoll(@PathVariable Long pollId) {
+        if(!pollRepository.exists(pollId))
+            throw new ResourceNotFoundException();
+    }
+
+
 
 
 }
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 ccb460b..53693d3 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,8 +1,13 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
+import org.hibernate.validator.constraints.NotEmpty;
+
 import javax.persistence.*;
+import javax.validation.Valid;
+import javax.validation.constraints.Size;
 import java.util.Set;
 
+
 @Entity
 public class Poll {
     @Id
@@ -14,6 +19,9 @@ public class Poll {
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
+    @Size(min=2, max = 6)
+    @NotEmpty
+
     Set<Option> options;
 
     public Long getId() {
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
new file mode 100644
index 0000000..13a3b6e
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ErrorDetail.java
@@ -0,0 +1,70 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ErrorDetail {
+    String title;
+    int status;
+    String detail;
+    long timeStamp;
+    String developerMessage;
+    Map<String, List<ValidationError>> errors;
+
+    public ErrorDetail(String title, int status, String detail, long timeStamp, String developerMessage) {
+        this.title = title;
+        this.status = status;
+        this.detail = detail;
+        this.timeStamp = timeStamp;
+        this.developerMessage = developerMessage;
+        this.errors = new HashMap<>();
+    }
+    public Map<String, List<ValidationError>> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(Map<String, List<ValidationError>> errors) {
+        this.errors = errors;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+}
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..c98bd08
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/error/ValidationError.java
@@ -0,0 +1,30 @@
+package io.zipcoder.tc_spring_poll_application.error;
+
+public class ValidationError {
+    String code;
+    String message;
+    public ValidationError(){
+
+    }
+
+    public ValidationError(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
new file mode 100644
index 0000000..91c2309
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java
@@ -0,0 +1,21 @@
+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..060562d
--- /dev/null
+++ b/src/main/java/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java
@@ -0,0 +1,65 @@
+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.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.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    private MessageSource messageSource;
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+        String title = "request not found";
+        int status =404;
+        String detail = rnfe.getMessage();
+        long timeStamp= new Date().getTime();
+        String developerMessage = rnfe.getStackTrace().toString();
+        ErrorDetail errorDetail = new ErrorDetail(title,status,detail,timeStamp,developerMessage);
+    return new ResponseEntity<>(errorDetail , HttpStatus.NOT_FOUND);
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<?>
+    handleValidationError(  MethodArgumentNotValidException manve,
+                            HttpServletRequest request) {
+        // create ErrorDetail object
+        String title = "Error: Method Argument Not Valid";
+        int status = 400;
+        String detail = manve.getMessage();
+        long timeStamp = new Date().getTime();
+        String developerMessage = manve.getStackTrace().toString();
+
+        // create ErrorDetail object
+        ErrorDetail errorDetail = new ErrorDetail(title, status, detail, timeStamp, developerMessage);
+        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..fff9ef8
--- /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}

From e44c58655ee828b2ea8cd408c53d3b114929a41e Mon Sep 17 00:00:00 2001
From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com>
Date: Sat, 14 Dec 2019 16:21:19 -0500
Subject: [PATCH 3/3] finished

---
 .../Controller/PollController.java                 | 11 +++++++----
 .../Repositories/PollRepository.java               |  3 ++-
 .../tc_spring_poll_application/domain/Poll.java    |  3 +--
 src/main/resources/import.sql                      | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 7 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 5d9bcc2..5575346 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.domain.Poll;
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 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;
@@ -11,6 +13,7 @@
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 import javax.validation.Valid;
+
 import java.net.URI;
 
 @RestController
@@ -25,9 +28,9 @@ public PollController(PollRepository pollRepository) {
     }
     @Valid
     @RequestMapping(value = "/polls", method = RequestMethod.GET)
-    public ResponseEntity<Iterable<Poll>> getAllPolls() {
-        Iterable<Poll> allPolls = pollRepository.findAll();
-        return new ResponseEntity<>(allPolls, HttpStatus.OK);
+    public ResponseEntity<Iterable<Poll>> getAllPolls(Pageable pageable) {
+        Page<Poll> allPolls = pollRepository.findAll(pageable);
+        return new ResponseEntity<Iterable<Poll>>(allPolls, HttpStatus.OK);
     }
     @Valid
     @RequestMapping(value = "/polls", method = RequestMethod.POST)
@@ -40,7 +43,7 @@ public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
                 .toUri();
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setLocation(newPollUri);
-        return new ResponseEntity<>("CREATES", HttpStatus.CREATED);
+        return new ResponseEntity<>(newPollUri, HttpStatus.CREATED);
     }
     @Valid
     @RequestMapping(value = "/polls/{pollId}", method = RequestMethod.GET)
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 67acfef..759be5f 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
@@ -3,8 +3,9 @@
 
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface PollRepository extends CrudRepository<Poll, Long> {
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {
 }
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 53693d3..5800e2c 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,14 +14,13 @@ public class Poll {
     @GeneratedValue
     @Column(name = "POLL_ID")
 private Long id;
+    @NotEmpty
     @Column(name = "QUESTION")
     private String question;
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
     @Size(min=2, max = 6)
-    @NotEmpty
-
     Set<Option> options;
 
     public Long getId() {
diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql
new file mode 100644
index 0000000..1beb8f3
--- /dev/null
+++ b/src/main/resources/import.sql
@@ -0,0 +1,14 @@
+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, 'golden', 1);
+   insert into option (option_id, option_value, poll_id) values (3, 'silver', 1);
+
+insert into poll (poll_id, question) values (2, 'What is your favorite color?');
+ insert into option (option_id, option_value, poll_id) values (4, 'Red', 2);
+  insert into option (option_id, option_value, poll_id) values (5, 'golden', 2);
+   insert into option (option_id, option_value, poll_id) values (6, 'silver', 2);
+
+   insert into poll (poll_id, question) values (3, 'What is your favorite color?');
+ insert into option (option_id, option_value, poll_id) values (7, 'Red', 3);
+  insert into option (option_id, option_value, poll_id) values (8, 'golden', 3);
+   insert into option (option_id, option_value, poll_id) values (9, 'silver', 3);
\ No newline at end of file