diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java index 1e4dc05b..ce9d4801 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/CreateNoticeController.java @@ -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 fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate"); + + List 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 = diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java index 2d1faf61..6a7db3fd 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/createNotice/adapters/web/model/CreateNoticeReqVO.java @@ -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 fileMappingId; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java index 079c05e7..35996152 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/UpdateNoticeController.java @@ -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 fieldOrder = Arrays.asList("title", "content", "visible", "startDate", "endDate"); + + List 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( diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java index 2124128a..e405d90c 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/adapters/web/model/UpdateNoticeReqVO.java @@ -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 fileMappingId; diff --git a/admin/src/main/resources/templates/communication/notice/create.html b/admin/src/main/resources/templates/communication/notice/create.html index 024b86a1..8b0b5e87 100644 --- a/admin/src/main/resources/templates/communication/notice/create.html +++ b/admin/src/main/resources/templates/communication/notice/create.html @@ -29,15 +29,17 @@ 첨부파일* -
- +
+ +

첨부 가능 파일 형식: 문서(pdf, docx, xlsx, pptx, hwp), 이미지(jpg, jpeg, png, gif), 기타(zip, + csv, txt) / 파일당 최대 5MB까지 등록 가능합니다.

+
    + +
- - - - @@ -74,8 +76,6 @@ - - @@ -164,7 +164,8 @@ }, // validation fail 422: function (res) { - alert("error"); + debugger + alert(res.responseJSON[0].defaultMessage); // $(res.responseJSON).each((idx, oj) => { // let target = $(f).find('[name=' + oj.field + ']'); // target.addClass('is-invalid'); diff --git a/admin/src/main/resources/templates/communication/notice/{id}.html b/admin/src/main/resources/templates/communication/notice/{id}.html index 9f248ec7..59487c1a 100644 --- a/admin/src/main/resources/templates/communication/notice/{id}.html +++ b/admin/src/main/resources/templates/communication/notice/{id}.html @@ -220,7 +220,7 @@ }, // validation fail 422: function (res) { - alert('error'); + alert(res.responseJSON[0].defaultMessage); // $(res.responseJSON).each((idx, oj) => { // let target = $(f).find('[name=' + oj.field + ']'); // target.addClass('is-invalid');