saving for the night

README.md

@@ -1,12 +1,12 @@
 # Poll Application
 * **Purpose**
-	* to demonstrate the basic functionality of the [Spring Framework](https://spring.io/)
+	* to demonstrate the basic functionality of the [Spring Framework](https://spring.quickpoll.io/)
 	* to demonstrate API testing via [Postman](https://chrome.google.com/webstore/detail/postman/fhbjgbiflinjbdggehcddcbncdddomop?hl=en)
 
 # Part 1 - Domain Implementation
 
 * _Domain objects_ are the backbone for an application and contain the [business logic](https://en.wikipedia.org/wiki/Business_logic).
-* Create a sub package of `io.zipcoder.tc_spring_poll_application` named `domain`.
+* Create a sub package of `quickpoll.io.zipcoder.tc_spring_poll_application` named `domain`.
 
 
 ## Part 1.1 - Create class `Option`
@@ -76,7 +76,7 @@
 * _Repositories_ or [Data Access Objects (DAO)](https://en.wikipedia.org/wiki/Data_access_object), provide an abstraction for interacting with _datastores_.
 * Typically DAOs include an interface that provides a set of finder methods such as `findById`, `findAll`, for retrieving data, and methods to persist and delete data.
 * It is customary to have one `Repository` per `domain` object.
-* Create a sub-package of `io.zipcoder.tc_spring_poll_application` named `repositories`.
+* Create a sub-package of `quickpoll.io.zipcoder.tc_spring_poll_application` named `repositories`.
 
 
 ## Part 2.1 - Create interface `OptionRepository`
@@ -100,7 +100,7 @@
 
 * _Controllers_ provides all of the necessary [endpoints](https://en.wikipedia.org/wiki/Web_API#Endpoints) to access and manipulate respective domain objects.
 	*  REST resources are identified using URI endpoints.
-* Create a sub package of `io.zipcoder.tc_spring_poll_application` named `controller`.
+* Create a sub package of `quickpoll.io.zipcoder.tc_spring_poll_application` named `controller`.
 
 
 ## Part 3.1 - Create class `PollController`
@@ -132,7 +132,7 @@ public ResponseEntity<Iterable<Poll>> getAllPolls() {
 
 ### Part 3.1.2 - Testing via Postman
 
-* Ensure that the `start-class` tag in your `pom.xml` encapsulates `io.zipcoder.springdemo.QuickPollApplication`
+* Ensure that the `start-class` tag in your `pom.xml` encapsulates `quickpoll.io.zipcoder.springdemo.QuickPollApplication`
 * Open a command line and navigate to the project's root directory and run this command:
 	* `mvn spring-boot:run`
 * Launch the [Postman](https://chrome.google.com/webstore/detail/postman/fhbjgbiflinjbdggehcddcbncdddomop?hl=en) app and enter the URI `http://localhost:8080/polls` and hit Send.
@@ -347,7 +347,7 @@ public Iterable<Vote> getVote(@PathVariable Long pollId) {
 
 * The final piece remaining for us is the implementation of the ComputeResult resource.
 * Because we don’t have any domain objects that can directly help generate this resource representation, we implement two Data Transfer Objects or DTOs—OptionCount and VoteResult
-* Create a sub package of `java` named `dtos`
+* Create a sub package of `java` named `quickpoll.dtos`
 
 
 ## Part 4.1 - Create class `OptionCount`
@@ -445,7 +445,7 @@ public class ComputeResultController {
 
 ## Part 5.1 - Create `ResourceNotFoundException`
 
-- Create a `exception` package inside of `io.zipcoder.springdemo.QuickPollApplication`
+- Create a `exception` package inside of `quickpoll.io.zipcoder.springdemo.QuickPollApplication`
 - Create a `ResourceNotFoundException` class that extends `RuntimeException`. We'll use this to signal when a requested resource is not found.
 - Annotate the `ResourceNotFoundException` class with `@ResponseStatus(HttpStatus.NOT_FOUND)`. This informs Spring that any request mapping that throws a `ResourceNotFoundException` should result in a `404 NOT FOUND` http status.
 - Implement three constructors
@@ -462,7 +462,7 @@ Create a void method in `PollController` called `verifyPoll` that checks if a sp
 
 ## Part 5.3 - Create custom Error Responses
 
-Spring provides some built-in exception handling and error response, but we'll customize it a bit here. Create an `ErrorDetail` class in a new `io.zipcoder.tc_spring_poll_application.dto.error` package to hold relevant information any time an error occurs.
+Spring provides some built-in exception handling and error response, but we'll customize it a bit here. Create an `ErrorDetail` class in a new `quickpoll.io.zipcoder.tc_spring_poll_application.dto.error` package to hold relevant information any time an error occurs.
 
 Fields (Don't forget to provide getters and setters):
 
@@ -501,7 +501,7 @@ Now it's time to make sure that all objects persisted to the database actually c
 
 ## Part 5.5 - Customizing validation errors
 
-In order to customize validation errors we'll need a class for error information. Create a `ValidationError` class in `io.zipcoder.tc_spring_poll_application.dto.error` with the following fields and appropriate getters and setters:
+In order to customize validation errors we'll need a class for error information. Create a `ValidationError` class in `quickpoll.io.zipcoder.tc_spring_poll_application.dto.error` with the following fields and appropriate getters and setters:
 
 - `String code`
 - `String message`

pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.zipcoder</groupId>
+    <groupId>quickpoll.io.zipcoder</groupId>
     <artifactId>spring-demo</artifactId>
     <version>1.0-SNAPSHOT</version>
     <parent>
@@ -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>quickpoll.QuickPollApplication</start-class>
         <java.version>1.7</java.version>
     </properties>
     <dependencies>

src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java

@@ -1,31 +0,0 @@
-package io.zipcoder.tc_spring_poll_application.controller;
-
-import io.zipcoder.tc_spring_poll_application.domain.Poll;
-import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.inject.Inject;
-
-@RestController
-public class PollController {
-   @Inject
-    private PollRepository pollRepository;
-
-   @RequestMapping(value="/polls", method = RequestMethod.GET)
-   public ResponseEntity<Iterable<Poll>> getAllPolls() {
-       Iterable<Poll> allPolls = pollRepository.findAll();
-       return new ResponseEntity<>(allPolls, HttpStatus.OK);
-   }
-
-   @RequestMapping(value = "/polls", method = RequestMethod.POST)
-   public ResponseEntity<?> createPoll(@RequestBody Poll poll) {
-       poll = pollRepository.save(poll);
-       return new ResponseEntity<>(null, HttpStatus.CREATED);
-   }
-
-}

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java

@@ -1,7 +0,0 @@
-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> {
-}

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java

@@ -1,7 +0,0 @@
-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> {
-}

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java

@@ -1,7 +0,0 @@
-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> {
-}

src/main/java/io/zipcoder/tc_spring_poll_application/QuickPollApplication.java → src/main/java/quickpoll/QuickPollApplication.java

@@ -1,4 +1,4 @@
-package io.zipcoder.tc_spring_poll_application;
+package quickpoll;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/quickpoll/dtos/ComputeResultController.java

@@ -0,0 +1,32 @@
+package quickpoll.dtos;
+
+import quickpoll.io.zipcoder.tc_spring_poll_application.domain.Vote;
+import quickpoll.io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.inject.Inject;
+
+@RestController
+public class ComputeResultController {
+    @Inject
+    private VoteRepository voteRepository;
+
+    @RequestMapping(value = "/computeresult", method = RequestMethod.GET)
+    public ResponseEntity<?> computeResult(@RequestParam Long pollId) {
+        VoteResult voteResult = new VoteResult();
+        Iterable<Vote> allVotes = voteRepository.findVotesByPoll(pollId);
+
+        //TODO: count votes
+//        for(Vote v : allVotes){
+//
+//        }
+        voteResult.setTotalVotes(200);
+
+        return new ResponseEntity<VoteResult>(voteResult, HttpStatus.OK);
+    }
+}

src/main/java/quickpoll/dtos/OptionCount.java

@@ -0,0 +1,22 @@
+package quickpoll.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;
+    }
+}

src/main/java/quickpoll/dtos/VoteResult.java

@@ -0,0 +1,23 @@
+package quickpoll.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;
+    }
+}

src/main/java/quickpoll/dtos/error/ErrorDetail.java

@@ -0,0 +1,49 @@
+package quickpoll.dtos.error;
+
+public class ErrorDetail {
+    private String title;
+    private int status;
+    private String detail;
+    private long timeStamp;
+    private String developerMessage;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(long timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getDeveloperMessage() {
+        return developerMessage;
+    }
+
+    public void setDeveloperMessage(String developerMessage) {
+        this.developerMessage = developerMessage;
+    }
+}

src/main/java/quickpoll/dtos/error/ValidationError.java

@@ -0,0 +1,22 @@
+package quickpoll.dtos.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;
+    }
+}

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/controller/PollController.java

@@ -0,0 +1,67 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application.controller;
+
+import quickpoll.io.zipcoder.tc_spring_poll_application.domain.Poll;
+import quickpoll.io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
+import quickpoll.io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import javax.inject.Inject;
+import javax.validation.Valid;
+import java.net.URI;
+
+
+@RestController
+public class PollController {
+   @Inject
+    private PollRepository pollRepository;
+
+   @RequestMapping(value="/polls", method = RequestMethod.GET)
+   public ResponseEntity<Iterable<Poll>> getAllPolls() {
+       Iterable<Poll> allPolls = pollRepository.findAll();
+       return new ResponseEntity<>(allPolls, HttpStatus.OK);
+   }
+
+
+   @Valid
+   @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 header = new HttpHeaders();
+       header.setLocation(newPollUri);
+       return new ResponseEntity<>(header, HttpStatus.CREATED);
+   }
+
+   @RequestMapping(value="/polls/{pollId}", method = RequestMethod.GET)
+    public ResponseEntity<?> getPoll(@PathVariable Long pollId) {
+       verifyPoll(pollId);
+       Poll p = pollRepository.findOne(pollId);
+       return new ResponseEntity<>(p, HttpStatus.OK);
+   }
+
+   @Valid
+   @RequestMapping(value="/polls/{pollId}", method = RequestMethod.PUT)
+   public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId){
+       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){
+       if(pollRepository.findOne(pollId) == null){
+           throw new ResourceNotFoundException("Poll Not Found");
+       }
+   }
+
+}

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/controller/VoteController.java

@@ -0,0 +1,35 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application.controller;
+
+import quickpoll.io.zipcoder.tc_spring_poll_application.domain.Vote;
+import quickpoll.io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import javax.inject.Inject;
+
+@RestController
+public class VoteController {
+    @Inject
+    private VoteRepository voteRepository;
+
+    @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
+    public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote vote) {
+        vote = voteRepository.save(vote);
+        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);
+    }
+}

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Option.java → src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/domain/Option.java

@@ -1,4 +1,4 @@
-package io.zipcoder.tc_spring_poll_application.domain;
+package quickpoll.io.zipcoder.tc_spring_poll_application.domain;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Poll.java → src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/domain/Poll.java

@@ -1,8 +1,9 @@
-package io.zipcoder.tc_spring_poll_application.domain;
+package quickpoll.io.zipcoder.tc_spring_poll_application.domain;
 
-import com.sun.javafx.beans.IDProperty;
+import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.persistence.*;
+import javax.validation.constraints.Size;
 import java.util.Set;
 
 @Entity
@@ -13,11 +14,13 @@ public class Poll {
     private Long id;
 
     @Column(name = "QUESTION")
+    @NotEmpty
     private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "POLL_ID")
     @OrderBy
+    @Size(min=2, max=6)
     private Set<Option> options;
 
     public Long getId() {

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java → src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/domain/Vote.java

@@ -1,4 +1,4 @@
-package io.zipcoder.tc_spring_poll_application.domain;
+package quickpoll.io.zipcoder.tc_spring_poll_application.domain;
 
 import javax.persistence.*;
 

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/exception/ResourceNotFoundException.java

@@ -0,0 +1,18 @@
+package quickpoll.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);
+    }
+}

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/exception/RestExceptionHandler.java

@@ -0,0 +1,24 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import quickpoll.dtos.error.ErrorDetail;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+@ControllerAdvice
+public class RestExceptionHandler {
+
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setTitle("Resource Not Found");
+        errorDetail.setStatus(404);
+        errorDetail.setDetail(rnfe.getMessage());
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setDeveloperMessage(rnfe.getStackTrace().toString());
+
+        return new ResponseEntity<>(errorDetail, HttpStatus.NOT_FOUND);
+    }
+}

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/repositories/OptionRepository.java

@@ -0,0 +1,7 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application.repositories;
+
+import quickpoll.io.zipcoder.tc_spring_poll_application.domain.Option;
+import org.springframework.data.repository.CrudRepository;
+
+public interface OptionRepository extends CrudRepository<Option, Long> {
+}

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/repositories/PollRepository.java

@@ -0,0 +1,7 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application.repositories;
+
+import quickpoll.io.zipcoder.tc_spring_poll_application.domain.Poll;
+import org.springframework.data.repository.CrudRepository;
+
+public interface PollRepository extends CrudRepository<Poll,Long> {
+}

src/main/java/quickpoll/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java

@@ -0,0 +1,14 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application.repositories;
+
+import quickpoll.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);
+
+}

src/test/java/io/zipcoder/tc_spring_poll_application/QuickPollApplicationTest.java

@@ -1,4 +0,0 @@
-package io.zipcoder.tc_spring_poll_application;
-
-public class QuickPollApplicationTest {
-}

src/test/java/quickpoll/io/zipcoder/tc_spring_poll_application/QuickPollApplicationTest.java

@@ -0,0 +1,4 @@
+package quickpoll.io.zipcoder.tc_spring_poll_application;
+
+public class QuickPollApplicationTest {
+}