sql

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

@@ -3,19 +3,28 @@ package io.zipcoder.tc_spring_poll_application.exception;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 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 org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 @ControllerAdvice
 public class RestExceptionHandler {
 
+    @Autowired
+    @Inject
+    private MessageSource messageSource;
+
     @ExceptionHandler(ResourceNotFoundException.class)
     public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) {
         ErrorDetail errorDetail = new ErrorDetail();
@@ -28,7 +37,8 @@ public class RestExceptionHandler {
     }
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseEntity<?> handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public @ResponseBody ErrorDetail handleValidationError(MethodArgumentNotValidException manve, HttpServletRequest request) {
         ErrorDetail errorDetail = new ErrorDetail();
         // Populate errorDetail instance
         errorDetail.setTimeStamp(new Date().getTime());
@@ -49,10 +59,10 @@ public class RestExceptionHandler {
             }
             ValidationError validationError = new ValidationError();
             validationError.setCode(fe.getCode());
-            validationError.setMessage(fe.getDefaultMessage());
+            validationError.setMessage(messageSource.getMessage(fe, null));
             validationErrorList.add(validationError);
         }
-        return new ResponseEntity<>(errorDetail, null, HttpStatus. BAD_REQUEST);
+        return errorDetail;
     }
 
 }

src/main/resources/import.sql

@@ -0,0 +1,37 @@
+insert into poll (poll_id, question) values (1, 'What is your favorite color?');
+insert into poll (poll_id, question) values (2, 'What is your favorite anime?');
+insert into poll (poll_id, question) values (3, 'What is your favorite game?');
+insert into poll (poll_id, question) values (4, 'What is your favorite instructor?');
+insert into poll (poll_id, question) values (5, 'What is your favorite ide?');
+insert into poll (poll_id, question) values (6, 'What is your favorite Dark Souls?');
+
+insert into option (option_id, option_value, poll_id) values (1, 'Red', 1);
+insert into option (option_id, option_value, poll_id) values (2, 'Green', 1);
+insert into option (option_id, option_value, poll_id) values (3, 'Blue', 1);
+insert into option (option_id, option_value, poll_id) values (4, 'Pink', 1);
+insert into option (option_id, option_value, poll_id) values (5, 'Yellow', 1);
+
+insert into option (option_id, option_value, poll_id) values (1, 'Phantom Blood', 2);
+insert into option (option_id, option_value, poll_id) values (2, 'Battle Tendency', 2);
+insert into option (option_id, option_value, poll_id) values (3, 'Stardust Crusaders', 2);
+insert into option (option_id, option_value, poll_id) values (4, 'Diamond is Unbreakable', 2);
+
+insert into option (option_id, option_value, poll_id) values (1, 'Cuphead', 3);
+insert into option (option_id, option_value, poll_id) values (2, 'Hotline Miami', 3);
+insert into option (option_id, option_value, poll_id) values (3, 'Hotline Miami 2', 3);
+
+insert into option (option_id, option_value, poll_id) values (1, 'Leon', 4);
+insert into option (option_id, option_value, poll_id) values (2, 'Chris', 4);
+insert into option (option_id, option_value, poll_id) values (3, 'Wilhem', 4);
+insert into option (option_id, option_value, poll_id) values (4, 'Not Tariq', 4);
+
+insert into option (option_id, option_value, poll_id) values (1, 'Eclipse', 5);
+insert into option (option_id, option_value, poll_id) values (2, 'Net Beans', 5);
+insert into option (option_id, option_value, poll_id) values (3, 'IntelliJ', 5);
+insert into option (option_id, option_value, poll_id) values (4, 'ides are for babies', 5);
+
+insert into option (option_id, option_value, poll_id) values (1, '1', 6);
+insert into option (option_id, option_value, poll_id) values (2, '2', 6);
+insert into option (option_id, option_value, poll_id) values (3, '3', 6);
+insert into option (option_id, option_value, poll_id) values (4, 'Demons', 6);
+insert into option (option_id, option_value, poll_id) values (5, 'BB', 6);