From 98b9655a2f81608b8287d48bcb8c0def61ccc200 Mon Sep 17 00:00:00 2001 From: pricelees Date: Mon, 14 Jul 2025 17:01:11 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20API=20/=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=EA=B0=9D=EC=B2=B4=20=EC=9D=B4=EB=A6=84=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=20=ED=86=B5=EC=9D=BC=20(->=20RoomescapeXxxRe?= =?UTF-8?q?sponse)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/roomescape/auth/web/AuthAPI.kt | 16 ++--- .../roomescape/auth/web/AuthController.kt | 14 ++--- ...piResponse.kt => RoomescapeApiResponse.kt} | 10 +-- ...Response.kt => RoomescapeErrorResponse.kt} | 6 +- .../exception/ExceptionControllerAdvice.kt | 26 ++++---- .../java/roomescape/member/web/MemberAPI.kt | 4 +- .../roomescape/member/web/MemberController.kt | 6 +- .../controller/ReservationController.java | 62 +++++++++---------- .../controller/ReservationTimeController.java | 24 +++---- .../theme/controller/ThemeController.java | 24 +++---- 10 files changed, 96 insertions(+), 96 deletions(-) rename src/main/java/roomescape/common/dto/response/{RoomEscapeApiResponse.kt => RoomescapeApiResponse.kt} (66%) rename src/main/java/roomescape/common/dto/response/{ErrorResponse.kt => RoomescapeErrorResponse.kt} (77%) diff --git a/src/main/java/roomescape/auth/web/AuthAPI.kt b/src/main/java/roomescape/auth/web/AuthAPI.kt index 12abbce9..96414d25 100644 --- a/src/main/java/roomescape/auth/web/AuthAPI.kt +++ b/src/main/java/roomescape/auth/web/AuthAPI.kt @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.ResponseStatus import roomescape.auth.web.support.LoginRequired import roomescape.auth.web.support.MemberId -import roomescape.common.dto.response.ErrorResponse -import roomescape.common.dto.response.RoomEscapeApiResponse +import roomescape.common.dto.response.RoomescapeErrorResponse +import roomescape.common.dto.response.RoomescapeApiResponse @Tag(name = "1. 인증 / 인가 API", description = "로그인, 로그아웃 및 로그인 상태를 확인합니다") interface AuthAPI { @@ -31,13 +31,13 @@ interface AuthAPI { ApiResponse( responseCode = "400", description = "존재하지 않는 회원이거나, 이메일 또는 비밀번호가 잘못 입력되었습니다.", - content = [Content(schema = Schema(implementation = ErrorResponse::class))] + content = [Content(schema = Schema(implementation = RoomescapeErrorResponse::class))] ) ) fun login( @Valid @RequestBody loginRequest: LoginRequest, response: HttpServletResponse - ): RoomEscapeApiResponse + ): RoomescapeApiResponse @ResponseStatus(HttpStatus.OK) @Operation(summary = "로그인 상태 확인") @@ -49,19 +49,19 @@ interface AuthAPI { ApiResponse( responseCode = "400", description = "쿠키에 있는 토큰 정보로 회원을 조회할 수 없습니다.", - content = [Content(schema = Schema(implementation = ErrorResponse::class))] + content = [Content(schema = Schema(implementation = RoomescapeErrorResponse::class))] ), ApiResponse( responseCode = "401", description = "토큰 정보가 없거나, 만료되었습니다.", - content = [Content(schema = Schema(implementation = ErrorResponse::class))] + content = [Content(schema = Schema(implementation = RoomescapeErrorResponse::class))] ) ) - fun checkLogin(@MemberId @Parameter(hidden = true) memberId: Long): RoomEscapeApiResponse + fun checkLogin(@MemberId @Parameter(hidden = true) memberId: Long): RoomescapeApiResponse @LoginRequired @ResponseStatus(HttpStatus.OK) @Operation(summary = "로그아웃", tags = ["로그인이 필요한 API"]) @ApiResponses(ApiResponse(responseCode = "200", description = "로그아웃 성공시 쿠키에 저장된 토큰 정보를 삭제합니다.")) - fun logout(request: HttpServletRequest, response: HttpServletResponse): RoomEscapeApiResponse + fun logout(request: HttpServletRequest, response: HttpServletResponse): RoomescapeApiResponse } diff --git a/src/main/java/roomescape/auth/web/AuthController.kt b/src/main/java/roomescape/auth/web/AuthController.kt index d3dfbf9d..ed1f8486 100644 --- a/src/main/java/roomescape/auth/web/AuthController.kt +++ b/src/main/java/roomescape/auth/web/AuthController.kt @@ -15,7 +15,7 @@ import roomescape.auth.web.support.accessTokenCookie import roomescape.auth.web.support.addAccessTokenCookie import roomescape.auth.web.support.expire import roomescape.auth.web.support.toCookie -import roomescape.common.dto.response.RoomEscapeApiResponse +import roomescape.common.dto.response.RoomescapeApiResponse @RestController class AuthController( @@ -26,33 +26,33 @@ class AuthController( override fun login( @Valid @RequestBody loginRequest: LoginRequest, response: HttpServletResponse - ): RoomEscapeApiResponse { + ): RoomescapeApiResponse { val accessToken: TokenResponse = authService.login(loginRequest) val cookie: Cookie = accessToken.toCookie() response.addAccessTokenCookie(cookie) - return RoomEscapeApiResponse.success() + return RoomescapeApiResponse.success() } @GetMapping("/login/check") override fun checkLogin( @MemberId @Parameter(hidden = true) memberId: Long - ): RoomEscapeApiResponse { + ): RoomescapeApiResponse { val response = authService.checkLogin(memberId) - return RoomEscapeApiResponse.success(response) + return RoomescapeApiResponse.success(response) } @PostMapping("/logout") override fun logout( request: HttpServletRequest, response: HttpServletResponse - ): RoomEscapeApiResponse { + ): RoomescapeApiResponse { val cookie: Cookie = request.accessTokenCookie() cookie.expire() response.addAccessTokenCookie(cookie) - return RoomEscapeApiResponse.success() + return RoomescapeApiResponse.success() } } diff --git a/src/main/java/roomescape/common/dto/response/RoomEscapeApiResponse.kt b/src/main/java/roomescape/common/dto/response/RoomescapeApiResponse.kt similarity index 66% rename from src/main/java/roomescape/common/dto/response/RoomEscapeApiResponse.kt rename to src/main/java/roomescape/common/dto/response/RoomescapeApiResponse.kt index 15124474..2ad3f526 100644 --- a/src/main/java/roomescape/common/dto/response/RoomEscapeApiResponse.kt +++ b/src/main/java/roomescape/common/dto/response/RoomescapeApiResponse.kt @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema @Schema(description = "API 응답 시에 사용합니다.") @JvmRecord -data class RoomEscapeApiResponse( +data class RoomescapeApiResponse( @field:Schema(description = "응답 메시지", defaultValue = SUCCESS_MESSAGE) val message: String, @@ -15,13 +15,13 @@ data class RoomEscapeApiResponse( private const val SUCCESS_MESSAGE = "요청이 성공적으로 수행되었습니다." @JvmStatic - fun success(data: T): RoomEscapeApiResponse { - return RoomEscapeApiResponse(SUCCESS_MESSAGE, data) + fun success(data: T): RoomescapeApiResponse { + return RoomescapeApiResponse(SUCCESS_MESSAGE, data) } @JvmStatic - fun success(): RoomEscapeApiResponse { - return RoomEscapeApiResponse(SUCCESS_MESSAGE, null) + fun success(): RoomescapeApiResponse { + return RoomescapeApiResponse(SUCCESS_MESSAGE, null) } } } diff --git a/src/main/java/roomescape/common/dto/response/ErrorResponse.kt b/src/main/java/roomescape/common/dto/response/RoomescapeErrorResponse.kt similarity index 77% rename from src/main/java/roomescape/common/dto/response/ErrorResponse.kt rename to src/main/java/roomescape/common/dto/response/RoomescapeErrorResponse.kt index 3d04e3c0..e7c3801d 100644 --- a/src/main/java/roomescape/common/dto/response/ErrorResponse.kt +++ b/src/main/java/roomescape/common/dto/response/RoomescapeErrorResponse.kt @@ -5,7 +5,7 @@ import roomescape.common.exception.ErrorType @Schema(name = "예외 응답", description = "예외 발생 시 응답에 사용됩니다.") @JvmRecord -data class ErrorResponse( +data class RoomescapeErrorResponse( @field:Schema(description = "발생한 예외의 종류", example = "INVALID_REQUEST_DATA") val errorType: ErrorType, @@ -14,8 +14,8 @@ data class ErrorResponse( ) { companion object { @JvmStatic - fun of(errorType: ErrorType, message: String): ErrorResponse { - return ErrorResponse(errorType, message) + fun of(errorType: ErrorType, message: String): RoomescapeErrorResponse { + return RoomescapeErrorResponse(errorType, message) } } } diff --git a/src/main/java/roomescape/common/exception/ExceptionControllerAdvice.kt b/src/main/java/roomescape/common/exception/ExceptionControllerAdvice.kt index 8080467c..e3dd3182 100644 --- a/src/main/java/roomescape/common/exception/ExceptionControllerAdvice.kt +++ b/src/main/java/roomescape/common/exception/ExceptionControllerAdvice.kt @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler import org.springframework.web.bind.annotation.ResponseStatus import org.springframework.web.bind.annotation.RestControllerAdvice import org.springframework.web.client.ResourceAccessException -import roomescape.common.dto.response.ErrorResponse +import roomescape.common.dto.response.RoomescapeErrorResponse @RestControllerAdvice class ExceptionControllerAdvice( @@ -22,54 +22,54 @@ class ExceptionControllerAdvice( fun handleRoomEscapeException( e: RoomescapeException, response: HttpServletResponse - ): ErrorResponse { + ): RoomescapeErrorResponse { logger.error(e) { "message: ${e.message}, invalidValue: ${e.invalidValue}" } response.status = e.httpStatus.value() - return ErrorResponse.of(e.errorType, e.message!!) + return RoomescapeErrorResponse.of(e.errorType, e.message!!) } @ExceptionHandler(ResourceAccessException::class) @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - fun handleResourceAccessException(e: ResourceAccessException): ErrorResponse { + fun handleResourceAccessException(e: ResourceAccessException): RoomescapeErrorResponse { logger.error(e) { "message: ${e.message}" } - return ErrorResponse.of(ErrorType.PAYMENT_SERVER_ERROR, ErrorType.PAYMENT_SERVER_ERROR.description) + return RoomescapeErrorResponse.of(ErrorType.PAYMENT_SERVER_ERROR, ErrorType.PAYMENT_SERVER_ERROR.description) } @ExceptionHandler(value = [HttpMessageNotReadableException::class]) @ResponseStatus(HttpStatus.BAD_REQUEST) - fun handleHttpMessageNotReadableException(e: HttpMessageNotReadableException): ErrorResponse { + fun handleHttpMessageNotReadableException(e: HttpMessageNotReadableException): RoomescapeErrorResponse { logger.error(e) { "message: ${e.message}" } - return ErrorResponse.of(ErrorType.INVALID_REQUEST_DATA_TYPE, + return RoomescapeErrorResponse.of(ErrorType.INVALID_REQUEST_DATA_TYPE, ErrorType.INVALID_REQUEST_DATA_TYPE.description) } @ExceptionHandler(value = [MethodArgumentNotValidException::class]) @ResponseStatus(HttpStatus.BAD_REQUEST) - fun handleMethodArgumentNotValidException(e: MethodArgumentNotValidException): ErrorResponse { + fun handleMethodArgumentNotValidException(e: MethodArgumentNotValidException): RoomescapeErrorResponse { val messages: String = e.bindingResult.allErrors .mapNotNull { it.defaultMessage } .joinToString(", ") logger.error(e) { "message: $messages" } - return ErrorResponse.of(ErrorType.INVALID_REQUEST_DATA, messages) + return RoomescapeErrorResponse.of(ErrorType.INVALID_REQUEST_DATA, messages) } @ExceptionHandler(value = [HttpRequestMethodNotSupportedException::class]) @ResponseStatus(HttpStatus.METHOD_NOT_ALLOWED) - fun handleHttpRequestMethodNotSupportedException(e: HttpRequestMethodNotSupportedException): ErrorResponse { + fun handleHttpRequestMethodNotSupportedException(e: HttpRequestMethodNotSupportedException): RoomescapeErrorResponse { logger.error(e) { "message: ${e.message}" } - return ErrorResponse.of(ErrorType.METHOD_NOT_ALLOWED, ErrorType.METHOD_NOT_ALLOWED.description) + return RoomescapeErrorResponse.of(ErrorType.METHOD_NOT_ALLOWED, ErrorType.METHOD_NOT_ALLOWED.description) } @ExceptionHandler(value = [Exception::class]) @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - fun handleException(e: Exception): ErrorResponse { + fun handleException(e: Exception): RoomescapeErrorResponse { logger.error(e) { "message: ${e.message}" } - return ErrorResponse.of(ErrorType.UNEXPECTED_ERROR, ErrorType.UNEXPECTED_ERROR.description) + return RoomescapeErrorResponse.of(ErrorType.UNEXPECTED_ERROR, ErrorType.UNEXPECTED_ERROR.description) } } diff --git a/src/main/java/roomescape/member/web/MemberAPI.kt b/src/main/java/roomescape/member/web/MemberAPI.kt index 020b1ec2..6d4becaf 100644 --- a/src/main/java/roomescape/member/web/MemberAPI.kt +++ b/src/main/java/roomescape/member/web/MemberAPI.kt @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.http.HttpStatus import org.springframework.web.bind.annotation.ResponseStatus import roomescape.auth.web.support.Admin -import roomescape.common.dto.response.RoomEscapeApiResponse +import roomescape.common.dto.response.RoomescapeApiResponse @Tag(name = "2. 회원 API", description = "회원 정보를 관리할 때 사용합니다.") interface MemberAPI { @@ -16,6 +16,6 @@ interface MemberAPI { @Operation(summary = "모든 회원 조회", tags = ["관리자 로그인이 필요한 API"]) @ApiResponses(ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true)) @ResponseStatus(HttpStatus.OK) - fun readAllMembers(): RoomEscapeApiResponse + fun readAllMembers(): RoomescapeApiResponse } diff --git a/src/main/java/roomescape/member/web/MemberController.kt b/src/main/java/roomescape/member/web/MemberController.kt index bb514406..50e6fdfc 100644 --- a/src/main/java/roomescape/member/web/MemberController.kt +++ b/src/main/java/roomescape/member/web/MemberController.kt @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RestController import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.Member -import roomescape.common.dto.response.RoomEscapeApiResponse +import roomescape.common.dto.response.RoomescapeApiResponse @RestController class MemberController( @@ -13,10 +13,10 @@ class MemberController( ) : MemberAPI { @GetMapping("/members") - override fun readAllMembers(): RoomEscapeApiResponse { + override fun readAllMembers(): RoomescapeApiResponse { val result: MembersResponse = memberService.readAllMembers() - return RoomEscapeApiResponse.success(result) + return RoomescapeApiResponse.success(result) } } diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/controller/ReservationController.java index c483f2a8..25f79104 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationController.java @@ -40,8 +40,8 @@ import roomescape.reservation.service.ReservationWithPaymentService; import roomescape.auth.web.support.Admin; import roomescape.auth.web.support.LoginRequired; import roomescape.auth.web.support.MemberId; -import roomescape.common.dto.response.ErrorResponse; -import roomescape.common.dto.response.RoomEscapeApiResponse; +import roomescape.common.dto.response.RoomescapeErrorResponse; +import roomescape.common.dto.response.RoomescapeApiResponse; import roomescape.common.exception.RoomescapeException; @RestController @@ -66,8 +66,8 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse getAllReservations() { - return RoomEscapeApiResponse.success(reservationService.findAllReservations()); + public RoomescapeApiResponse getAllReservations() { + return RoomescapeApiResponse.success(reservationService.findAllReservations()); } @LoginRequired @@ -77,9 +77,9 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse getMemberReservations( + public RoomescapeApiResponse getMemberReservations( @MemberId @Parameter(hidden = true) Long memberId) { - return RoomEscapeApiResponse.success(reservationService.findMemberReservations(memberId)); + return RoomescapeApiResponse.success(reservationService.findMemberReservations(memberId)); } @Admin @@ -89,15 +89,15 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "400", description = "날짜 범위를 지정할 때, 종료 날짜는 시작 날짜 이전일 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse getReservationBySearching( + public RoomescapeApiResponse getReservationBySearching( @RequestParam(required = false) @Parameter(description = "테마 ID") Long themeId, @RequestParam(required = false) @Parameter(description = "회원 ID") Long memberId, @RequestParam(required = false) @Parameter(description = "yyyy-MM-dd 형식으로 입력해주세요", example = "2024-06-10") LocalDate dateFrom, @RequestParam(required = false) @Parameter(description = "yyyy-MM-dd 형식으로 입력해주세요", example = "2024-06-10") LocalDate dateTo ) { - return RoomEscapeApiResponse.success( + return RoomescapeApiResponse.success( reservationService.findFilteredReservations(themeId, memberId, dateFrom, dateTo)); } @@ -108,16 +108,16 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "204", description = "성공"), @ApiResponse(responseCode = "404", description = "예약 또는 결제 정보를 찾을 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))), + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))), }) - public RoomEscapeApiResponse removeReservation( + public RoomescapeApiResponse removeReservation( @MemberId @Parameter(hidden = true) Long memberId, @NotNull(message = "reservationId는 null일 수 없습니다.") @PathVariable("id") @Parameter(description = "예약 ID") Long reservationId ) { if (reservationWithPaymentService.isNotPaidReservation(reservationId)) { reservationService.removeReservationById(reservationId, memberId); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } PaymentCancelRequest paymentCancelRequest = reservationWithPaymentService.removeReservationWithPayment( @@ -128,7 +128,7 @@ public class ReservationController { reservationWithPaymentService.updateCanceledTime(paymentCancelRequest.paymentKey(), paymentCancelResponse.canceledAt()); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } @LoginRequired @@ -139,7 +139,7 @@ public class ReservationController { @ApiResponse(responseCode = "201", description = "성공", useReturnTypeSchema = true, headers = @Header(name = HttpHeaders.LOCATION, description = "생성된 예약 정보 URL", schema = @Schema(example = "/reservations/1"))) }) - public RoomEscapeApiResponse saveReservation( + public RoomescapeApiResponse saveReservation( @Valid @RequestBody ReservationRequest reservationRequest, @MemberId @Parameter(hidden = true) Long memberId, HttpServletResponse response @@ -170,9 +170,9 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "201", description = "성공", useReturnTypeSchema = true, headers = @Header(name = HttpHeaders.LOCATION, description = "생성된 예약 정보 URL", schema = @Schema(example = "/reservations/1"))), - @ApiResponse(responseCode = "409", description = "예약이 이미 존재합니다.", content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + @ApiResponse(responseCode = "409", description = "예약이 이미 존재합니다.", content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse saveReservationByAdmin( + public RoomescapeApiResponse saveReservationByAdmin( @Valid @RequestBody AdminReservationRequest adminReservationRequest, HttpServletResponse response ) { @@ -187,8 +187,8 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse getAllWaiting() { - return RoomEscapeApiResponse.success(reservationService.findAllWaiting()); + public RoomescapeApiResponse getAllWaiting() { + return RoomescapeApiResponse.success(reservationService.findAllWaiting()); } @LoginRequired @@ -199,7 +199,7 @@ public class ReservationController { @ApiResponse(responseCode = "201", description = "성공", useReturnTypeSchema = true, headers = @Header(name = HttpHeaders.LOCATION, description = "생성된 예약 정보 URL", schema = @Schema(example = "/reservations/1"))) }) - public RoomEscapeApiResponse saveWaiting( + public RoomescapeApiResponse saveWaiting( @Valid @RequestBody WaitingRequest waitingRequest, @MemberId @Parameter(hidden = true) Long memberId, HttpServletResponse response @@ -215,14 +215,14 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "204", description = "성공"), @ApiResponse(responseCode = "404", description = "회원의 예약 대기 정보를 찾을 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse deleteWaiting( + public RoomescapeApiResponse deleteWaiting( @MemberId @Parameter(hidden = true) Long memberId, @NotNull(message = "reservationId는 null 또는 공백일 수 없습니다.") @PathVariable("id") @Parameter(description = "예약 ID") Long reservationId ) { reservationService.cancelWaiting(reservationId, memberId); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } @Admin @@ -232,17 +232,17 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공"), @ApiResponse(responseCode = "404", description = "예약 대기 정보를 찾을 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))), + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))), @ApiResponse(responseCode = "409", description = "확정된 예약이 존재하여 대기 중인 예약을 승인할 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse approveWaiting( + public RoomescapeApiResponse approveWaiting( @MemberId @Parameter(hidden = true) Long memberId, @NotNull(message = "reservationId는 null 또는 공백일 수 없습니다.") @PathVariable("id") @Parameter(description = "예약 ID") Long reservationId ) { reservationService.approveWaiting(reservationId, memberId); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } @Admin @@ -252,22 +252,22 @@ public class ReservationController { @ApiResponses({ @ApiResponse(responseCode = "204", description = "대기 중인 예약 거절 성공"), @ApiResponse(responseCode = "404", description = "예약 대기 정보를 찾을 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse denyWaiting( + public RoomescapeApiResponse denyWaiting( @MemberId @Parameter(hidden = true) Long memberId, @NotNull(message = "reservationId는 null 또는 공백일 수 없습니다.") @PathVariable("id") @Parameter(description = "예약 ID") Long reservationId ) { reservationService.denyWaiting(reservationId, memberId); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } - private RoomEscapeApiResponse getCreatedReservationResponse( + private RoomescapeApiResponse getCreatedReservationResponse( ReservationResponse reservationResponse, HttpServletResponse response ) { response.setHeader(HttpHeaders.LOCATION, "/reservations/" + reservationResponse.id()); - return RoomEscapeApiResponse.success(reservationResponse); + return RoomescapeApiResponse.success(reservationResponse); } } diff --git a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java b/src/main/java/roomescape/reservation/controller/ReservationTimeController.java index b8b6dae4..c70aa217 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationTimeController.java @@ -30,8 +30,8 @@ import roomescape.reservation.dto.response.ReservationTimesResponse; import roomescape.reservation.service.ReservationTimeService; import roomescape.auth.web.support.Admin; import roomescape.auth.web.support.LoginRequired; -import roomescape.common.dto.response.ErrorResponse; -import roomescape.common.dto.response.RoomEscapeApiResponse; +import roomescape.common.dto.response.RoomescapeErrorResponse; +import roomescape.common.dto.response.RoomescapeApiResponse; @RestController @Tag(name = "4. 예약 시간 API", description = "예약 시간을 조회 / 추가 / 삭제할 때 사용합니다.") @@ -50,8 +50,8 @@ public class ReservationTimeController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse getAllTimes() { - return RoomEscapeApiResponse.success(reservationTimeService.findAllTimes()); + public RoomescapeApiResponse getAllTimes() { + return RoomescapeApiResponse.success(reservationTimeService.findAllTimes()); } @Admin @@ -61,16 +61,16 @@ public class ReservationTimeController { @ApiResponses({ @ApiResponse(responseCode = "201", description = "성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "409", description = "같은 시간을 추가할 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse saveTime( + public RoomescapeApiResponse saveTime( @Valid @RequestBody ReservationTimeRequest reservationTimeRequest, HttpServletResponse response ) { ReservationTimeResponse reservationTimeResponse = reservationTimeService.addTime(reservationTimeRequest); response.setHeader(HttpHeaders.LOCATION, "/times/" + reservationTimeResponse.id()); - return RoomEscapeApiResponse.success(reservationTimeResponse); + return RoomescapeApiResponse.success(reservationTimeResponse); } @Admin @@ -80,14 +80,14 @@ public class ReservationTimeController { @ApiResponses({ @ApiResponse(responseCode = "204", description = "성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "409", description = "예약된 시간은 삭제할 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse removeTime( + public RoomescapeApiResponse removeTime( @NotNull(message = "timeId는 null 또는 공백일 수 없습니다.") @PathVariable @Parameter(description = "삭제하고자 하는 시간의 ID값") Long id ) { reservationTimeService.removeTimeById(id); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } @LoginRequired @@ -97,7 +97,7 @@ public class ReservationTimeController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse findAllAvailableReservationTimes( + public RoomescapeApiResponse findAllAvailableReservationTimes( @NotNull(message = "날짜는 null일 수 없습니다.") @RequestParam @Parameter(description = "yyyy-MM-dd 형식으로 입력해주세요.", example = "2024-06-10") @@ -107,6 +107,6 @@ public class ReservationTimeController { @Parameter(description = "조회할 테마의 ID를 입력해주세요.", example = "1") Long themeId ) { - return RoomEscapeApiResponse.success(reservationTimeService.findAllAvailableTimesByDateAndTheme(date, themeId)); + return RoomescapeApiResponse.success(reservationTimeService.findAllAvailableTimesByDateAndTheme(date, themeId)); } } diff --git a/src/main/java/roomescape/theme/controller/ThemeController.java b/src/main/java/roomescape/theme/controller/ThemeController.java index 3a6507b6..e40b459f 100644 --- a/src/main/java/roomescape/theme/controller/ThemeController.java +++ b/src/main/java/roomescape/theme/controller/ThemeController.java @@ -23,8 +23,8 @@ import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import roomescape.auth.web.support.Admin; import roomescape.auth.web.support.LoginRequired; -import roomescape.common.dto.response.ErrorResponse; -import roomescape.common.dto.response.RoomEscapeApiResponse; +import roomescape.common.dto.response.RoomescapeErrorResponse; +import roomescape.common.dto.response.RoomescapeApiResponse; import roomescape.theme.dto.ThemeRequest; import roomescape.theme.dto.ThemeResponse; import roomescape.theme.dto.ThemesResponse; @@ -47,8 +47,8 @@ public class ThemeController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse getAllThemes() { - return RoomEscapeApiResponse.success(themeService.findAllThemes()); + public RoomescapeApiResponse getAllThemes() { + return RoomescapeApiResponse.success(themeService.findAllThemes()); } @GetMapping("/themes/most-reserved-last-week") @@ -57,10 +57,10 @@ public class ThemeController { @ApiResponses({ @ApiResponse(responseCode = "200", description = "성공", useReturnTypeSchema = true) }) - public RoomEscapeApiResponse getMostReservedThemes( + public RoomescapeApiResponse getMostReservedThemes( @RequestParam(defaultValue = "10") @Parameter(description = "최대로 조회할 테마 갯수") int count ) { - return RoomEscapeApiResponse.success(themeService.getMostReservedThemesByCount(count)); + return RoomescapeApiResponse.success(themeService.getMostReservedThemesByCount(count)); } @Admin @@ -70,16 +70,16 @@ public class ThemeController { @ApiResponses({ @ApiResponse(responseCode = "201", description = "성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "409", description = "같은 이름의 테마를 추가할 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse saveTheme( + public RoomescapeApiResponse saveTheme( @Valid @RequestBody ThemeRequest request, HttpServletResponse response ) { ThemeResponse themeResponse = themeService.addTheme(request); response.setHeader(HttpHeaders.LOCATION, "/themes/" + themeResponse.id()); - return RoomEscapeApiResponse.success(themeResponse); + return RoomescapeApiResponse.success(themeResponse); } @Admin @@ -89,13 +89,13 @@ public class ThemeController { @ApiResponses({ @ApiResponse(responseCode = "204", description = "성공", useReturnTypeSchema = true), @ApiResponse(responseCode = "409", description = "예약된 테마는 삭제할 수 없습니다.", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))) + content = @Content(schema = @Schema(implementation = RoomescapeErrorResponse.class))) }) - public RoomEscapeApiResponse removeTheme( + public RoomescapeApiResponse removeTheme( @NotNull(message = "themeId는 null일 수 없습니다.") @PathVariable Long id ) { themeService.removeThemeById(id); - return RoomEscapeApiResponse.success(); + return RoomescapeApiResponse.success(); } }