BENCH-155 add validation exception with error map

AudriusPutys · AudriusPutys · commit 84797b5bb956 · 2022-11-18T16:20:39.000Z
diff --git a/src/main/java/com/answerdigital/answerking/exception/AnswerKingException.java b/src/main/java/com/answerdigital/answerking/exception/AnswerKingException.java
@@ -1,6 +1,9 @@
 package com.answerdigital.answerking.exception;
 
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
@@ -15,20 +18,36 @@ public abstract class AnswerKingException extends RuntimeException {
 
     private final String detail;
 
-    private final Collection<String> errors;
+    private final Map<String, Collection<String>> errors = new HashMap<>();
+    private final String error;
 
     protected AnswerKingException(
             final String type,
             final String title,
             final HttpStatus status,
             final String detail,
-            final Collection<String> errors
+            final Map<String, Collection<String>> errors
     ) {
         super(errors.toString());
         this.type = type;
         this.title = title;
         this.status = status;
         this.detail = detail;
-        this.errors = errors;
+        this.errors.putAll(errors);
+        this.error = "";
+    }
+    protected AnswerKingException(
+            final String type,
+            final String title,
+            final HttpStatus status,
+            final String detail,
+            final String error
+    ) {
+        super(error);
+        this.type = type;
+        this.title = title;
+        this.status = status;
+        this.detail = detail;
+        this.error = error;
     }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/NameUnavailableException.java b/src/main/java/com/answerdigital/answerking/exception/custom/NameUnavailableException.java
@@ -5,9 +5,6 @@
 import java.util.Collection;
 
 public class NameUnavailableException extends BadRequestException {
-    public NameUnavailableException(final Collection<String> errors) {
-        super(errors);
-    }
 
     public NameUnavailableException(final String error) {
         super(error);
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/ProductAlreadyPresentException.java b/src/main/java/com/answerdigital/answerking/exception/custom/ProductAlreadyPresentException.java
@@ -5,9 +5,6 @@
 import java.util.Collection;
 
 public class ProductAlreadyPresentException extends BadRequestException {
-    public ProductAlreadyPresentException(final Collection<String> errors) {
-        super(errors);
-    }
 
     public ProductAlreadyPresentException(final String error) {
         super(error);
diff --git a/src/main/java/com/answerdigital/answerking/exception/custom/RetirementException.java b/src/main/java/com/answerdigital/answerking/exception/custom/RetirementException.java
@@ -16,11 +16,8 @@ public class RetirementException extends AnswerKingException {
 
     private static final String DETAIL = null;
 
-    public RetirementException(final Collection<String> errors) {
+    public RetirementException(final String errors) {
         super(TYPE, TITLE, STATUS, DETAIL, errors);
     }
 
-    public RetirementException(final String error) {
-        this(List.of(error));
-    }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/BadRequestException.java b/src/main/java/com/answerdigital/answerking/exception/generic/BadRequestException.java
@@ -5,6 +5,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 public class BadRequestException extends AnswerKingException {
 
@@ -16,11 +17,10 @@ public class BadRequestException extends AnswerKingException {
 
     private static final String DETAIL = null;
 
-    public BadRequestException(final Collection<String> errors) {
-        super(TYPE, TITLE, STATUS, DETAIL, errors);
-    }
-
     public BadRequestException(final String error) {
-        this(List.of(error));
+        super(TYPE, TITLE, STATUS, DETAIL, error);
+    }
+    public BadRequestException(final Map<String, Collection<String>> errors, String detail) {
+        super(TYPE, TITLE, STATUS, detail, errors);
     }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/ConflictException.java b/src/main/java/com/answerdigital/answerking/exception/generic/ConflictException.java
@@ -16,11 +16,8 @@ public class ConflictException extends AnswerKingException {
 
     private static final String DETAIL = null;
 
-    public ConflictException(final Collection<String> errors) {
+    public ConflictException(final String errors) {
         super(TYPE, TITLE, STATUS, DETAIL, errors);
     }
 
-    public ConflictException(final String error) {
-        this(List.of(error));
-    }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/InternalServerErrorException.java b/src/main/java/com/answerdigital/answerking/exception/generic/InternalServerErrorException.java
@@ -16,11 +16,8 @@ public class InternalServerErrorException extends AnswerKingException {
 
     private static final String DETAIL = null;
 
-    public InternalServerErrorException(final Collection<String> errors) {
+    public InternalServerErrorException(final String errors) {
         super(TYPE, TITLE, STATUS, DETAIL, errors);
     }
 
-    public InternalServerErrorException(final String error) {
-        this(List.of(error));
-    }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/generic/NotFoundException.java b/src/main/java/com/answerdigital/answerking/exception/generic/NotFoundException.java
@@ -16,11 +16,8 @@ public class NotFoundException extends AnswerKingException {
 
     private static final String DETAIL = null;
 
-    public NotFoundException(final Collection<String> errors) {
+    public NotFoundException(final String errors) {
         super(TYPE, TITLE, STATUS, DETAIL, errors);
     }
 
-    public NotFoundException(final String error) {
-        this(List.of(error));
-    }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/util/ErrorResponse.java b/src/main/java/com/answerdigital/answerking/exception/util/ErrorResponse.java
@@ -6,6 +6,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 @Slf4j
 @Getter
@@ -21,22 +23,35 @@ public class ErrorResponse {
 
     private final String instance;
 
-    private final Collection<String> errors;
+    private final Map<String, Collection<String>> errors = new HashMap<>();
 
     private final String traceId;
 
-    public ErrorResponse(final AnswerKingException exception, final HttpServletRequest request) {
+    public ErrorResponse(final AnswerKingException exception, final HttpServletRequest request, boolean validtionProblem) {
         this.type = exception.getType();
         this.title = exception.getTitle();
         this.status = exception.getStatus().value();
         this.detail = exception.getDetail();
         this.instance = request.getRequestURI();
-        this.errors = exception.getErrors();
+        this.errors.putAll(exception.getErrors());
         this.traceId = CorrelationId.getId();
 
         log.error(String.format(
                 "RETURNING EXCEPTION - TYPE: %s - TITLE: %s - STATUS: %s - DETAIL: %s - INSTANCE: %s - ERRORS: %s - TRACEID: %s",
                 type, title, status, detail, instance, errors.toString(), traceId)
         );
     }
+    public ErrorResponse(final AnswerKingException exception, final HttpServletRequest request) {
+        this.type = exception.getType();
+        this.title = exception.getTitle();
+        this.status = exception.getStatus().value();
+        this.detail = exception.getError();
+        this.instance = request.getRequestURI();
+        this.traceId = CorrelationId.getId();
+
+        log.error(String.format(
+                "RETURNING EXCEPTION - TYPE: %s - TITLE: %s - STATUS: %s - DETAIL: %s - INSTANCE: %s - TRACEID: %s",
+                type, title, status, detail, instance, traceId)
+        );
+    }
 }
diff --git a/src/main/java/com/answerdigital/answerking/exception/util/RestResponseEntityExceptionHandler.java b/src/main/java/com/answerdigital/answerking/exception/util/RestResponseEntityExceptionHandler.java
@@ -12,8 +12,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.StreamSupport;
 
 @RestControllerAdvice
 public class RestResponseEntityExceptionHandler {
@@ -39,11 +43,24 @@ public ResponseEntity<ErrorResponse> handleConstraintViolationException(
             final ConstraintViolationException exception,
             final HttpServletRequest request ) {
 
-        final List<String> errorMessages = exception.getConstraintViolations().stream()
-                .map(ConstraintViolation::getMessage)
-                .toList();
 
-        final ErrorResponse response = new ErrorResponse(new BadRequestException(errorMessages), request);
+        Map<String, Collection<String>> newMap = new HashMap<>();
+        for (ConstraintViolation<?> constraintViolation : exception.getConstraintViolations()) {
+            String mapKey = Objects.requireNonNull(StreamSupport
+                    .stream(constraintViolation.getPropertyPath().spliterator(), false)
+                    .reduce((first, second) -> second)
+                    .orElse(null)).toString();
+
+            if(newMap.containsKey(mapKey)){
+                    newMap.get(mapKey).add(constraintViolation.getMessage());
+            } else {
+                Collection<String> newCollection = new ArrayList<>();
+                newCollection.add(constraintViolation.getMessage());
+                newMap.put(mapKey, newCollection);
+            }
+        }
+
+        final ErrorResponse response = new ErrorResponse(new BadRequestException(newMap, "One or more validation errors occurred"), request, true);
         return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
     }
 
diff --git a/src/main/java/com/answerdigital/answerking/request/ProductRequest.java b/src/main/java/com/answerdigital/answerking/request/ProductRequest.java
@@ -20,7 +20,7 @@ public record ProductRequest(
         String description,
 
         @Digits(integer = 12, fraction = 2, message = "Product price is invalid")
-        @DecimalMin(value = "0.0", inclusive = false, message = "Product price is invalid")
+        @DecimalMin(value = "0.0", inclusive = false, message = "Product price cannot be less than 0")
         @NotNull
         BigDecimal price
 ) {
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -31,9 +31,9 @@ spring:
       on-profile: dev
 
   datasource:
-    username: test_user
-    password: GS3ef_fsd^!
-    url: jdbc:mysql://localhost:3306/answer_king
+    username: root
+    password: 9391
+    url: jdbc:mysql://localhost:3306/bench-king
 
 ---
 spring:

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,8 @@ public class RetirementException extends AnswerKingException {`
`16`	`16`
`17`	`17`	`private static final String DETAIL = null;`
`18`	`18`
`19`		`- public RetirementException(final Collection<String> errors) {`
	`19`	`+ public RetirementException(final String errors) {`
`20`	`20`	`super(TYPE, TITLE, STATUS, DETAIL, errors);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public RetirementException(final String error) {`
`24`		`- this(List.of(error));`
`25`		`- }`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,8 @@ public class ConflictException extends AnswerKingException {`
`16`	`16`
`17`	`17`	`private static final String DETAIL = null;`
`18`	`18`
`19`		`- public ConflictException(final Collection<String> errors) {`
	`19`	`+ public ConflictException(final String errors) {`
`20`	`20`	`super(TYPE, TITLE, STATUS, DETAIL, errors);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public ConflictException(final String error) {`
`24`		`- this(List.of(error));`
`25`		`- }`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,8 @@ public class InternalServerErrorException extends AnswerKingException {`
`16`	`16`
`17`	`17`	`private static final String DETAIL = null;`
`18`	`18`
`19`		`- public InternalServerErrorException(final Collection<String> errors) {`
	`19`	`+ public InternalServerErrorException(final String errors) {`
`20`	`20`	`super(TYPE, TITLE, STATUS, DETAIL, errors);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public InternalServerErrorException(final String error) {`
`24`		`- this(List.of(error));`
`25`		`- }`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,8 @@ public class NotFoundException extends AnswerKingException {`
`16`	`16`
`17`	`17`	`private static final String DETAIL = null;`
`18`	`18`
`19`		`- public NotFoundException(final Collection<String> errors) {`
	`19`	`+ public NotFoundException(final String errors) {`
`20`	`20`	`super(TYPE, TITLE, STATUS, DETAIL, errors);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public NotFoundException(final String error) {`
`24`		`- this(List.of(error));`
`25`		`- }`
`26`	`23`	`}`