Merge pull request #9 from fingersdanny/feat-member

[refactor] controller 수정 및 커스텀 코드를 위한 ServiceStatus 및 모든 RepsonseEntity 생성 통일을 위한 ResponseEntityFactory 생성

src/main/java/com/kernel360/kernelsquare/domain/member/controller/MemberController.java

@@ -15,11 +15,10 @@
 import com.kernel360.kernelsquare.domain.member.dto.UpdateMemberRequest;
 import com.kernel360.kernelsquare.domain.member.service.MemberService;
 import com.kernel360.kernelsquare.global.common_response.ApiResponse;
+import com.kernel360.kernelsquare.global.common_response.ResponseEntityFactory;
 
 import lombok.RequiredArgsConstructor;
 
-// todo : data가 존재하지 않는 응답일 때 data에 어떤 것을 넣을지? 혹은 어떻게 리팩토링을 통해서 data가 없는 응답을 만들어낼지..
-
 @RestController
 @RequestMapping("/api/v1")
 @RequiredArgsConstructor
@@ -30,25 +29,25 @@ public class MemberController {
 	public ResponseEntity<ApiResponse> updateMember(@PathVariable Long memberId,
 		@RequestBody UpdateMemberRequest updateMemberRequest) {
 		memberService.updateMember(memberId, updateMemberRequest);
-		return ResponseEntity.ok(ApiResponse.of(MEMBER_INFO_UPDATED));
+		return ResponseEntityFactory.toResponseEntity(MEMBER_INFO_UPDATED);
 	}
 
 	@PutMapping("/members/{memberId}/password")
 	public ResponseEntity<ApiResponse> updateMemberPassword(@PathVariable Long memberId,
 		@RequestBody String password) {
 		memberService.updateMemberPassword(memberId, password);
-		return ResponseEntity.ok(ApiResponse.of(MEMBER_PASSWORD_UPDATED));
+		return ResponseEntityFactory.toResponseEntity(MEMBER_PASSWORD_UPDATED);
 	}
 
 	@GetMapping("/members/{memberId}")
 	public ResponseEntity<ApiResponse<FindMemberResponse>> findMember(@PathVariable Long memberId) {
 		FindMemberResponse findMemberResponse = memberService.findMember(memberId);
-		return ResponseEntity.ok(ApiResponse.of(MEMBER_FOUND, findMemberResponse));
+		return ResponseEntityFactory.toResponseEntity(MEMBER_FOUND, findMemberResponse);
 	}
 
 	@DeleteMapping("/members/{memberId}")
 	public ResponseEntity<ApiResponse> deleteMember(@PathVariable Long memberId) {
 		memberService.deleteMember(memberId);
-		return ResponseEntity.ok(ApiResponse.of(MEMBER_DELETED));
+		return ResponseEntityFactory.toResponseEntity(MEMBER_DELETED);
 	}
 }

src/main/java/com/kernel360/kernelsquare/domain/member/service/MemberService.java

@@ -43,6 +43,6 @@ public void deleteMember(Long id) {
 
 	private Member getMemberById(Long id) {
 		return memberRepository.findById(id)
-			.orElseThrow(() -> new BusinessException(MemberErrorCode.NOT_FOUND_MEMBER));
+			.orElseThrow(() -> new BusinessException(MemberErrorCode.MEMBER_NOT_FOUND));
 	}
 }

src/main/java/com/kernel360/kernelsquare/global/common_response/ApiResponse.java

@@ -13,7 +13,7 @@ public static <T> ApiResponse<T> of(
 		StatusCode statusCode,
 		T data) {
 		return new ApiResponse(
-			statusCode.getStatus().value(),
+			statusCode.getCode(),
 			statusCode.getMsg(),
 			data
 		);
@@ -23,7 +23,7 @@ public static <T> ApiResponse<T> of(
 		StatusCode statusCode
 	) {
 		return new ApiResponse<>(
-			statusCode.getStatus().value(),
+			statusCode.getCode(),
 			statusCode.getMsg(),
 			null
 		);

src/main/java/com/kernel360/kernelsquare/global/common_response/ResponseEntityFactory.java

@@ -0,0 +1,13 @@
+package com.kernel360.kernelsquare.global.common_response;
+
+import org.springframework.http.ResponseEntity;
+
+public class ResponseEntityFactory {
+	public static ResponseEntity<ApiResponse> toResponseEntity(StatusCode statusCode) {
+		return ResponseEntity.status(statusCode.getStatus()).body(ApiResponse.of(statusCode));
+	}
+
+	public static <T> ResponseEntity<ApiResponse<T>> toResponseEntity(StatusCode statusCode, T data) {
+		return ResponseEntity.status(statusCode.getStatus()).body(ApiResponse.of(statusCode, data));
+	}
+}

src/main/java/com/kernel360/kernelsquare/global/common_response/StatusCode.java

@@ -5,5 +5,7 @@
 public interface StatusCode {
 	HttpStatus getStatus();
 
+	Integer getCode();
+
 	String getMsg();
 }

src/main/java/com/kernel360/kernelsquare/global/common_response/error/GlobalExceptionHandler.java

@@ -4,7 +4,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import com.kernel360.kernelsquare.global.common_response.error.dto.ErrorResponse;
+import com.kernel360.kernelsquare.global.common_response.ApiResponse;
 import com.kernel360.kernelsquare.global.common_response.error.exception.BusinessException;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -13,9 +13,9 @@
 public class GlobalExceptionHandler {
 
 	@ExceptionHandler(BusinessException.class)
-	public ResponseEntity<ErrorResponse> handleBusinessException(BusinessException e,
+	public ResponseEntity<ApiResponse> handleBusinessException(BusinessException e,
 		HttpServletRequest request) {
 		return ResponseEntity.status(e.getErrorCode().getStatus())
-			.body(ErrorResponse.of(e.getErrorCode()));
+			.body(ApiResponse.of(e.getErrorCode()));
 	}
 }

src/main/java/com/kernel360/kernelsquare/global/common_response/error/code/AuthErrorCode.java

@@ -1,28 +1,36 @@
-package com.kernel360.kernelsquare.global.common_response.error.code;
-
-import org.springframework.http.HttpStatus;
-
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public enum AuthErrorCode implements ErrorCode {
-	INVALID_ACCOUNT(HttpStatus.UNAUTHORIZED, "계정정보가 일치하지 않습니다."),
-	INVALID_PASSWORD(HttpStatus.UNAUTHORIZED, "비밀번호가 일치하지 않습니다."),
-	ALREADY_SAVED_NICKNAME(HttpStatus.CONFLICT, "사용 중인 닉네임입니다."),
-	ALREADY_SAVED_EMAIL(HttpStatus.CONFLICT, "사용 중인 이메일입니다."),
-	ALREADY_SOCIAL_LOGIN(HttpStatus.CONFLICT, "소셜로 가입한 회원입니다. 소셜로 로그인 해주세요.");
-
-	private final HttpStatus code;
-	private final String msg;
-
-	@Override
-	public HttpStatus getStatus() {
-		return code;
-	}
-
-	@Override
-	public String getMsg() {
-		return msg;
-	}
-}
-
+// package com.kernel360.kernelsquare.global.common_response.error.code;
+//
+// import org.springframework.http.HttpStatus;
+//
+// import com.kernel360.kernelsquare.global.common_response.service.code.ServiceStatus;
+//
+// import lombok.RequiredArgsConstructor;
+//
+// @RequiredArgsConstructor
+// public enum AuthErrorCode implements ErrorCode {
+// 	INVALID_ACCOUNT(HttpStatus.UNAUTHORIZED, "계정정보가 일치하지 않습니다."),
+// 	INVALID_PASSWORD(HttpStatus.UNAUTHORIZED, "비밀번호가 일치하지 않습니다."),
+// 	ALREADY_SAVED_NICKNAME(HttpStatus.CONFLICT, "사용 중인 닉네임입니다."),
+// 	ALREADY_SAVED_EMAIL(HttpStatus.CONFLICT, "사용 중인 이메일입니다."),
+// 	ALREADY_SOCIAL_LOGIN(HttpStatus.CONFLICT, "소셜로 가입한 회원입니다. 소셜로 로그인 해주세요.");
+//
+// 	private final HttpStatus code;
+// 	private final ServiceStatus serviceStatus;
+// 	private final String msg;
+//
+// 	@Override
+// 	public HttpStatus getStatus() {
+// 		return code;
+// 	}
+//
+// 	@Override
+// 	public Integer getCode() {
+// 		return serviceStatus.getServiceStatus();
+// 	}
+//
+// 	@Override
+// 	public String getMsg() {
+// 		return msg;
+// 	}
+// }
+//

src/main/java/com/kernel360/kernelsquare/global/common_response/error/code/MemberErrorCode.java

@@ -2,20 +2,29 @@
 
 import org.springframework.http.HttpStatus;
 
+import com.kernel360.kernelsquare.global.common_response.service.code.MemberServiceStatus;
+import com.kernel360.kernelsquare.global.common_response.service.code.ServiceStatus;
+
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public enum MemberErrorCode implements ErrorCode {
-	NOT_FOUND_MEMBER(HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다.");
+	MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, MemberServiceStatus.MEMBER_NOT_FOUND, "존재하지 않는 회원입니다.");
 
 	private final HttpStatus code;
+	private final ServiceStatus serviceStatus;
 	private final String msg;
 
 	@Override
 	public HttpStatus getStatus() {
 		return code;
 	}
 
+	@Override
+	public Integer getCode() {
+		return serviceStatus.getServiceStatus();
+	}
+
 	@Override
 	public String getMsg() {
 		return msg;

src/main/java/com/kernel360/kernelsquare/global/common_response/response/code/MemberResponseCode.java

@@ -2,23 +2,32 @@
 
 import org.springframework.http.HttpStatus;
 
+import com.kernel360.kernelsquare.global.common_response.service.code.MemberServiceStatus;
+import com.kernel360.kernelsquare.global.common_response.service.code.ServiceStatus;
+
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public enum MemberResponseCode implements ResponseCode {
-	MEMBER_FOUND(HttpStatus.OK, "회원 정보 조회 성공"),
-	MEMBER_PASSWORD_UPDATED(HttpStatus.OK, "비밀번호 수정 완료"),
-	MEMBER_INFO_UPDATED(HttpStatus.OK, "회원 정보 수정 성공"),
-	MEMBER_DELETED(HttpStatus.OK, "회원 탈퇴 성공");
+	MEMBER_FOUND(HttpStatus.OK, MemberServiceStatus.MEMBER_FOUND, "회원 정보 조회 성공"),
+	MEMBER_PASSWORD_UPDATED(HttpStatus.OK, MemberServiceStatus.MEMBER_PASSWORD_UPDATED, "비밀번호 수정 성공"),
+	MEMBER_INFO_UPDATED(HttpStatus.OK, MemberServiceStatus.MEMBER_INFO_UPDATED, "회원 정보 수정 성공"),
+	MEMBER_DELETED(HttpStatus.OK, MemberServiceStatus.MEMBER_DELETED, "회원 탈퇴 성공");
 
 	private final HttpStatus code;
+	private final ServiceStatus serviceStatus;
 	private final String msg;
 
 	@Override
 	public HttpStatus getStatus() {
 		return code;
 	}
 
+	@Override
+	public Integer getCode() {
+		return serviceStatus.getServiceStatus();
+	}
+
 	@Override
 	public String getMsg() {
 		return msg;

src/main/java/com/kernel360/kernelsquare/global/common_response/service/code/MemberServiceStatus.java

@@ -0,0 +1,19 @@
+package com.kernel360.kernelsquare.global.common_response.service.code;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum MemberServiceStatus implements ServiceStatus {
+	MEMBER_NOT_FOUND(1201),
+	MEMBER_FOUND(1240),
+	MEMBER_PASSWORD_UPDATED(1241),
+	MEMBER_INFO_UPDATED(1242),
+	MEMBER_DELETED(1243);
+
+	private final Integer code;
+
+	@Override
+	public Integer getServiceStatus() {
+		return code;
+	}
+}

src/main/java/com/kernel360/kernelsquare/global/common_response/service/code/ServiceStatus.java

@@ -0,0 +1,5 @@
+package com.kernel360.kernelsquare.global.common_response.service.code;
+
+public interface ServiceStatus {
+	Integer getServiceStatus();
+}