done

schools/javadocs/com/lambdaschool/zoos/services/ZooServiceImpl.html

@@ -376,7 +376,7 @@ <h4>update</h4>
 <h4>delete</h4>
 <pre class="methodSignature">@Transactional
 public&nbsp;void&nbsp;delete&#8203;(long&nbsp;id)
-            throws javax.persistence.EntityNotFoundException</pre>
+            throws javax.persistence.ResourceNotFoundException</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="ZooService.html#delete(long)">ZooService</a></code></span></div>
 <div class="block">Deletes the course record, it student course combinations, and its telephone items from the database based off of the provided primary key</div>
 <dl>
@@ -385,7 +385,7 @@ <h4>delete</h4>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>id</code> - id The primary key (long) of the course you seek.</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>javax.persistence.EntityNotFoundException</code></dd>
+<dd><code>javax.persistence.ResourceNotFoundException</code></dd>
 </dl>
 </li>
 </ul>
@@ -438,7 +438,7 @@ <h4>saveZooAnimalCombo</h4>
 <li class="blockList">
 <h4>findZooByLikeName</h4>
 <pre class="methodSignature">public&nbsp;java.util.ArrayList&lt;<a href="../models/Zoo.html" title="class in com.lambdaschool.schools.models">Zoo</a>&gt;&nbsp;findZooByLikeName&#8203;(java.lang.String&nbsp;name)
-                                           throws javax.persistence.EntityNotFoundException</pre>
+                                           throws javax.persistence.ResourceNotFoundException</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="ZooService.html#findZooByLikeName(java.lang.String)">ZooService</a></code></span></div>
 <div class="block">A list of all zoos whose name contains the given substring
  A Stretch Goal</div>
@@ -450,7 +450,7 @@ <h4>findZooByLikeName</h4>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>List of zoos whose name contains the given substring</dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>javax.persistence.EntityNotFoundException</code></dd>
+<dd><code>javax.persistence.ResourceNotFoundException</code></dd>
 </dl>
 </li>
 </ul>

schools/src/main/java/com/lambdaschool/schools/exceptions/CustomErrorDetails.java

@@ -0,0 +1,33 @@
+package com.lambdaschool.schools.exceptions;
+
+import com.lambdaschool.schools.services.HelperFunctions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.WebRequest;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Component
+public class CustomErrorDetails extends DefaultErrorAttributes {
+
+    @Autowired
+    HelperFunctions helperFunctions;
+
+    @Override
+    public Map<String, Object> getErrorAttributes(WebRequest webRequest, boolean includeStackTrace) {
+        Map<String, Object> errorAttributes = super.getErrorAttributes(webRequest, includeStackTrace);
+
+        Map<String, Object> errorDetails = new LinkedHashMap<>();
+        errorDetails.put("title", errorAttributes.get("error"));
+        errorDetails.put("status", errorAttributes.get("status"));
+        errorDetails.put("detail", "Found an issue with School: " + errorAttributes.get("message"));
+        errorDetails.put("timestamp", errorAttributes.get("timestamp"));
+        errorDetails.put("developer", "Path: " + errorAttributes.get("path"));
+        errorDetails.put("errors", helperFunctions.getConstraintViolation(this.getError(webRequest)));
+        return errorDetails;
+
+
+    }
+}

schools/src/main/java/com/lambdaschool/schools/exceptions/ResourceFoundException.java

@@ -0,0 +1,8 @@
+package com.lambdaschool.schools.exceptions;
+
+public class ResourceFoundException extends RuntimeException{
+
+    public ResourceFoundException(String message) {
+        super(message);
+    }
+}

schools/src/main/java/com/lambdaschool/schools/exceptions/ResourceNotFoundException.java

@@ -0,0 +1,8 @@
+package com.lambdaschool.schools.exceptions;
+
+public class ResourceNotFoundException extends RuntimeException{
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+}

schools/src/main/java/com/lambdaschool/schools/handlers/RestExceptionHandler.java

@@ -0,0 +1,69 @@
+package com.lambdaschool.schools.handlers;
+
+import com.lambdaschool.schools.exceptions.ResourceFoundException;
+import com.lambdaschool.schools.exceptions.ResourceNotFoundException;
+import com.lambdaschool.schools.models.ErrorDetail;
+import com.lambdaschool.schools.services.HelperFunctions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
+import java.util.Date;
+
+@RestControllerAdvice
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class RestExceptionHandler extends ResponseEntityExceptionHandler {
+
+    @Autowired
+    HelperFunctions helperFunctions;
+
+    @Override
+    protected ResponseEntity<Object> handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setDetail("Found an issue with School: " + ex.getMessage());
+        errorDetail.setErrors(helperFunctions.getConstraintViolation(ex));
+        errorDetail.setDeveloper(ex.getClass().getName());
+        errorDetail.setStatus(status.value());
+        errorDetail.setTimestamp(new Date());
+        errorDetail.setTitle("Rest Internal Exception");
+        return new ResponseEntity<>(errorDetail, headers, status);
+    }
+
+    @ExceptionHandler(ResourceNotFoundException.class)
+    public ResponseEntity<?> handleResourceNotFoundException(ResourceNotFoundException ex)
+    {
+
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setDetail("Found an issue with School: " + ex.getMessage());
+        errorDetail.setErrors(helperFunctions.getConstraintViolation(ex));
+        errorDetail.setDeveloper(ex.getClass().getName());
+        errorDetail.setStatus(HttpStatus.NOT_FOUND.value());
+        errorDetail.setTimestamp(new Date());
+        errorDetail.setTitle("Resource Not Found.");
+        return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND);
+
+    }
+
+    @ExceptionHandler(ResourceFoundException.class)
+    public ResponseEntity<?> handleResourceFoundException(ResourceFoundException ex)
+    {
+
+        ErrorDetail errorDetail = new ErrorDetail();
+        errorDetail.setDetail("Found an issue with School: " + ex.getMessage());
+        errorDetail.setErrors(helperFunctions.getConstraintViolation(ex));
+        errorDetail.setDeveloper(ex.getClass().getName());
+        errorDetail.setStatus(HttpStatus.BAD_REQUEST.value());
+        errorDetail.setTimestamp(new Date());
+        errorDetail.setTitle("Unexpected Resource.");
+        return new ResponseEntity<>(errorDetail, null, HttpStatus.BAD_REQUEST);
+
+    }
+
+}

schools/src/main/java/com/lambdaschool/schools/models/ErrorDetail.java

@@ -0,0 +1,68 @@
+package com.lambdaschool.schools.models;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ErrorDetail {
+
+    private String title;
+    private int status;
+    private String detail;
+    private Date timestamp;
+    private String developer;
+    private List<ValidationError> errors = new ArrayList<>();
+
+    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 Date getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Date timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getDeveloper() {
+        return developer;
+    }
+
+    public void setDeveloper(String developer) {
+        this.developer = developer;
+    }
+
+    public List<ValidationError> getErrors() {
+        return errors;
+    }
+
+    public void setErrors(List<ValidationError> errors) {
+        this.errors = errors;
+    }
+
+    public ErrorDetail() {
+    }
+
+
+}

schools/src/main/java/com/lambdaschool/schools/models/ValidationError.java

@@ -0,0 +1,26 @@
+package com.lambdaschool.schools.models;
+
+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;
+    }
+
+    public ValidationError() {
+    }
+}

schools/src/main/java/com/lambdaschool/schools/services/CoursesServiceImpl.java

@@ -1,5 +1,6 @@
 package com.lambdaschool.schools.services;
 
+import com.lambdaschool.schools.exceptions.ResourceNotFoundException;
 import com.lambdaschool.schools.models.Course;
 import com.lambdaschool.schools.models.Instructor;
 import com.lambdaschool.schools.models.StudCourses;
@@ -11,7 +12,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,15 +58,15 @@ public List<Course> findAll()
     public Course findCourseById(long id)
     {
         return courserepos.findById(id)
-            .orElseThrow(() -> new EntityNotFoundException("Course id " + id + " not found!"));
+            .orElseThrow(() -> new ResourceNotFoundException("Course id " + id + " not found!"));
     }
 
     @Transactional
     @Override
     public void delete(long id)
     {
         courserepos.findById(id)
-            .orElseThrow(() -> new EntityNotFoundException("Course id " + id + " not found!"));
+            .orElseThrow(() -> new ResourceNotFoundException("Course id " + id + " not found!"));
         courserepos.deleteById(id);
     }
 
@@ -79,15 +79,15 @@ public Course save(Course course)
         if (course.getCourseid() != 0)
         {
             Course oldCourse = courserepos.findById(course.getCourseid())
-                .orElseThrow(() -> new EntityNotFoundException("Course id " + course.getCourseid() + " not found!"));
+                .orElseThrow(() -> new ResourceNotFoundException("Course id " + course.getCourseid() + " not found!"));
 
             newCourse.setCourseid(course.getCourseid());
         }
 
         newCourse.setCoursename(course.getCoursename());
         Instructor newInstructor = instructorrepos.findById(course.getInstructor()
             .getInstructorid())
-            .orElseThrow(() -> new EntityNotFoundException("Instructor id " + course.getInstructor()
+            .orElseThrow(() -> new ResourceNotFoundException("Instructor id " + course.getInstructor()
                 .getInstructorid() + " not found!"));
         newCourse.setInstructor(newInstructor);
 
@@ -97,7 +97,7 @@ public Course save(Course course)
         {
             Student newStudent = studentrepos.findById(sc.getStudent()
                 .getStudentid())
-                .orElseThrow(() -> new EntityNotFoundException("Instructor id " + sc.getStudent()
+                .orElseThrow(() -> new ResourceNotFoundException("Instructor id " + sc.getStudent()
                     .getStudentid() + " not found!"));
 
             newCourse.getStudents()

schools/src/main/java/com/lambdaschool/schools/services/HelperFunctions.java

@@ -0,0 +1,11 @@
+package com.lambdaschool.schools.services;
+
+import com.lambdaschool.schools.models.ValidationError;
+
+import java.util.List;
+
+public interface HelperFunctions {
+
+    List<ValidationError> getConstraintViolation(Throwable cause);
+
+}

schools/src/main/java/com/lambdaschool/schools/services/HelperFunctionsImpl.java

@@ -0,0 +1,58 @@
+package com.lambdaschool.schools.services;
+
+import com.lambdaschool.schools.models.ValidationError;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+
+import org.hibernate.exception.ConstraintViolationException;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service(value = "helperFunctions")
+public class HelperFunctionsImpl implements HelperFunctions{
+
+    @Override
+    public List<ValidationError> getConstraintViolation(Throwable cause) {
+        List<ValidationError> listVE = new ArrayList<>();
+
+        while((cause != null) && !(cause instanceof ConstraintViolationException || cause instanceof MethodArgumentNotValidException))
+        {
+
+            cause = cause.getCause();
+
+        }
+
+        if (cause != null)
+        {
+            if(cause instanceof ConstraintViolationException)
+            {
+                ValidationError newVE = new ValidationError();
+                ConstraintViolationException eX = (ConstraintViolationException) cause;
+                newVE.setCode(eX.getMessage());
+                newVE.setMessage(eX.getConstraintName());
+                listVE.add(newVE);
+            } else
+            {
+
+                MethodArgumentNotValidException ex = (MethodArgumentNotValidException) cause;
+                List<FieldError> fieldErrors = ex.getBindingResult().getFieldErrors();
+
+                for(FieldError fe : fieldErrors)
+                {
+
+                    ValidationError newVE = new ValidationError();
+                    newVE.setCode(fe.getField());
+                    newVE.setMessage(fe.getDefaultMessage());
+                    listVE.add(newVE);
+
+                }
+
+            }
+        }
+
+        return listVE;
+    }
+}