Finished lab

pom.xml

@@ -37,6 +37,11 @@
             <artifactId>hsqldb</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>javax.inject</groupId>

src/main/java/dtos/error/RestExceptionHandler.java

@@ -38,6 +38,15 @@ public class RestExceptionHandler {
     public ResponseEntity<?> handleValidationError(  MethodArgumentNotValidException manve, HttpServletRequest request){
         ErrorDetail errorDetail = new ErrorDetail();
         List<FieldError> fieldErrors =  manve.getBindingResult().getFieldErrors();
+        errorDetail.setTimeStamp(new Date().getTime());
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        String requestPath = (String) request.getAttribute("javax.servlet.error. request_uri");
+        if(requestPath == null) {
+            requestPath = request.getRequestURI();
+        }
+        errorDetail.setTitle("Validation Failed");
+        errorDetail.setDetail("Input validation failed");
+        errorDetail.setDeveloperMessage(manve.getClass().getName());
         for(FieldError fe : fieldErrors) {
 
             List<ValidationError> validationErrorList = errorDetail.getErrors().get(fe.getField());
@@ -50,15 +59,6 @@ public class RestExceptionHandler {
             validationError.setMessage(messageSource.getMessage(fe,null));
             validationErrorList.add(validationError);
         }
-        errorDetail.setTimeStamp(new Date().getTime());
-        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
-        String requestPath = (String) request.getAttribute("javax.servlet.error. request_uri");
-        if(requestPath == null) {
-            requestPath = request.getRequestURI();
-        }
-        errorDetail.setTitle("Validation Failed");
-        errorDetail.setDetail("Input validation failed");
-        errorDetail.setDeveloperMessage(manve.getClass().getName());
 
         return new ResponseEntity<>(errorDetail, HttpStatus.BAD_REQUEST);
     }

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

@@ -3,6 +3,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;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,6 +20,11 @@ public class PollController {
     @Inject
     private PollRepository pollRepository;
 
+    @Autowired
+    PollController(PollRepository pollRepository){
+        this.pollRepository = pollRepository;
+    }
+
     @RequestMapping(value="/polls", method= RequestMethod.GET)
     public ResponseEntity<Iterable<Poll>> getAllPolls() {
         Iterable<Poll> allPolls = pollRepository.findAll();

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

@@ -2,6 +2,7 @@ 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;
@@ -16,6 +17,11 @@ public class VoteController {
     @Inject
     private VoteRepository voteRepository;
 
+    @Autowired
+    public VoteController(VoteRepository voteRepository) {
+        this.voteRepository = voteRepository;
+    }
+
     @Valid
     @RequestMapping(value = "/polls/{pollId}/votes", method = RequestMethod.POST)
     public ResponseEntity<?> createVote(@PathVariable Long pollId, @RequestBody Vote

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

@@ -1,13 +1,9 @@
 package io.zipcoder.tc_spring_poll_application.domain;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @Entity
 public class Option {
-
     @Id
     @GeneratedValue
     @Column(name = "OPTION_ID")
@@ -16,6 +12,9 @@ public class Option {
     @Column(name = "OPTION_VALUE")
     private String value;
 
+    @Column(name = "POLL_ID")
+    private Long pollId;
+
     public long getId() {
         return id;
     }

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

@@ -19,7 +19,7 @@ public class Poll {
     private String question;
 
     @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn(name = "OPTION_ID")
+    @JoinColumn(name = "POLL_ID")
     @OrderBy
     @Size(min=2, max = 6)
     private Set<Option> options;

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

@@ -1,7 +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;
+import org.springframework.data.repository.PagingAndSortingRepository;
 
-public interface PollRepository extends CrudRepository<Poll, Long>{
+public interface PollRepository extends PagingAndSortingRepository<Poll, Long> {
 }

src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2-console

src/main/resources/import.sql

@@ -0,0 +1,88 @@
+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, 'Black', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Green', 1);
+
+
+insert into poll (poll_id, question) values (2, 'What is your favorite band?');
+insert into option (option_id, option_value, poll_id) values (4, 'Tool', 2);
+insert into option (option_id, option_value, poll_id) values (5, 'Carpenter Brut', 2);
+insert into option (option_id, option_value, poll_id) values (6, 'Fleetwood Mac', 2);
+
+
+insert into poll (poll_id, question) values (3, 'What is your favorite tv show?');
+insert into option (option_id, option_value, poll_id) values (7, 'Altered Carbon', 3);
+insert into option (option_id, option_value, poll_id) values (8, 'My Little Pony', 3);
+insert into option (option_id, option_value, poll_id) values (9, 'Game of Thrones', 3);
+
+
+insert into poll (poll_id, question) values (4, 'What is your favorite flower?');
+insert into option (option_id, option_value, poll_id) values (10, 'Lilly', 4);
+insert into option (option_id, option_value, poll_id) values (11, 'Rose', 4);
+insert into option (option_id, option_value, poll_id) values (12, 'Tulip', 4);
+
+
+insert into poll (poll_id, question) values (5, 'What is your favorite type of tree?');
+insert into option (option_id, option_value, poll_id) values (13, 'Oak', 5);
+insert into option (option_id, option_value, poll_id) values (14, 'Birch', 5);
+insert into option (option_id, option_value, poll_id) values (15, 'Willow', 5);
+
+
+insert into poll (poll_id, question) values (6, 'What is your favorite type of alcohol?');
+insert into option (option_id, option_value, poll_id) values (16, 'Whiskey', 6);
+insert into option (option_id, option_value, poll_id) values (17, 'Vodka', 6);
+insert into option (option_id, option_value, poll_id) values (18, 'Gin', 6);
+
+
+insert into poll (poll_id, question) values (7, 'What is your favorite pizza topping?');
+insert into option (option_id, option_value, poll_id) values (19, 'Pineapple', 7);
+insert into option (option_id, option_value, poll_id) values (20, 'Pepperoni', 7);
+insert into option (option_id, option_value, poll_id) values (21, 'Chicken', 7);
+
+
+insert into poll (poll_id, question) values (8, 'What is your favorite cheese?');
+insert into option (option_id, option_value, poll_id) values (22, 'Brie', 8);
+insert into option (option_id, option_value, poll_id) values (23, 'Pepper Jack', 8);
+insert into option (option_id, option_value, poll_id) values (24, 'American', 8);
+
+
+insert into poll (poll_id, question) values (9, 'What is your favorite snimsl?');
+insert into option (option_id, option_value, poll_id) values (25, 'Cat', 9);
+insert into option (option_id, option_value, poll_id) values (26, 'Tiger', 9);
+insert into option (option_id, option_value, poll_id) values (27, 'Pony', 9);
+
+
+insert into poll (poll_id, question) values (10, 'What is your favorite Lovecraft monster?');
+insert into option (option_id, option_value, poll_id) values (28, 'Cthulu', 10);
+insert into option (option_id, option_value, poll_id) values (29, 'Azathoth', 10);
+insert into option (option_id, option_value, poll_id) values (30, 'Dagon', 10);
+
+
+insert into poll (poll_id, question) values (11, 'What is your favorite Roman Emperor?');
+insert into option (option_id, option_value, poll_id) values (31, 'Tiberius', 11);
+insert into option (option_id, option_value, poll_id) values (32, 'Caligula', 11);
+insert into option (option_id, option_value, poll_id) values (33, 'Nero', 11);
+
+
+insert into poll (poll_id, question) values (12, 'What is your favorite Batman villian?');
+insert into option (option_id, option_value, poll_id) values (34, 'Joker', 12);
+insert into option (option_id, option_value, poll_id) values (35, 'Bane', 12);
+insert into option (option_id, option_value, poll_id) values (36, 'Clayface', 12);
+
+
+insert into poll (poll_id, question) values (13, 'What is your favorite American President?');
+insert into option (option_id, option_value, poll_id) values (37, 'Donald Trumo', 13);
+insert into option (option_id, option_value, poll_id) values (38, 'William Taft', 13);
+insert into option (option_id, option_value, poll_id) values (39, 'William Henry Harrison', 13);
+
+
+insert into poll (poll_id, question) values (14, 'What is your favorite phone brand?');
+insert into option (option_id, option_value, poll_id) values (40, 'iPhone', 14);
+insert into option (option_id, option_value, poll_id) values (41, 'Android', 14);
+insert into option (option_id, option_value, poll_id) values (42, 'Windows', 14);
+
+
+insert into poll (poll_id, question) values (15, 'What is your favorite landmark?');
+insert into option (option_id, option_value, poll_id) values (43, 'Pyramids', 15);
+insert into option (option_id, option_value, poll_id) values (44, 'Hanging Gardens', 15);
+insert into option (option_id, option_value, poll_id) values (45, 'Colossus of Rhodes', 15);