Skip to content

Commit 3865a1b

Browse files
committed
CLAP-246 Refactor: 작업 목록 조회 valid 검증 설정
1 parent 7ee5286 commit 3865a1b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
import clap.server.adapter.inbound.web.dto.common.PageResponse;
55
import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest;
66
import clap.server.adapter.inbound.web.dto.task.response.*;
7+
import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
78
import clap.server.application.port.inbound.task.FindTaskDetailsUsecase;
89
import clap.server.application.port.inbound.task.FindTaskListUsecase;
910
import clap.server.common.annotation.architecture.WebAdapter;
11+
import clap.server.common.annotation.log.LogType;
1012
import io.swagger.v3.oas.annotations.Operation;
1113
import io.swagger.v3.oas.annotations.tags.Tag;
14+
import jakarta.validation.Valid;
1215
import lombok.RequiredArgsConstructor;
1316

1417
import org.springframework.data.domain.PageRequest;
@@ -28,12 +31,13 @@ public class FindTaskController {
2831
private final FindTaskListUsecase taskListUsecase;
2932

3033
@Operation(summary = "사용자 요청 작업 목록 조회")
34+
@LogType(LogStatus.TASK_VIEWED)
3135
@Secured({"ROLE_USER", "ROLE_MANAGER"})
3236
@GetMapping("/requests")
3337
public ResponseEntity<PageResponse<FilterRequestedTasksResponse>> findTasksRequestedByUser(
3438
@RequestParam(defaultValue = "0") int page,
3539
@RequestParam(defaultValue = "20") int pageSize,
36-
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
40+
@ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest,
3741
@AuthenticationPrincipal SecurityUserDetails userInfo){
3842
Pageable pageable = PageRequest.of(page, pageSize);
3943
return ResponseEntity.ok(taskListUsecase.findTasksRequestedByUser(userInfo.getUserId(), pageable, filterTaskListRequest));
@@ -54,7 +58,7 @@ public ResponseEntity<FindTaskDetailsResponse> findRequestedTaskDetails(
5458
public ResponseEntity<PageResponse<FilterAssignedTaskListResponse>> findTasksAssignedByManager(
5559
@RequestParam(defaultValue = "0") int page,
5660
@RequestParam(defaultValue = "20") int pageSize,
57-
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
61+
@ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest,
5862
@AuthenticationPrincipal SecurityUserDetails userInfo){
5963
Pageable pageable = PageRequest.of(page, pageSize);
6064
return ResponseEntity.ok(taskListUsecase.findTasksAssignedByManager(userInfo.getUserId(), pageable, filterTaskListRequest));
@@ -66,7 +70,7 @@ public ResponseEntity<PageResponse<FilterAssignedTaskListResponse>> findTasksAss
6670
public ResponseEntity<PageResponse<FilterPendingApprovalResponse>> findPendingApprovalTasks(
6771
@RequestParam(defaultValue = "0") int page,
6872
@RequestParam(defaultValue = "20") int pageSize,
69-
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
73+
@ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest,
7074
@AuthenticationPrincipal SecurityUserDetails userInfo){
7175
Pageable pageable = PageRequest.of(page, pageSize);
7276
return ResponseEntity.ok(taskListUsecase.findPendingApprovalTasks(userInfo.getUserId(), pageable, filterTaskListRequest));
@@ -78,7 +82,7 @@ public ResponseEntity<PageResponse<FilterPendingApprovalResponse>> findPendingAp
7882
public ResponseEntity<PageResponse<FilterAllTasksResponse>> findAllTasks(
7983
@RequestParam(defaultValue = "0") int page,
8084
@RequestParam(defaultValue = "20") int pageSize,
81-
@ModelAttribute FilterTaskListRequest filterTaskListRequest,
85+
@ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest,
8286
@AuthenticationPrincipal SecurityUserDetails userInfo){
8387
Pageable pageable = PageRequest.of(page, pageSize);
8488
return ResponseEntity.ok(taskListUsecase.findAllTasks(userInfo.getUserId(), pageable, filterTaskListRequest));

src/main/java/clap/server/config/aop/LoggingAspect.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import jakarta.servlet.http.HttpServletResponse;
1313
import lombok.RequiredArgsConstructor;
1414
import lombok.extern.slf4j.Slf4j;
15+
import org.apache.http.HttpStatus;
1516
import org.aspectj.lang.ProceedingJoinPoint;
1617
import org.aspectj.lang.annotation.Around;
1718
import org.aspectj.lang.annotation.Aspect;
@@ -56,15 +57,12 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
5657
throw ex;
5758
} finally {
5859
LogStatus logStatus = getLogType((MethodSignature) joinPoint.getSignature());
59-
int statusCode;
60+
int statusCode = HttpStatus.SC_INTERNAL_SERVER_ERROR;
6061
String customCode = null;
6162
if (capturedException != null) {
6263
if (capturedException instanceof BaseException e) {
6364
statusCode = e.getCode().getHttpStatus().value();
6465
customCode = e.getCode().getCustomCode();
65-
} else {
66-
ModelAndView modelAndView = handlerExceptionResolver.resolveException(request, response, null, capturedException);
67-
statusCode = modelAndView.getStatus().value();
6866
}
6967
} else {
7068
statusCode = response.getStatus();

0 commit comments

Comments
 (0)