From c7e3390170637749463582dbb0bf780283abe26e Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Mon, 29 Jul 2024 22:35:44 +0900 Subject: [PATCH] =?UTF-8?q?Refactor:=20=EA=B3=B5=ED=86=B5=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EB=B0=8F=20=EC=97=90=EB=9F=AC=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suppin/global/exception/status/ErrorStatus.java | 2 +- .../global/exception/status/SuccessStatus.java | 2 ++ .../cmc/suppin/global/presentation/ApiResponse.java | 8 ++++++-- .../com/cmc/suppin/member/controller/MemberApi.java | 12 ++++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cmc/suppin/global/exception/status/ErrorStatus.java b/src/main/java/com/cmc/suppin/global/exception/status/ErrorStatus.java index 2188d1e..daa338a 100644 --- a/src/main/java/com/cmc/suppin/global/exception/status/ErrorStatus.java +++ b/src/main/java/com/cmc/suppin/global/exception/status/ErrorStatus.java @@ -21,7 +21,7 @@ public enum ErrorStatus implements BaseErrorCode { TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "테스트"), // Member - MEMBER_NICKNAME_DUPLICATED(HttpStatus.BAD_REQUEST, "MEMBER4001", "중복된 닉네임 입니다."), + MEMBER_USERID_DUPLICATED(HttpStatus.BAD_REQUEST, "MEMBER4001", "중복된 아이디 입니다."), MEMBER_PASSWORD_ERROR(HttpStatus.BAD_REQUEST, "MEMBER4002", "비밀번호가 잘못되었습니다."), //JWT diff --git a/src/main/java/com/cmc/suppin/global/exception/status/SuccessStatus.java b/src/main/java/com/cmc/suppin/global/exception/status/SuccessStatus.java index 9b9f06b..6956bbe 100644 --- a/src/main/java/com/cmc/suppin/global/exception/status/SuccessStatus.java +++ b/src/main/java/com/cmc/suppin/global/exception/status/SuccessStatus.java @@ -12,6 +12,8 @@ public enum SuccessStatus implements BaseCode { _OK(HttpStatus.OK, "COMMON200", "성공입니다."), //Member + MEMBER_JOIN_SUCCESS(HttpStatus.OK, "MEMBER2000", "회원 가입 성공입니다."), + MEMBER_ID_CONFIRM_SUCCESS(HttpStatus.OK, "MEMBER2001", "아이디가 중복되지 않습니다."), MEMBER_DELETE_SUCCESS(HttpStatus.OK, "MEMBER2001", "회원 탈퇴 성공입니다."), ; diff --git a/src/main/java/com/cmc/suppin/global/presentation/ApiResponse.java b/src/main/java/com/cmc/suppin/global/presentation/ApiResponse.java index d239b00..d4827a2 100644 --- a/src/main/java/com/cmc/suppin/global/presentation/ApiResponse.java +++ b/src/main/java/com/cmc/suppin/global/presentation/ApiResponse.java @@ -1,11 +1,11 @@ package com.cmc.suppin.global.presentation; +import com.cmc.suppin.global.exception.BaseCode; +import com.cmc.suppin.global.exception.status.SuccessStatus; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Getter; -import com.cmc.suppin.global.exception.BaseCode; -import com.cmc.suppin.global.exception.status.SuccessStatus; @Getter @AllArgsConstructor @@ -23,6 +23,10 @@ public static ApiResponse onSuccess(T result) { return new ApiResponse<>(true, SuccessStatus._OK.getCode(), SuccessStatus._OK.getMessage(), result); } + public static ApiResponse onSuccess(T result, SuccessStatus successStatus) { + return new ApiResponse<>(true, successStatus.getCode(), successStatus.getMessage(), result); + } + public static ApiResponse of(BaseCode code, T result) { return new ApiResponse<>(true, code.getReasonHttpStatus().getCode(), code.getReasonHttpStatus().getMessage(), result); } diff --git a/src/main/java/com/cmc/suppin/member/controller/MemberApi.java b/src/main/java/com/cmc/suppin/member/controller/MemberApi.java index 3262214..10b65bb 100644 --- a/src/main/java/com/cmc/suppin/member/controller/MemberApi.java +++ b/src/main/java/com/cmc/suppin/member/controller/MemberApi.java @@ -1,5 +1,6 @@ package com.cmc.suppin.member.controller; +import com.cmc.suppin.global.exception.status.SuccessStatus; import com.cmc.suppin.global.presentation.ApiResponse; import com.cmc.suppin.member.controller.dto.MemberRequestDTO; import com.cmc.suppin.member.controller.dto.MemberResponseDTO; @@ -12,7 +13,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @Slf4j @@ -30,15 +34,15 @@ public class MemberApi { public ApiResponse join(@RequestBody @Valid MemberRequestDTO.JoinDTO request) { Member member = memberCommandService.join(request); - return ApiResponse.onSuccess(MemberConverter.toJoinResultDTO(member)); + return ApiResponse.onSuccess(MemberConverter.toJoinResultDTO(member), SuccessStatus.MEMBER_JOIN_SUCCESS); } - @GetMapping("/checkUserId") + @PostMapping("/checkUserId") @Operation(summary = "아이디 중복 체크 API", description = "request : userId, response: 중복이면 false, 중복 아니면 true") public ApiResponse checkUserId(@RequestBody MemberRequestDTO.IdConfirmDTO request) { boolean checkUserId = memberCommandService.confirmUserId(request); - return ApiResponse.onSuccess(MemberConverter.toIdConfirmResultDTO(checkUserId)); + return ApiResponse.onSuccess(MemberConverter.toIdConfirmResultDTO(checkUserId), SuccessStatus.MEMBER_ID_CONFIRM_SUCCESS); } }