main

src/main/java/com/asap/server/common/advice/ControllerExceptionAdvice.java

@@ -1,9 +1,17 @@
 package com.asap.server.common.advice;
 
+import com.asap.server.common.dto.ErrorDataResponse;
 import com.asap.server.common.dto.ErrorResponse;
 import com.asap.server.common.utils.SlackUtil;
+import com.asap.server.controller.dto.response.HostLoginResponseDto;
 import com.asap.server.exception.Error;
 import com.asap.server.exception.model.AsapException;
+import com.asap.server.exception.model.BadRequestException;
+import com.asap.server.exception.model.ConflictException;
+import com.asap.server.exception.model.ForbiddenException;
+import com.asap.server.exception.model.HostTimeForbiddenException;
+import com.asap.server.exception.model.NotFoundException;
+import com.asap.server.exception.model.UnauthorizedException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -47,12 +55,6 @@ protected ErrorResponse handleMethodArgumentNotValidException(final MethodArgume
         else return ErrorResponse.error(Error.VALIDATION_REQUEST_MISSING_EXCEPTION, fieldError.getDefaultMessage());
     }
 
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    @ExceptionHandler(NoHandlerFoundException.class)
-    public ErrorResponse handleNotFoundException(NoHandlerFoundException exception) {
-        return ErrorResponse.error(Error.URI_NOT_FOUND_EXCEPTION);
-    }
-
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(HttpMessageNotReadableException.class)
     protected ErrorResponse handleJsonParseException(final HttpMessageNotReadableException e) {
@@ -65,6 +67,52 @@ protected ErrorResponse handleValidationException(final ConstraintViolationExcep
         return ErrorResponse.error(Error.VALIDATION_REQUEST_MISSING_EXCEPTION);
     }
 
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(BadRequestException.class)
+    protected ErrorResponse handleBadRequestException(final BadRequestException e) {
+        return ErrorResponse.error(e.getError());
+    }
+
+    /**
+     * 401 UnAuthorization
+     */
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler(UnauthorizedException.class)
+    protected ErrorResponse handleUnAuthorizedException(final UnauthorizedException e) {
+        return ErrorResponse.error(e.getError());
+    }
+
+    /**
+     * 403 Forbidden
+     */
+    @ResponseStatus(HttpStatus.FORBIDDEN)
+    @ExceptionHandler(ForbiddenException.class)
+    protected ErrorResponse handleForbiddenException(final ForbiddenException e) {
+        return ErrorResponse.error(e.getError());
+    }
+
+    @ResponseStatus(HttpStatus.FORBIDDEN)
+    @ExceptionHandler(HostTimeForbiddenException.class)
+    protected ErrorDataResponse<HostLoginResponseDto> handleForbiddenException(final HostTimeForbiddenException e) {
+        return ErrorDataResponse.error(e.getError(), e.getMessage(), e.getData());
+    }
+
+    /**
+     * 404 Not Found
+     */
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ExceptionHandler(NotFoundException.class)
+    protected ErrorResponse handleNotFoundException(final NotFoundException e) {
+        return ErrorResponse.error(e.getError());
+    }
+
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public ErrorResponse handleNotFoundException(NoHandlerFoundException exception) {
+        return ErrorResponse.error(Error.URI_NOT_FOUND_EXCEPTION);
+    }
+
     /**
      * 405 Method Not Allowed
      * 지원하지 않은 HTTP method 호출 할 경우 발생하는 Exception
@@ -76,41 +124,14 @@ protected ErrorResponse handleHttpRequestMethodNotSupportedException(
         return ErrorResponse.error(METHOD_NOT_ALLOWED_EXCEPTION);
     }
 
-//    /**
-//     * 401 UnAuthorization
-//     */
-//    @ResponseStatus(HttpStatus.UNAUTHORIZED)
-//    @ExceptionHandler(UnauthorizedException.class)
-//    protected ErrorResponse handleUnAuthorizedException(final UnauthorizedException e) {
-//        return ErrorResponse.error(e.getError());
-//    }
-//
-//    /**
-//     * 403 Forbidden
-//     */
-//    @ResponseStatus(HttpStatus.FORBIDDEN)
-//    @ExceptionHandler(ForbiddenException.class)
-//    protected ErrorResponse handleForbiddenException(final ForbiddenException e) {
-//        return ErrorResponse.error(e.getError());
-//    }
-
-//    /**
-//     * 404 Not Found
-//     */
-//    @ResponseStatus(HttpStatus.NOT_FOUND)
-//    @ExceptionHandler(NotFoundException.class)
-//    protected ErrorResponse handleNotFoundException(final NotFoundException e) {
-//        return ErrorResponse.error(e.getError());
-//    }
-
     /**
      * 409 Conflict
      */
-//    @ResponseStatus(HttpStatus.CONFLICT)
-//    @ExceptionHandler(ConflictException.class)
-//    protected ErrorResponse handleConflictException(final ConflictException e) {
-//        return ErrorResponse.error(e.getError());
-//    }
+    @ResponseStatus(HttpStatus.CONFLICT)
+    @ExceptionHandler(ConflictException.class)
+    protected ErrorResponse handleConflictException(final ConflictException e) {
+        return ErrorResponse.error(e.getError());
+    }
 
     /**
      * 500 Internal Server

src/main/java/com/asap/server/common/aspect/LoggingAspect.java

@@ -34,13 +34,15 @@ public Object requestLogging(ProceedingJoinPoint proceedingJoinPoint) throws Thr
         long startAt = System.currentTimeMillis();
         Object returnValue = proceedingJoinPoint.proceed(proceedingJoinPoint.getArgs());
         long endAt = System.currentTimeMillis();
-        log.info("====> Request: {} {} ({}ms)\n *Header = {}\n", request.getMethod(), request.getRequestURL(), endAt - startAt, getHeaders(request));
+        log.info("================================================NEW===============================================");
+        log.info("====> Request: {} {} ({}ms)\n *Header = {}", request.getMethod(), request.getRequestURL(), endAt - startAt, getHeaders(request));
         if ("POST".equalsIgnoreCase(request.getMethod())) {
             log.info("====> Body: {}", objectMapper.readTree(cachingRequest.getContentAsByteArray()));
         }
         if (returnValue != null) {
-            log.info("====> Response: {}\n", returnValue);
+            log.info("====> Response: {}", returnValue);
         }
+        log.info("================================================END===============================================");
         return returnValue;
     }
 

src/main/java/com/asap/server/common/dto/ErrorDataResponse.java

@@ -0,0 +1,24 @@
+package com.asap.server.common.dto;
+
+import com.asap.server.exception.Error;
+import lombok.Getter;
+
+@Getter
+public class ErrorDataResponse<T> extends ErrorResponse {
+
+    private T data;
+
+    private ErrorDataResponse(int code, String message, T data) {
+        super(code, message);
+        this.data = data;
+    }
+
+    public static <T> ErrorDataResponse<T> error(Error error, String message, T data) {
+        return new ErrorDataResponse<T>(error.getHttpStatusCode(), message, data);
+    }
+
+    @Override
+    public String toString() {
+        return "code: " + super.getCode() + " message: " + super.getMessage() + " data: " + this.data;
+    }
+}

src/main/java/com/asap/server/common/dto/ErrorResponse.java

@@ -1,14 +1,13 @@
 package com.asap.server.common.dto;
 
 import com.asap.server.exception.Error;
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
 @Getter
 @ToString
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
 public class ErrorResponse {
     private final int code;
     private final String message;
@@ -17,6 +16,7 @@ public static ErrorResponse error(Error error) {
         return new ErrorResponse(error.getHttpStatusCode(), error.getMessage());
     }
 
+
     public static ErrorResponse error(Error error, String message) {
         return new ErrorResponse(error.getHttpStatusCode(), message);
     }

src/main/java/com/asap/server/common/dto/SuccessResponse.java

@@ -10,7 +10,7 @@
 @Getter
 @ToString
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-@AllArgsConstructor(access =  AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class SuccessResponse<T> {
     private final int code;
     private final String message;
@@ -20,6 +20,7 @@ public static SuccessResponse success(Success success) {
         return new SuccessResponse<>(success.getHttpStatusCode(), success.getMessage());
     }
 
+
     public static <T> SuccessResponse<T> success(Success success, T data) {
         return new SuccessResponse<T>(success.getHttpStatusCode(), success.getMessage(), data);
     }

src/main/java/com/asap/server/controller/MeetingController.java

@@ -9,6 +9,7 @@
 import com.asap.server.controller.dto.response.BestMeetingTimeResponseDto;
 import com.asap.server.controller.dto.response.FixedMeetingResponseDto;
 import com.asap.server.controller.dto.response.MeetingSaveResponseDto;
+import com.asap.server.controller.dto.response.MeetingScheduleResponseDto;
 import com.asap.server.controller.dto.response.MeetingTitleResponseDto;
 import com.asap.server.controller.dto.response.TimeTableResponseDto;
 import com.asap.server.exception.Success;
@@ -66,7 +67,7 @@ public SuccessResponse<MeetingSaveResponseDto> create(
 
     @Operation(summary = "[큐 카드] 큐 카드 확정 API")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "유저 정보 조회 성공"),
+            @ApiResponse(responseCode = "200", description = "회의 시간 확정 성공입니다."),
             @ApiResponse(responseCode = "400",
                     description = "1. 회의 진행 월이 입력되지 않았습니다.\n"
                             + "2. 회의 진행 날짜가 입력되지 않았습니다.\n"
@@ -103,15 +104,15 @@ public SuccessResponse confirmMeeting(
             @ApiResponse(responseCode = "500", description = "서버 내부 오류", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     @GetMapping("/{meetingId}/schedule")
-    public SuccessResponse getMeetingSchedule(
+    public SuccessResponse<MeetingScheduleResponseDto> getMeetingSchedule(
             @Parameter(schema = @Schema(implementation = String.class), in = ParameterIn.PATH) @MeetingPathVariable final Long meetingId
     ) {
         return SuccessResponse.success(Success.FIND_MEETING_SCHEDULE_SUCCESS, meetingService.getMeetingSchedule(meetingId));
     }
 
     @Operation(summary = "[큐 카드] 큐 카드 조회 API")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "유저 정보 조회 성공"),
+            @ApiResponse(responseCode = "200", description = "큐카드 조회 성공입니다."),
             @ApiResponse(responseCode = "400", description = "해당 회의는 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "403", description = "확정되지 않은 회의입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "404", description = "해당 유저는 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
@@ -129,15 +130,17 @@ public SuccessResponse<FixedMeetingResponseDto> getFixedMeetingInformation(
     @GetMapping("/{meetingId}/timetable")
     @SecurityRequirement(name = "JWT Auth")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "회의 선택지가 성공적으로 조회되었습니다."),
+            @ApiResponse(responseCode = "200", description = "종합 일정 시간표 조회 성공입니다."),
             @ApiResponse(responseCode = "401", description = "해당 유저는 해당 방의 방장이 아닙니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "404",
                     description =
                             "1. 해당 회의는 존재하지 않습니다.\n"
                                     + "2. 해당 유저는 존재하지 않습니다.\n"
                                     + "3. 회의 가능 일자가 존재하지 않습니다.\n"
                                     + "4. 해당 회의의 가능 시간을 입력한 유저가 없습니다.",
-                    content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+                    content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "409", description = "이미 확정된 회의입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "500", description = "서버 내부 오류", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     public SuccessResponse<TimeTableResponseDto> getTimeTable(
             @Parameter(schema = @Schema(implementation = String.class), in = ParameterIn.PATH) @MeetingPathVariable final Long meetingId,
@@ -166,12 +169,13 @@ public SuccessResponse<MeetingTitleResponseDto> getIsFixedMeeting(
 
     @Operation(summary = "[회의 일정 확정 뷰] 최적의 회의 시간 확인 API")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "유저 정보 조회 성공"),
+            @ApiResponse(responseCode = "200", description = "최적의 회의시간 조회 성공입니다."),
             @ApiResponse(responseCode = "401", description = "해당 유저는 해당 방의 방장이 아닙니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "404",
                     description = "1. 해당 회의는 존재하지 않습니다.\n"
                             + "2. 회의 가능 일자가 존재하지 않습니다."
                     , content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "409", description = "이미 확정된 회의입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "500", description = "서버 내부 오류", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     @GetMapping("/{meetingId}/details")

src/main/java/com/asap/server/controller/UserController.java

@@ -1,12 +1,16 @@
 package com.asap.server.controller;
 
+import com.asap.server.common.dto.ErrorDataResponse;
 import com.asap.server.common.dto.ErrorResponse;
 import com.asap.server.common.dto.SuccessResponse;
 import com.asap.server.config.resolver.meeting.MeetingPathVariable;
 import com.asap.server.config.resolver.user.UserId;
 import com.asap.server.controller.dto.request.AvailableTimeRequestDto;
 import com.asap.server.controller.dto.request.HostLoginRequestDto;
 import com.asap.server.controller.dto.request.UserMeetingTimeSaveRequestDto;
+import com.asap.server.controller.dto.response.HostLoginResponseDto;
+import com.asap.server.controller.dto.response.UserMeetingTimeResponseDto;
+import com.asap.server.controller.dto.response.UserTimeResponseDto;
 import com.asap.server.exception.Success;
 import com.asap.server.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,6 +30,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Tag(name = "사용자", description = "사용자 관련 로그인 및 가능 시간 입력 API 입니다.")
@@ -39,7 +44,7 @@ public class UserController {
     @Operation(summary = "[회의 가능 시간 입력 뷰 - 방장] 방장 가능 시간 입력 API")
     @SecurityRequirement(name = "JWT Auth")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "유효한 회의 입니다."),
+            @ApiResponse(responseCode = "201", description = "방장의 회의 가능 시간이 성공적으로 입력되었습니다."),
             @ApiResponse(responseCode = "400",
                     description = "1. 시간 형식이 잘못되었습니다. [YYYY/MM/DD HH:MM]\n"
                             + "2. 중복 입력된 시간이 있습니다.\n"
@@ -55,17 +60,17 @@ public class UserController {
             @ApiResponse(responseCode = "500", description = "서버 내부 오류", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PostMapping("/host/{meetingId}/time")
-    public SuccessResponse createHostTime(
+    public SuccessResponse<UserMeetingTimeResponseDto> createHostTime(
             @Parameter(schema = @Schema(implementation = String.class), in = ParameterIn.PATH) @MeetingPathVariable final Long meetingId,
-            @RequestBody final List<@Valid UserMeetingTimeSaveRequestDto> requestDtoList,
+            @RequestBody final List<@Valid @NotNull UserMeetingTimeSaveRequestDto> requestDtoList,
             @UserId @Parameter(hidden = true) final Long userId
     ) {
         return SuccessResponse.success(Success.CREATE_HOST_TIME_SUCCESS, userService.createHostTime(meetingId, userId, requestDtoList));
     }
 
     @Operation(summary = "[회의 가능 시간 입력 뷰 - 참여자] 참여자 정보 및 가능 시간 입력 API")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "회의 선택지가 성공적으로 조회되었습니다."),
+            @ApiResponse(responseCode = "201", description = "참여자 회의 가능 시간 입력을 성공하였습니다."),
             @ApiResponse(responseCode = "400",
                     description = "1. 시간 형식이 잘못되었습니다. [YYYY/MM/DD HH:MM]\n"
                             + "2. 중복 입력된 시간이 있습니다.\n"
@@ -74,7 +79,7 @@ public SuccessResponse createHostTime(
             @ApiResponse(responseCode = "404", description = "해당 회의는 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PostMapping("/{meetingId}/time")
-    public SuccessResponse createMemberTime(
+    public SuccessResponse<UserTimeResponseDto> createMemberTime(
             @Parameter(schema = @Schema(implementation = String.class), in = ParameterIn.PATH) @MeetingPathVariable final Long meetingId,
             @RequestBody @Valid final AvailableTimeRequestDto requestDto
     ) {
@@ -83,17 +88,18 @@ public SuccessResponse createMemberTime(
 
     @Operation(summary = "[방장 입장 뷰] 방장 로그인 API")
     @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "회의 선택지가 성공적으로 조회되었습니다."),
+            @ApiResponse(responseCode = "200", description = "로그인 성공입니다"),
             @ApiResponse(responseCode = "400",
                     description = "1. 방장 이름의 최대 입력 길이(8자)를 초과했습니다.\n"
                             + "2. 비밀번호는 4자리 이상 숫자입니다.",
                     content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
             @ApiResponse(responseCode = "401", description = "유효하지 않은 사용자 이름 또는 비밀번호입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(responseCode = "403", description = "회의 가능 시간이 입력되지 않았습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(responseCode = "404", description = "해당 회의는 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
+            @ApiResponse(responseCode = "403", description = "회의 가능 시간이 입력되지 않았습니다."),
+            @ApiResponse(responseCode = "404", description = "해당 회의는 존재하지 않습니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),
+            @ApiResponse(responseCode = "409", description = "이미 확정된 회의입니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class)))
     })
     @PostMapping("{meetingId}/host")
-    public SuccessResponse loginByHost(
+    public SuccessResponse<HostLoginResponseDto> loginByHost(
             @Parameter(schema = @Schema(implementation = String.class), in = ParameterIn.PATH) @MeetingPathVariable final Long meetingId,
             @RequestBody @Valid final HostLoginRequestDto requestDto
     ) {