Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-11 14:57:50 +09:00
6 changed files with 45 additions and 24 deletions

View File

@@ -11,9 +11,14 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@Controller
@RequiredArgsConstructor
class CreateNoticeController {
@@ -23,8 +28,13 @@ class CreateNoticeController {
ResponseEntity<?> operate(@RequestBody @Valid CreateNoticeReqVO reqVO, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
List<String> fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate");
List<FieldError> sortedErrors = bindingResult.getFieldErrors().stream()
.sorted(Comparator.comparingInt(error -> fieldOrder.indexOf(error.getField())))
.toList();
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
.body(sortedErrors);
}
CreateNotice article =

View File

@@ -15,19 +15,19 @@ import java.util.List;
@AllArgsConstructor
@EqualsAndHashCode
public class CreateNoticeReqVO {
@NotBlank(message = "{valid.common.required}")
@NotBlank(message = "제목은 필수입력값입니다.")
private String title;
@NotBlank(message = "{valid.common.required}")
@NotBlank(message = "내용은 {valid.common.required}")
private String content;
@NotNull(message = "{valid.common.required}")
@NotNull(message = "노출 여부는 {valid.common.required}")
private Boolean visible;
@NotNull(message = "{valid.common.required}")
@NotNull(message = "시작일은 {valid.common.required}")
private LocalDateTime startDate;
@NotNull(message = "{valid.common.required}")
@NotNull(message = "종료일은 {valid.common.required}")
private LocalDateTime endDate;
private List<String> fileMappingId;

View File

@@ -11,10 +11,15 @@ import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@RestController
@RequiredArgsConstructor
class UpdateNoticeController {
@@ -26,8 +31,13 @@ class UpdateNoticeController {
if (bindingResult.hasErrors()) {
List<String> fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate");
List<FieldError> sortedErrors = bindingResult.getFieldErrors().stream()
.sorted(Comparator.comparingInt(error -> fieldOrder.indexOf(error.getField())))
.toList();
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
.body(sortedErrors);
}
updateFilePortIn.operate(

View File

@@ -17,20 +17,20 @@ public class UpdateNoticeReqVO {
@NotNull(message = "{valid.common.required}")
private Long id;
@NotBlank(message = "{valid.common.required}")
@NotBlank(message = "제목은 {valid.common.required}")
private String title;
@NotBlank(message = "{valid.common.required}")
@NotBlank(message = "내용은 {valid.common.required}")
private String content;
@NotNull(message = "{valid.common.required}")
@NotNull(message = "노출여부는 {valid.common.required}")
private Boolean visible;
@NotNull(message = "{valid.common.required}")
@NotNull(message = "시작일은 {valid.common.required}")
private LocalDateTime startDate;
@NotNull(message = "{valid.common.required}")
@NotNull(message = "종료일은 {valid.common.required}")
private LocalDateTime endDate;
private List<String> fileMappingId;