Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ResponseEntity<AuthResponse> updateMoney(
@Valid @RequestBody AddMoney request,
@RequestHeader("Authorization") String authHeader,
BindingResult bindingResult,
@RequestParam(required = true) Boolean isAdd) {
@RequestParam(required = false, defaultValue = "true") Boolean isAdd) {
if (bindingResult.hasErrors()) {
return validatorResult.returnErrorMessage(bindingResult);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import java.math.BigDecimal;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -17,10 +19,11 @@
@AllArgsConstructor
public class AddMoney {

@NotBlank(message = "SubAccountid is mandatory")
@NotBlank(message = "SubAccountId est obligatoire")
private String subAccountId;

@NotBlank(message = "Amount is mandatory")
@NotNull(message = "Le montant est obligatoire")
@Positive(message = "Le montant doit être supérieur à zéro")
private BigDecimal amount;

private String description;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
import java.util.List;
import java.util.stream.Collectors;

import jakarta.validation.UnexpectedTypeException;
import moneybuddy.fr.moneybuddy.dtos.ErrorResponse;
import moneybuddy.fr.moneybuddy.service.DiscordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.MissingServletRequestParameterException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.WebRequest;
Expand Down Expand Up @@ -67,6 +69,38 @@ public ResponseEntity<ErrorResponse> handleValidationException(
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
}

@ExceptionHandler(MissingServletRequestParameterException.class)
public ResponseEntity<ErrorResponse> handleMissingParam(
MissingServletRequestParameterException ex, WebRequest request) {
ErrorResponse errorResponse =
ErrorResponse.builder()
.timestamp(LocalDateTime.now())
.status(HttpStatus.BAD_REQUEST.value())
.error("Paramètre manquant")
.message("Le paramètre '" + ex.getParameterName() + "' est obligatoire")
.errorCode("MISSING_PARAMETER")
.path(request.getDescription(false).replace("uri=", ""))
.build();

return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
}

@ExceptionHandler(UnexpectedTypeException.class)
public ResponseEntity<ErrorResponse> handleUnexpectedTypeException(
UnexpectedTypeException ex, WebRequest request) {
ErrorResponse errorResponse =
ErrorResponse.builder()
.timestamp(LocalDateTime.now())
.status(HttpStatus.BAD_REQUEST.value())
.error("Erreur de validation")
.message("Contrainte de validation incompatible avec le type du champ")
.errorCode("VALIDATION_TYPE_ERROR")
.path(request.getDescription(false).replace("uri=", ""))
.build();

return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
}

@ExceptionHandler(IndexOutOfBoundsException.class)
public ResponseEntity<ErrorResponse> handleIndexOutOfBoundsException(
IndexOutOfBoundsException ex, WebRequest request) {
Expand Down
Loading