From 4aa9e8bc835dc5d9abd5d04f4890200f43747f95 Mon Sep 17 00:00:00 2001 From: Kim Dae Hwi <121790935+marooo326@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:15:00 +0900 Subject: [PATCH 1/6] =?UTF-8?q?test:=20=EB=A9=A4=EB=B2=84=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20test.http=20=ED=8C=8C=EC=9D=BC=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20(#149)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: member 관련 http 테스트 추가 * test: 슈퍼관리자, 관리자 http 테스트 추가 --------- Co-authored-by: 조은비 <69096886+eunbc@users.noreply.github.com> --- api/api-member/http/test.http | 126 ++++++++++++++++-- .../dto/request/AdminCreateRequest.java | 3 +- 2 files changed, 117 insertions(+), 12 deletions(-) diff --git a/api/api-member/http/test.http b/api/api-member/http/test.http index 0aecfb18..9fe6657c 100644 --- a/api/api-member/http/test.http +++ b/api/api-member/http/test.http @@ -1,3 +1,14 @@ +@token = eyJhbGciOiJIUzI1NiJ9.eyJpZCI6Mywic3ViIjoiZGh4bDUwQG5hdmVyLmNvbSIsImlhdCI6MTcwNDYxNjU4NSwiZXhwIjoyMDY0NjE2NTg1LCJhdXRob3JpdHkiOiJST0xFX1VTRVIifQ.OIiQazdvmv-bsZp0VroiouW5gEqNAj7ROqRTOcLbWXQ +@adminToken = eyJhbGciOiJIUzI1NiJ9.eyJpZCI6Miwic3ViIjoiYWRtaW5AZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2Mzc1NzgsImV4cCI6MjA2NDYzNzU3OCwiYXV0aG9yaXR5IjoiUk9MRV9BRE1JTiJ9.lAXg2NbcVeuSak6IW-AUNKC6zqd_0x_ER8RU3CMxNpk + +### 토큰 갱신 +POST http://localhost:8081/api/v1/auth/refresh +Content-Type: application/json + +{ + "refreshToken": "a718e554-fad4-48c2-a131-d73228937605" +} + ### 로그인 - 슈퍼 관리자 POST http://localhost:8081/api/v1/auth/admin/login Content-Type: application/json @@ -7,6 +18,45 @@ Content-Type: application/json "password": "user1234" } + +### 관리자 등록 - 슈퍼 관리자 +POST http://localhost:8081/api/v1/admin/management +Content-Type: application/json +Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoic3VwZXJhZG1pbkBleGFtcGxlLmNvbSIsImlhdCI6MTcwNDY0MzY2MSwiZXhwIjoxNzA0NjQ1NDYxLCJhdXRob3JpdHkiOiJST0xFX1NVUEVSQURNSU4ifQ.CGgjH4e4FTvz8s-adQBd2S6T5N8Uo9YLfht3LIkE0Js + +{ + "name": "testAdmin", + "password": "user1234", + "passwordConfirm": "user1234", + "phoneNumber": "01012345678", + "email": "testAdmin@admin.com", + "role": "ROLE_ADMIN" +} + +### 관리자 목록 조회 - 슈퍼 관리자 +GET http://localhost:8081/api/v1/admin/management +Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoic3VwZXJhZG1pbkBleGFtcGxlLmNvbSIsImlhdCI6MTcwNDY0MzY2MSwiZXhwIjoxNzA0NjQ1NDYxLCJhdXRob3JpdHkiOiJST0xFX1NVUEVSQURNSU4ifQ.CGgjH4e4FTvz8s-adQBd2S6T5N8Uo9YLfht3LIkE0Js + +### 관리자 수정 - 슈퍼 관리자 +PATCH http://localhost:8081/api/v1/admin/management/1 +Content-Type: application/json +Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoic3VwZXJhZG1pbkBleGFtcGxlLmNvbSIsImlhdCI6MTcwNDY0MzY2MSwiZXhwIjoxNzA0NjQ1NDYxLCJhdXRob3JpdHkiOiJST0xFX1NVUEVSQURNSU4ifQ.CGgjH4e4FTvz8s-adQBd2S6T5N8Uo9YLfht3LIkE0Js + +{ + "name": "", + "password": "", + "passwordConfirm": "", + "phoneNumber": "", + "status": "ACTIVE", + "role": "ROLE_ADMIN" +} + +### 관리자 삭제 - 슈퍼 관리자 +DELETE http://localhost:8081/api/v1/admin/management?adminIds=1 +Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoic3VwZXJhZG1pbkBleGFtcGxlLmNvbSIsImlhdCI6MTcwNDY0MzY2MSwiZXhwIjoxNzA0NjQ1NDYxLCJhdXRob3JpdHkiOiJST0xFX1NVUEVSQURNSU4ifQ.CGgjH4e4FTvz8s-adQBd2S6T5N8Uo9YLfht3LIkE0Js + +###### + ### 로그인 - 관리자 POST http://localhost:8081/api/v1/auth/admin/login Content-Type: application/json @@ -16,19 +66,25 @@ Content-Type: application/json "password": "user1234" } -### 회원 목록 조회 +### 관리자 본인 정보 조회 +GET http://localhost:8081/api/v1/admin/me +Authorization: Bearer {{adminToken}} + +### 관리자 본인 탈퇴 +DELETE http://localhost:8081/api/v1/admin/me +Authorization: Bearer {{adminToken}} + +### 멤버 정보 조회 - 관리자 GET http://localhost:8081/api/v1/admin/members -Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6Miwic3ViIjoiYWRtaW5AZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2MDg3MzQsImV4cCI6MTcwNDYxMDUzNCwiYXV0aG9yaXR5IjoiUk9MRV9BRE1JTiJ9.3EHS2VF2XqW4xfE1W0iFMUaK1P3r2wpFgK9imzw3xp4 +Authorization: Bearer {{adminToken}} -### 토큰 갱신 -POST http://localhost:8081/api/v1/auth/refresh -Content-Type: application/json +### 멤버 상세 정보 조회 - 관리자 +GET http://localhost:8081/api/v1/admin/members/details?memberIds=1,2 +Authorization: Bearer {{adminToken}} -{ - "refreshToken": "a718e554-fad4-48c2-a131-d73228937605" -} +####### -### 유저 일반 회원가입 +### 멤버 일반 회원가입 POST http://localhost:8081/api/v1/members/signup Content-Type: application/json @@ -45,7 +101,7 @@ Content-Type: application/json "zipCode": "12345" } -### 유저 로그인 +### 멤버 로그인 POST http://localhost:8081/api/v1/auth/members/login Content-Type: application/json @@ -54,5 +110,53 @@ Content-Type: application/json "password": "password" } -### 유저 OAuth 로그인 / 회원가입 (직접테스트) +### 멤버 OAuth 로그인 / 회원가입 (직접테스트) http://localhost:8081/login + +### 멤버 본인 정보 조회 (토큰 필요) +GET http://localhost:8081/api/v1/members/me +Authorization: Bearer {{token}} + +### 멤버 본인 정보 수정 (토큰 필요) +PATCH http://localhost:8081/api/v1/members/me +Authorization: Bearer {{token}} +Content-Type: application/json + +{ + "name": "변경된 이름", + "phoneNumber": "01099999999", + "birthDate": "19990101", + "gender": "MALE", + "streetAddress": "", + "detailAddress": "", + "zipCode": "01012" +} + +### 멤버 본인 비밀번호 변경 (토큰 필요, 카카오는 불가능) +PATCH http://localhost:8081/api/v1/members/me/password +Authorization: Bearer {{token}} +Content-Type: application/json + +{ + "originPassword": "", + "newPassword": "", + "newPasswordConfirm": "" +} + +### 멤버 본인 비밀번호 확인 (토큰 필요, 카카오는 불가능) +POST http://localhost:8081/api/v1/members/me/verify-password +Authorization: Bearer {{token}} +Content-Type: application/json + +{ + "password": "" +} + +### 멤버 본인 탈퇴 (토큰 필요) +DELETE http://localhost:8081/api/v1/members/me +Authorization: Bearer {{token}} + +### 멤버 계정 복구 (토큰 필요) +POST http://localhost:8081/api/v1/members/restore +Content-Type: application/x-www-form-urlencoded +Authorization: Bearer {{token}} diff --git a/api/api-member/src/main/java/com/pgms/apimember/dto/request/AdminCreateRequest.java b/api/api-member/src/main/java/com/pgms/apimember/dto/request/AdminCreateRequest.java index 6f14759f..6df1e25c 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/dto/request/AdminCreateRequest.java +++ b/api/api-member/src/main/java/com/pgms/apimember/dto/request/AdminCreateRequest.java @@ -5,6 +5,7 @@ import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; @@ -28,7 +29,7 @@ public record AdminCreateRequest( @Email(message = "이메일 형식에 맞지 않습니다.") String email, - @NotBlank(message = "역할은 필수 항목입니다.") + @NotNull(message = "역할은 필수 항목입니다.") Role role ) { public static Admin toEntity(AdminCreateRequest requestDto, String encodedPassword, Role role) { From b15c196dc036d2452b68e0ffa2b51c5a2b74edfb Mon Sep 17 00:00:00 2001 From: Kim Dae Hwi <121790935+marooo326@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:19:18 +0900 Subject: [PATCH 2/6] =?UTF-8?q?refactor:=20=EA=B3=B5=ED=86=B5=20BaseErrorC?= =?UTF-8?q?ode=20=EC=A0=95=EC=9D=98=20(#153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 조은비 <69096886+eunbc@users.noreply.github.com> --- .../pgms/apimember/exception/AdminException.java | 4 +++- .../pgms/apimember/exception/CustomException.java | 6 ++++-- .../apimember/exception/GlobalExceptionHandler.java | 11 ++++------- .../pgms/apimember/exception/MemberException.java | 4 +++- .../pgms/apimember/exception/SecurityException.java | 4 +++- .../com/pgms/apimember/service/AdminService.java | 2 +- .../com/pgms/apimember/service/AuthService.java | 4 ++-- .../com/pgms/apimember/service/MemberService.java | 6 +++--- .../coredomain/domain/common/BaseErrorCode.java | 7 +++++++ .../coredomain/domain/common/MemberErrorCode.java | 13 ++++++++++--- 10 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java rename api/api-member/src/main/java/com/pgms/apimember/exception/CustomErrorCode.java => core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java (87%) diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/AdminException.java b/api/api-member/src/main/java/com/pgms/apimember/exception/AdminException.java index ccff3677..7cb5a9a0 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/AdminException.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/AdminException.java @@ -1,11 +1,13 @@ package com.pgms.apimember.exception; +import com.pgms.coredomain.domain.common.MemberErrorCode; + import lombok.Getter; @Getter public class AdminException extends CustomException { - public AdminException(CustomErrorCode errorCode) { + public AdminException(MemberErrorCode errorCode) { super(errorCode); } } diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java b/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java index 7b0a4a3f..12e46709 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java @@ -1,13 +1,15 @@ package com.pgms.apimember.exception; +import com.pgms.coredomain.domain.common.MemberErrorCode; + import lombok.Getter; @Getter public class CustomException extends RuntimeException { - protected final CustomErrorCode errorCode; + protected final MemberErrorCode errorCode; - public CustomException(CustomErrorCode errorCode) { + public CustomException(MemberErrorCode errorCode) { super(errorCode.getMessage()); this.errorCode = errorCode; } diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java b/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java index c296aa1a..08d86b3c 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java @@ -1,7 +1,6 @@ package com.pgms.apimember.exception; import java.util.List; -import java.util.Objects; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,6 +10,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coredomain.response.ErrorResponse; import lombok.extern.slf4j.Slf4j; @@ -29,20 +29,17 @@ protected ResponseEntity handleGlobalException(Exception ex) { @ExceptionHandler(CustomException.class) protected ResponseEntity handleEventCustomException(CustomException ex) { log.warn(">>>>> Custom Exception : {}", ex); - CustomErrorCode errorCode = ex.getErrorCode(); - ErrorResponse errorResponse = new ErrorResponse(errorCode.getErrorCode(), errorCode.getMessage()); - return ResponseEntity.status(errorCode.getStatus()).body(errorResponse); + MemberErrorCode errorCode = ex.getErrorCode(); + return ResponseEntity.status(errorCode.getStatus()).body(errorCode.getErrorResponse()); } @ExceptionHandler(MethodArgumentNotValidException.class) protected ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException ex) { log.warn(">>>>> validation Failed : {}", ex); BindingResult bindingResult = ex.getBindingResult(); - String errorMessage = Objects.requireNonNull(bindingResult.getFieldError()) - .getDefaultMessage(); List fieldErrors = bindingResult.getFieldErrors(); - ErrorResponse errorResponse = new ErrorResponse(CustomErrorCode.VALIDATION_FAILED.getErrorCode(), errorMessage); + ErrorResponse errorResponse = MemberErrorCode.VALIDATION_FAILED.getErrorResponse(); fieldErrors.forEach(error -> errorResponse.addValidation(error.getField(), error.getDefaultMessage())); return ResponseEntity.status(ex.getStatusCode()).body(errorResponse); } diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/MemberException.java b/api/api-member/src/main/java/com/pgms/apimember/exception/MemberException.java index 5b5cf684..75193ece 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/MemberException.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/MemberException.java @@ -1,11 +1,13 @@ package com.pgms.apimember.exception; +import com.pgms.coredomain.domain.common.MemberErrorCode; + import lombok.Getter; @Getter public class MemberException extends CustomException { - public MemberException(CustomErrorCode errorCode) { + public MemberException(MemberErrorCode errorCode) { super(errorCode); } } diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java b/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java index b80f930b..03a6798d 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java @@ -1,7 +1,9 @@ package com.pgms.apimember.exception; +import com.pgms.coredomain.domain.common.MemberErrorCode; + public class SecurityException extends CustomException { - public SecurityException(CustomErrorCode errorCode) { + public SecurityException(MemberErrorCode errorCode) { super(errorCode); } } diff --git a/api/api-member/src/main/java/com/pgms/apimember/service/AdminService.java b/api/api-member/src/main/java/com/pgms/apimember/service/AdminService.java index de3662c2..f8d30f98 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/service/AdminService.java +++ b/api/api-member/src/main/java/com/pgms/apimember/service/AdminService.java @@ -1,6 +1,6 @@ package com.pgms.apimember.service; -import static com.pgms.apimember.exception.CustomErrorCode.*; +import static com.pgms.coredomain.domain.common.MemberErrorCode.*; import java.util.List; diff --git a/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java b/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java index 67e55f42..ed6612ae 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java +++ b/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java @@ -10,10 +10,10 @@ import com.pgms.apimember.dto.request.LoginRequest; import com.pgms.apimember.dto.request.RefreshTokenRequest; import com.pgms.apimember.dto.response.AuthResponse; -import com.pgms.apimember.exception.CustomErrorCode; import com.pgms.apimember.exception.SecurityException; import com.pgms.apimember.redis.RefreshToken; import com.pgms.apimember.redis.RefreshTokenRepository; +import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coresecurity.security.jwt.JwtTokenProvider; import com.pgms.coresecurity.security.service.AdminUserDetailsService; import com.pgms.coresecurity.security.service.MemberUserDetailsService; @@ -57,7 +57,7 @@ public AuthResponse login(LoginRequest request, String accountType) { public AuthResponse refresh(RefreshTokenRequest request) { // refresh token이 만료됐는지 확인 RefreshToken refreshToken = refreshTokenRepository.findById(request.refreshToken()) - .orElseThrow(() -> new SecurityException(CustomErrorCode.REFRESH_TOKEN_EXPIRED)); + .orElseThrow(() -> new SecurityException(MemberErrorCode.REFRESH_TOKEN_EXPIRED)); // 회원 정보 로드 UserDetailsImpl userDetails = loadUserDetails(refreshToken.getAccountType(), refreshToken.getEmail()); diff --git a/api/api-member/src/main/java/com/pgms/apimember/service/MemberService.java b/api/api-member/src/main/java/com/pgms/apimember/service/MemberService.java index d5d9f37c..8e6c2f88 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/service/MemberService.java +++ b/api/api-member/src/main/java/com/pgms/apimember/service/MemberService.java @@ -1,6 +1,6 @@ package com.pgms.apimember.service; -import static com.pgms.apimember.exception.CustomErrorCode.*; +import static com.pgms.coredomain.domain.common.MemberErrorCode.*; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -10,8 +10,8 @@ import com.pgms.apimember.dto.request.MemberPasswordUpdateRequest; import com.pgms.apimember.dto.request.MemberSignUpRequest; import com.pgms.apimember.dto.response.MemberDetailGetResponse; -import com.pgms.apimember.exception.CustomErrorCode; import com.pgms.apimember.exception.MemberException; +import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coredomain.domain.member.Member; import com.pgms.coredomain.domain.member.repository.MemberRepository; @@ -40,7 +40,7 @@ public Long signUp(MemberSignUpRequest requestDto) { public MemberDetailGetResponse getMemberDetail(Long memberId) { return MemberDetailGetResponse.from( memberRepository.findById(memberId). - orElseThrow(() -> new MemberException(CustomErrorCode.MEMBER_NOT_FOUND))); + orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND))); } @Transactional(readOnly = true) diff --git a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java new file mode 100644 index 00000000..442af541 --- /dev/null +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java @@ -0,0 +1,7 @@ +package com.pgms.coredomain.domain.common; + +import com.pgms.coredomain.response.ErrorResponse; + +public interface BaseErrorCode { + ErrorResponse getErrorResponse(); +} diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/CustomErrorCode.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java similarity index 87% rename from api/api-member/src/main/java/com/pgms/apimember/exception/CustomErrorCode.java rename to core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java index 28ed61c1..d5883e35 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/CustomErrorCode.java +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java @@ -1,11 +1,13 @@ -package com.pgms.apimember.exception; +package com.pgms.coredomain.domain.common; import org.springframework.http.HttpStatus; +import com.pgms.coredomain.response.ErrorResponse; + import lombok.Getter; @Getter -public enum CustomErrorCode { +public enum MemberErrorCode implements BaseErrorCode { // ADMIN ADMIN_NOT_FOUND("NOT FOUND", HttpStatus.NOT_FOUND, "존재하지 않는 관리자입니다."), DUPLICATED_ADMIN_EMAIL("DUPLICATED ADMIN EMAIL", HttpStatus.BAD_REQUEST, "이미 존재하는 관리자 이메일입니다."), @@ -34,9 +36,14 @@ public enum CustomErrorCode { private final HttpStatus status; private final String message; - CustomErrorCode(String errorCode, HttpStatus status, String message) { + MemberErrorCode(String errorCode, HttpStatus status, String message) { this.errorCode = errorCode; this.status = status; this.message = message; } + + @Override + public ErrorResponse getErrorResponse() { + return new ErrorResponse(errorCode, message); + } } From 7eac74967fab5a262cdf2ca0986641b630d02be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9D=80=EB=B9=84?= <69096886+eunbc@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:59:25 +0900 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20CustomException=EC=9D=98=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=EB=A5=BC=20BaseErrorCode=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#155)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: CustomException의 필드를 BaseErrorCode로 변경 * fix: BaseErrorCode 수정 --- .../java/com/pgms/apimember/exception/CustomException.java | 6 +++--- .../pgms/apimember/exception/GlobalExceptionHandler.java | 3 ++- .../com/pgms/coredomain/domain/common/BaseErrorCode.java | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java b/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java index 12e46709..38f7322b 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/CustomException.java @@ -1,15 +1,15 @@ package com.pgms.apimember.exception; -import com.pgms.coredomain.domain.common.MemberErrorCode; +import com.pgms.coredomain.domain.common.BaseErrorCode; import lombok.Getter; @Getter public class CustomException extends RuntimeException { - protected final MemberErrorCode errorCode; + protected final BaseErrorCode errorCode; - public CustomException(MemberErrorCode errorCode) { + public CustomException(BaseErrorCode errorCode) { super(errorCode.getMessage()); this.errorCode = errorCode; } diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java b/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java index 08d86b3c..f22c1117 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import com.pgms.coredomain.domain.common.BaseErrorCode; import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coredomain.response.ErrorResponse; @@ -29,7 +30,7 @@ protected ResponseEntity handleGlobalException(Exception ex) { @ExceptionHandler(CustomException.class) protected ResponseEntity handleEventCustomException(CustomException ex) { log.warn(">>>>> Custom Exception : {}", ex); - MemberErrorCode errorCode = ex.getErrorCode(); + BaseErrorCode errorCode = ex.getErrorCode(); return ResponseEntity.status(errorCode.getStatus()).body(errorCode.getErrorResponse()); } diff --git a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java index 442af541..4b73cebf 100644 --- a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/BaseErrorCode.java @@ -1,7 +1,13 @@ package com.pgms.coredomain.domain.common; +import org.springframework.http.HttpStatus; + import com.pgms.coredomain.response.ErrorResponse; public interface BaseErrorCode { ErrorResponse getErrorResponse(); + + String getMessage(); + + HttpStatus getStatus(); } From 900bfd728eb1e7a8a5f0cb83ec0a5036d5d0a8d3 Mon Sep 17 00:00:00 2001 From: Hanna Lee <8annahxxl@gmail.com> Date: Mon, 8 Jan 2024 15:23:46 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=EC=9D=B4=ED=83=88=EB=90=9C=20?= =?UTF-8?q?=EC=98=88=EB=A7=A4=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=A2=8C?= =?UTF-8?q?=EC=84=9D=20=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EB=B0=B0?= =?UTF-8?q?=EC=B9=98=20(#157)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 이탈된 예매에 대한 좌석 상태 변경 배치 * chore --------- Co-authored-by: byulcode --- api/api-booking/build.gradle | 3 +- api/api-booking/http/test.http | 57 ++++++++++++++++++ .../apibooking/config/SecurityConfig.java | 3 +- .../booking/controller/BookingController.java | 10 +-- .../controller/BookingQueueController.java | 21 +++---- .../service/BookingQueueService.java | 10 ++- batch/batch-booking/build.gradle | 15 +++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 +++ .../batchbooking/BatchBookingApplication.java | 15 +++++ .../batchbooking/seat/SeatReleaseConfig.java | 45 ++++++++++++++ .../seat/SeatReleaseScheduler.java | 39 ++++++++++++ .../batchbooking/seat/SeatReleaseTasklet.java | 31 ++++++++++ .../src/main/resources/application.yml | 10 +++ .../BatchBookingApplicationTests.java | 13 ++++ .../booking/repository/TicketRepository.java | 11 ++++ settings.gradle | 1 + 17 files changed, 264 insertions(+), 27 deletions(-) create mode 100644 api/api-booking/http/test.http create mode 100644 batch/batch-booking/build.gradle create mode 100644 batch/batch-booking/gradle/wrapper/gradle-wrapper.jar create mode 100644 batch/batch-booking/gradle/wrapper/gradle-wrapper.properties create mode 100644 batch/batch-booking/src/main/java/com/pgms/batchbooking/BatchBookingApplication.java create mode 100644 batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseConfig.java create mode 100644 batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseScheduler.java create mode 100644 batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseTasklet.java create mode 100644 batch/batch-booking/src/main/resources/application.yml create mode 100644 batch/batch-booking/src/test/java/com/pgms/batchbooking/BatchBookingApplicationTests.java diff --git a/api/api-booking/build.gradle b/api/api-booking/build.gradle index f9084532..d051eeb3 100644 --- a/api/api-booking/build.gradle +++ b/api/api-booking/build.gradle @@ -14,9 +14,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-data-redis' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' - - //TODO: security 의존성 core-security 에서 추가 implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'io.jsonwebtoken:jjwt-api:0.12.3' implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' diff --git a/api/api-booking/http/test.http b/api/api-booking/http/test.http new file mode 100644 index 00000000..d27ca3fa --- /dev/null +++ b/api/api-booking/http/test.http @@ -0,0 +1,57 @@ +### 세션 아이디 발급 +POST http://localhost:8082/api/v1/bookings/issue-session-id +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ + +### 대기열 진입 +POST http://localhost:8082/api/v1/bookings/enter-queue +Content-Type: application/json +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ +Booking-Session-Id: {세션아이디} + +{ + "eventId": 1 +} + +### 대기열 조회 +GET http://localhost:8082/api/v1/bookings/order-in-queue?eventId=1 +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ +Booking-Session-Id: {세션아이디} + + +### 예매 토큰 발급 +POST http://localhost:8082/api/v1/bookings/issue-token +Content-Type: application/json +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ +Booking-Session-Id: {세션아이디} + +{ + "eventId": 1 +} + +### 좌석 목록 조회 +GET http://localhost:8082/api/v1/seats?eventTimeId=1 +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ +Booking-Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJib29raW5nIiwiaWF0IjoxNzA0NjkzNDQ4LCJleHAiOjE3MDQ2OTUyNDgsInNlc3Npb25JZCI6Ins_Pz8_P30ifQ.IFqm66RBlLw6ZVbogZdTvClpH2arxAfWTZ1-DNFtT-H7EH0OSYUoICgnpMjbI2aSObsdl1h3oVSQPw28XlmJzg + +### 예매 +POST http://localhost:8082/api/v1/bookings +Content-Type: application/json +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ +Booking-Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJib29raW5nIiwiaWF0IjoxNzA0NjkzNDQ4LCJleHAiOjE3MDQ2OTUyNDgsInNlc3Npb25JZCI6Ins_Pz8_P30ifQ.IFqm66RBlLw6ZVbogZdTvClpH2arxAfWTZ1-DNFtT-H7EH0OSYUoICgnpMjbI2aSObsdl1h3oVSQPw28XlmJzg + +{ + "timeId": 1, + "seatIds": [3, 4], + "receiptType": "배송", + "buyerName": "이한나", + "buyerPhoneNumber": "010-1234-5678", + "deliveryAddress": { + "recipientName": "이한나", + "recipientPhoneNumber": "010-1234-5678", + "streetAddress": "서울시 강남구 테헤란로", + "detailAddress": "000동 000호", + "zipCode": "00000" + }, + "method": "카드" +} + diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java b/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java index 1640e2ad..1f3db54b 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java @@ -34,9 +34,10 @@ public class SecurityConfig { @Bean public SecurityFilterChain bookingFilterChain(HttpSecurity http) throws Exception { List permitAllMatchers = List.of( + new AntPathRequestMatcher("/api/*/bookings/issue-session-id", HttpMethod.POST.toString()), new AntPathRequestMatcher("/api/*/bookings/enter-queue", HttpMethod.POST.toString()), new AntPathRequestMatcher("/api/*/bookings/order-in-queue", HttpMethod.GET.toString()), - new AntPathRequestMatcher("/api/*/bookings/issue-token", HttpMethod.GET.toString()) + new AntPathRequestMatcher("/api/*/bookings/issue-token", HttpMethod.POST.toString()) ); return http diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/controller/BookingController.java b/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/controller/BookingController.java index 3c783d64..d6a9eac3 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/controller/BookingController.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/controller/BookingController.java @@ -24,16 +24,16 @@ @Controller @RequestMapping("/api/v1/bookings") @RequiredArgsConstructor -public class BookingController { +public class BookingController { //TODO: 인증된 멤버 연동 private final BookingService bookingService; @PostMapping public ResponseEntity> createBooking( - @CurrentAccount Long memberId, + //@CurrentAccount Long memberId, @RequestBody @Valid BookingCreateRequest request, HttpServletRequest httpRequest) { - BookingCreateResponse createdBooking = bookingService.createBooking(request, memberId); + BookingCreateResponse createdBooking = bookingService.createBooking(request, 1L); ApiResponse response = ApiResponse.ok(createdBooking); URI location = UriComponentsBuilder .fromHttpUrl(httpRequest.getRequestURL().toString()) @@ -45,10 +45,10 @@ public ResponseEntity> createBooking( @PostMapping("/{id}/cancel") public ResponseEntity cancelBooking( - @CurrentAccount Long memberId, + //@CurrentAccount Long memberId, @PathVariable String id, @RequestBody @Valid BookingCancelRequest request) { - bookingService.cancelBooking(id, request, memberId); + bookingService.cancelBooking(id, request, 1L); return ResponseEntity.ok().build(); } diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/controller/BookingQueueController.java b/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/controller/BookingQueueController.java index 93b17c2f..72f8007d 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/controller/BookingQueueController.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/controller/BookingQueueController.java @@ -3,6 +3,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -17,7 +18,6 @@ import com.pgms.apibooking.domain.bookingqueue.service.BookingQueueService; import com.pgms.coredomain.response.ApiResponse; -import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -35,32 +35,27 @@ public ResponseEntity> issueSessionId() { } @PostMapping("/enter-queue") - public ResponseEntity enterQueue(@RequestBody @Valid BookingQueueEnterRequest request, HttpServletRequest httpServletRequest) { - String bookingSessionId = getBookingSessionId(httpServletRequest); + public ResponseEntity enterQueue(@RequestBody @Valid BookingQueueEnterRequest request, @RequestAttribute("bookingSessionId") String bookingSessionId) { bookingQueueService.enterQueue(request, bookingSessionId); return ResponseEntity.ok().build(); } @GetMapping("/order-in-queue") - public ResponseEntity> getOrderInQueue(@RequestParam Long eventId) { + public ResponseEntity> getOrderInQueue(@RequestParam Long eventId, @RequestAttribute("bookingSessionId") String bookingSessionId) { ApiResponse response = - ApiResponse.ok(bookingQueueService.getOrderInQueue(eventId, null)); + ApiResponse.ok(bookingQueueService.getOrderInQueue(eventId, bookingSessionId)); return ResponseEntity.ok(response); } @PostMapping("/issue-token") - public ResponseEntity> issueToken(@RequestBody @Valid TokenIssueRequest request) { - ApiResponse response = ApiResponse.ok(bookingQueueService.issueToken(request, null)); + public ResponseEntity> issueToken(@RequestBody @Valid TokenIssueRequest request, @RequestAttribute("bookingSessionId") String bookingSessionId) { + ApiResponse response = ApiResponse.ok(bookingQueueService.issueToken(request, bookingSessionId)); return ResponseEntity.ok(response); } @PostMapping("/exit-queue") - public ResponseEntity exitQueue(@RequestBody @Valid BookingQueueExitRequest request) { - bookingQueueService.exitQueue(request, null); + public ResponseEntity exitQueue(@RequestBody @Valid BookingQueueExitRequest request, @RequestAttribute("bookingSessionId") String bookingSessionId) { + bookingQueueService.exitQueue(request, bookingSessionId); return ResponseEntity.ok().build(); } - - private String getBookingSessionId(HttpServletRequest httpServletRequest) { - return (String) httpServletRequest.getAttribute("bookingSessionId"); - } } diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/service/BookingQueueService.java b/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/service/BookingQueueService.java index 379ae4f2..3bb3b2fd 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/service/BookingQueueService.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/domain/bookingqueue/service/BookingQueueService.java @@ -4,16 +4,16 @@ import org.springframework.stereotype.Service; +import com.pgms.apibooking.common.exception.BookingErrorCode; +import com.pgms.apibooking.common.exception.BookingException; +import com.pgms.apibooking.common.jwt.BookingJwtPayload; +import com.pgms.apibooking.common.jwt.BookingJwtProvider; import com.pgms.apibooking.domain.bookingqueue.dto.request.BookingQueueEnterRequest; import com.pgms.apibooking.domain.bookingqueue.dto.request.BookingQueueExitRequest; import com.pgms.apibooking.domain.bookingqueue.dto.request.TokenIssueRequest; import com.pgms.apibooking.domain.bookingqueue.dto.response.OrderInQueueGetResponse; import com.pgms.apibooking.domain.bookingqueue.dto.response.SessionIdIssueResponse; import com.pgms.apibooking.domain.bookingqueue.dto.response.TokenIssueResponse; -import com.pgms.apibooking.common.exception.BookingErrorCode; -import com.pgms.apibooking.common.exception.BookingException; -import com.pgms.apibooking.common.jwt.BookingJwtPayload; -import com.pgms.apibooking.common.jwt.BookingJwtProvider; import com.pgms.apibooking.domain.bookingqueue.repository.BookingQueueRepository; import lombok.RequiredArgsConstructor; @@ -49,8 +49,6 @@ public TokenIssueResponse issueToken(TokenIssueRequest request, String sessionId BookingJwtPayload payload = new BookingJwtPayload(sessionId); String token = bookingJwtProvider.generateToken(payload); - bookingQueueRepository.remove(request.eventId(), sessionId); - return TokenIssueResponse.from(token); } diff --git a/batch/batch-booking/build.gradle b/batch/batch-booking/build.gradle new file mode 100644 index 00000000..44076dcb --- /dev/null +++ b/batch/batch-booking/build.gradle @@ -0,0 +1,15 @@ +// 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함 +// 스프링 부트 2.0 이상이라면 bootRepackage.enabled를 사용해야 함 +bootJar { enabled = true } + +// 외부에서 의존하기 위한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 true로 비활성화함 +jar { enabled = false } + +dependencies { + implementation project(':core:core-domain'); + implementation project(':core:core-infra'); + + implementation 'org.springframework.boot:spring-boot-starter-batch' +} + +tasks.register("prepareKotlinBuildScriptModel") {} diff --git a/batch/batch-booking/gradle/wrapper/gradle-wrapper.jar b/batch/batch-booking/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/batch/batch-booking/gradle/wrapper/gradle-wrapper.properties b/batch/batch-booking/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1af9e093 --- /dev/null +++ b/batch/batch-booking/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/batch/batch-booking/src/main/java/com/pgms/batchbooking/BatchBookingApplication.java b/batch/batch-booking/src/main/java/com/pgms/batchbooking/BatchBookingApplication.java new file mode 100644 index 00000000..e9bf2f59 --- /dev/null +++ b/batch/batch-booking/src/main/java/com/pgms/batchbooking/BatchBookingApplication.java @@ -0,0 +1,15 @@ +package com.pgms.batchbooking; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringBootApplication +@ComponentScan("com.pgms") +public class BatchBookingApplication { + + public static void main(String[] args) { + SpringApplication.run(BatchBookingApplication.class, args); + } + +} diff --git a/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseConfig.java b/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseConfig.java new file mode 100644 index 00000000..d5651ec4 --- /dev/null +++ b/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseConfig.java @@ -0,0 +1,45 @@ +package com.pgms.batchbooking.seat; + +import org.springframework.batch.core.Job; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.job.builder.JobBuilder; +import org.springframework.batch.core.repository.JobRepository; +import org.springframework.batch.core.step.builder.StepBuilder; +import org.springframework.batch.core.step.tasklet.Tasklet; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.PlatformTransactionManager; + +import com.pgms.coredomain.domain.booking.repository.TicketRepository; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Configuration +@RequiredArgsConstructor +@Slf4j +public class SeatReleaseConfig { + + private final JobRepository jobRepository; + private final PlatformTransactionManager transactionManager; + private final TicketRepository ticketRepository; + + @Bean + public Job seatReleaseJob() { + return new JobBuilder("seatReleaseJob", jobRepository) + .start(seatReleaseStep()) + .build(); + } + + @Bean + public Step seatReleaseStep(){ + return new StepBuilder("seatReleaseStep", jobRepository) + .tasklet(seatReleaseTasklet(), transactionManager) + .build(); + } + + @Bean + public Tasklet seatReleaseTasklet(){ + return new SeatReleaseTasklet(ticketRepository); + } +} diff --git a/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseScheduler.java b/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseScheduler.java new file mode 100644 index 00000000..c07fbc12 --- /dev/null +++ b/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseScheduler.java @@ -0,0 +1,39 @@ +package com.pgms.batchbooking.seat; + +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecutionException; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; +import org.springframework.batch.core.launch.JobLauncher; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/* + * 테스트를 위한 스케줄러 + */ +@Component +@EnableScheduling +@RequiredArgsConstructor +@Slf4j +public class SeatReleaseScheduler { + + private final JobLauncher jobLauncher; + private final Job lockAdminJob; + + @Scheduled(cron = "0 0 0 * * ?") + public void runJob() { + try { + JobParameters jobParameters = new JobParametersBuilder() + .addLong("executedTime", System.currentTimeMillis()) + .toJobParameters(); + + jobLauncher.run(lockAdminJob, jobParameters); + } catch (JobExecutionException e) { + log.error("SeatReleaseScheduler error : ", e); + } + } +} diff --git a/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseTasklet.java b/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseTasklet.java new file mode 100644 index 00000000..9ddb97ff --- /dev/null +++ b/batch/batch-booking/src/main/java/com/pgms/batchbooking/seat/SeatReleaseTasklet.java @@ -0,0 +1,31 @@ +package com.pgms.batchbooking.seat; + +import java.time.LocalDateTime; +import java.util.List; + +import org.springframework.batch.core.StepContribution; +import org.springframework.batch.core.scope.context.ChunkContext; +import org.springframework.batch.core.step.tasklet.Tasklet; +import org.springframework.batch.repeat.RepeatStatus; +import org.springframework.transaction.annotation.Transactional; + +import com.pgms.coredomain.domain.booking.BookingStatus; +import com.pgms.coredomain.domain.booking.Ticket; +import com.pgms.coredomain.domain.booking.repository.TicketRepository; +import com.pgms.coredomain.domain.event.EventSeatStatus; + +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public class SeatReleaseTasklet implements Tasklet{ + + private final TicketRepository ticketRepository; + + @Transactional + @Override + public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { + List tickets = ticketRepository.findAll(LocalDateTime.now(), BookingStatus.WAITING_FOR_PAYMENT); + tickets.forEach(ticket -> ticket.getSeat().updateStatus(EventSeatStatus.AVAILABLE)); + return RepeatStatus.FINISHED; + } +} diff --git a/batch/batch-booking/src/main/resources/application.yml b/batch/batch-booking/src/main/resources/application.yml new file mode 100644 index 00000000..499aea89 --- /dev/null +++ b/batch/batch-booking/src/main/resources/application.yml @@ -0,0 +1,10 @@ +server: + port: 8086 + +spring: + profiles: + include: infra + active: dev + batch: + jdbc: + initialize-schema: always diff --git a/batch/batch-booking/src/test/java/com/pgms/batchbooking/BatchBookingApplicationTests.java b/batch/batch-booking/src/test/java/com/pgms/batchbooking/BatchBookingApplicationTests.java new file mode 100644 index 00000000..c5dcf54d --- /dev/null +++ b/batch/batch-booking/src/test/java/com/pgms/batchbooking/BatchBookingApplicationTests.java @@ -0,0 +1,13 @@ +package com.pgms.batchbooking; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BatchBookingApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/core/core-domain/src/main/java/com/pgms/coredomain/domain/booking/repository/TicketRepository.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/booking/repository/TicketRepository.java index 5b58ce92..e6af011e 100644 --- a/core/core-domain/src/main/java/com/pgms/coredomain/domain/booking/repository/TicketRepository.java +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/booking/repository/TicketRepository.java @@ -1,15 +1,26 @@ package com.pgms.coredomain.domain.booking.repository; +import java.time.LocalDateTime; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import com.pgms.coredomain.domain.booking.BookingStatus; import com.pgms.coredomain.domain.booking.Ticket; public interface TicketRepository extends JpaRepository { @Query("SELECT t FROM Ticket t WHERE t.booking.id = :bookingId") List findAllByBookingId(@Param("bookingId") String bookingId); + + @Query("SELECT tk FROM Ticket tk " + + "LEFT JOIN FETCH tk.booking b " + + "LEFT JOIN FETCH b.time tm " + + "LEFT JOIN FETCH tm.event e " + + "WHERE :datetime BETWEEN e.bookingStartedAt AND e.bookingEndedAt " + + "AND b.status = :bookingStatus ") + List findAll(@Param("datetime") LocalDateTime dateTime, + @Param("bookingStatus") BookingStatus bookingStatus); } diff --git a/settings.gradle b/settings.gradle index 3b87af68..a4d75a99 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,3 +8,4 @@ include 'core:core-infra' include 'core:core-security' include 'core:core-infra-es' include 'batch:batch-member' +include 'batch:batch-booking' From d7b9fc57b80636b00104f333f5ee372357aeafd7 Mon Sep 17 00:00:00 2001 From: Hanna Lee <8annahxxl@gmail.com> Date: Mon, 8 Jan 2024 18:16:40 +0900 Subject: [PATCH 5/6] =?UTF-8?q?docs:=20=EC=98=88=EB=A7=A4=20http=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20(#161)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: http 유저 시나리오 작성 * fix: createBooking에서 세션 아이디 삭제하는 로직 비동기 메서드로 분리 * docs: http 작성 --- .../http/{test.http => booking.http} | 41 +-- .../com/pgms/apibooking/config/JwtConfig.java | 6 +- .../apibooking/config/SecurityConfig.java | 8 +- .../booking/service/BookingService.java | 19 +- .../src/main/resources/application.yml | 4 +- .../resources/templates/booking_input.html | 249 +++++++++--------- core/core-infra/src/main/resources/data.sql | 92 ++++++- 7 files changed, 252 insertions(+), 167 deletions(-) rename api/api-booking/http/{test.http => booking.http} (62%) diff --git a/api/api-booking/http/test.http b/api/api-booking/http/booking.http similarity index 62% rename from api/api-booking/http/test.http rename to api/api-booking/http/booking.http index d27ca3fa..f857ed4f 100644 --- a/api/api-booking/http/test.http +++ b/api/api-booking/http/booking.http @@ -28,30 +28,33 @@ Booking-Session-Id: {세션아이디} "eventId": 1 } +### [Optional] 대기열 이탈 +POST http://localhost:8082/api/v1/bookings/exit-queue +Content-Type: application/json +#Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ +Booking-Session-Id: {세션아이디} + +{ + "eventId": 1 +} + ### 좌석 목록 조회 GET http://localhost:8082/api/v1/seats?eventTimeId=1 #Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ -Booking-Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJib29raW5nIiwiaWF0IjoxNzA0NjkzNDQ4LCJleHAiOjE3MDQ2OTUyNDgsInNlc3Npb25JZCI6Ins_Pz8_P30ifQ.IFqm66RBlLw6ZVbogZdTvClpH2arxAfWTZ1-DNFtT-H7EH0OSYUoICgnpMjbI2aSObsdl1h3oVSQPw28XlmJzg +Booking-Authorization: Bearer eyJhbGciOiJIUzM4NCJ9.eyJpc3MiOiJib29raW5nIiwiaWF0IjoxNzA0NzA0NTY0LCJleHAiOjQyMDAxNzA0NzA0NTY0LCJzZXNzaW9uSWQiOiJ7Pz8_Pz99In0.iKZaud5vfvsMzXmQzl1WaCweL9GL00U0iGzCg4_p3Zzei8Y7z19Ff_TTpxh9gLeB -### 예매 -POST http://localhost:8082/api/v1/bookings -Content-Type: application/json +### 예매 ~ 결제 (브라우저에서 진행해 주세요) +GET http://localhost:8082/bookings + +### [Optional] 예매 이탈 +POST http://localhost:8082/api/v1/bookings/bookingCreateTestId/exit #Authorization: Bearer eyJhbGciOiJIUzI1NiJ9.eyJpZCI6MSwic3ViIjoiam9obi5kb2VAZXhhbXBsZS5jb20iLCJpYXQiOjE3MDQ2OTE0OTEsImV4cCI6MTgwNDY4MzI5MSwiYXV0aG9yaXR5IjoiUk9MRV9VU0VSIn0.wFNSz2uwRa35jP1KihNlTOewVLgMMeg3ADQ5Kztl3QQ -Booking-Authorization: Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJib29raW5nIiwiaWF0IjoxNzA0NjkzNDQ4LCJleHAiOjE3MDQ2OTUyNDgsInNlc3Npb25JZCI6Ins_Pz8_P30ifQ.IFqm66RBlLw6ZVbogZdTvClpH2arxAfWTZ1-DNFtT-H7EH0OSYUoICgnpMjbI2aSObsdl1h3oVSQPw28XlmJzg +Booking-Authorization: Bearer eyJhbGciOiJIUzM4NCJ9.eyJpc3MiOiJib29raW5nIiwiaWF0IjoxNzA0NzA0NTY0LCJleHAiOjQyMDAxNzA0NzA0NTY0LCJzZXNzaW9uSWQiOiJ7Pz8_Pz99In0.iKZaud5vfvsMzXmQzl1WaCweL9GL00U0iGzCg4_p3Zzei8Y7z19Ff_TTpxh9gLeB + +### 예매 취소 (브라우저에서 생성된 예매번호로 진행해 주세요) +POST http://localhost:8082/api/v1/bookings/1704704631741/cancel +Content-Type: application/json { - "timeId": 1, - "seatIds": [3, 4], - "receiptType": "배송", - "buyerName": "이한나", - "buyerPhoneNumber": "010-1234-5678", - "deliveryAddress": { - "recipientName": "이한나", - "recipientPhoneNumber": "010-1234-5678", - "streetAddress": "서울시 강남구 테헤란로", - "detailAddress": "000동 000호", - "zipCode": "00000" - }, - "method": "카드" + "cancelReason": "변심" } - diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/config/JwtConfig.java b/api/api-booking/src/main/java/com/pgms/apibooking/config/JwtConfig.java index 1e2951ef..be0bbeb0 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/config/JwtConfig.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/config/JwtConfig.java @@ -13,13 +13,13 @@ @Configuration public class JwtConfig { - @Value("${jwt.issuer}") + @Value("${booking-jwt.issuer}") private String issuer; - @Value("${jwt.secret-key}") + @Value("${booking-jwt.secret-key}") private String secretKey; - @Value("${jwt.expiry-seconds}") + @Value("${booking-jwt.expiry-seconds}") private Long expirySeconds; @Bean diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java b/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java index 1f3db54b..1a6ec0bf 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/config/SecurityConfig.java @@ -34,10 +34,16 @@ public class SecurityConfig { @Bean public SecurityFilterChain bookingFilterChain(HttpSecurity http) throws Exception { List permitAllMatchers = List.of( + new AntPathRequestMatcher("/bookings", HttpMethod.GET.toString()), + new AntPathRequestMatcher("/payments", HttpMethod.GET.toString()), new AntPathRequestMatcher("/api/*/bookings/issue-session-id", HttpMethod.POST.toString()), new AntPathRequestMatcher("/api/*/bookings/enter-queue", HttpMethod.POST.toString()), new AntPathRequestMatcher("/api/*/bookings/order-in-queue", HttpMethod.GET.toString()), - new AntPathRequestMatcher("/api/*/bookings/issue-token", HttpMethod.POST.toString()) + new AntPathRequestMatcher("/api/*/bookings/exit-queue", HttpMethod.POST.toString()), + new AntPathRequestMatcher("/api/*/bookings/issue-token", HttpMethod.POST.toString()), + new AntPathRequestMatcher("/api/*/bookings/**/cancel", HttpMethod.POST.toString()), + new AntPathRequestMatcher("/api/*/payments/**", HttpMethod.GET.toString()), + new AntPathRequestMatcher("/api/*/payments/**", HttpMethod.POST.toString()) ); return http diff --git a/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/service/BookingService.java b/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/service/BookingService.java index 8901995e..8d7c6ba1 100644 --- a/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/service/BookingService.java +++ b/api/api-booking/src/main/java/com/pgms/apibooking/domain/booking/service/BookingService.java @@ -5,34 +5,35 @@ import java.util.Objects; import java.util.Optional; +import org.springframework.scheduling.annotation.Async; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.pgms.apibooking.common.exception.BookingErrorCode; +import com.pgms.apibooking.common.exception.BookingException; +import com.pgms.apibooking.common.jwt.BookingAuthToken; import com.pgms.apibooking.config.TossPaymentConfig; import com.pgms.apibooking.domain.booking.dto.request.BookingCancelRequest; import com.pgms.apibooking.domain.booking.dto.request.BookingCreateRequest; import com.pgms.apibooking.domain.booking.dto.request.DeliveryAddress; import com.pgms.apibooking.domain.booking.dto.response.BookingCreateResponse; +import com.pgms.apibooking.domain.bookingqueue.repository.BookingQueueRepository; import com.pgms.apibooking.domain.payment.dto.request.PaymentCancelRequest; import com.pgms.apibooking.domain.payment.dto.request.RefundAccountRequest; -import com.pgms.apibooking.common.exception.BookingErrorCode; -import com.pgms.apibooking.common.exception.BookingException; import com.pgms.apibooking.domain.payment.service.PaymentService; -import com.pgms.apibooking.common.jwt.BookingAuthToken; -import com.pgms.apibooking.domain.bookingqueue.repository.BookingQueueRepository; import com.pgms.coredomain.domain.booking.Booking; import com.pgms.coredomain.domain.booking.Payment; import com.pgms.coredomain.domain.booking.PaymentMethod; import com.pgms.coredomain.domain.booking.PaymentStatus; import com.pgms.coredomain.domain.booking.ReceiptType; +import com.pgms.coredomain.domain.booking.Ticket; import com.pgms.coredomain.domain.booking.repository.BookingRepository; import com.pgms.coredomain.domain.booking.repository.TicketRepository; import com.pgms.coredomain.domain.event.EventSeat; import com.pgms.coredomain.domain.event.EventSeatStatus; import com.pgms.coredomain.domain.event.EventTime; -import com.pgms.coredomain.domain.booking.Ticket; import com.pgms.coredomain.domain.event.repository.EventSeatRepository; import com.pgms.coredomain.domain.event.repository.EventTimeRepository; import com.pgms.coredomain.domain.member.Member; @@ -81,8 +82,7 @@ public BookingCreateResponse createBooking(BookingCreateRequest request, Long me seats.forEach(seat -> seat.updateStatus(EventSeatStatus.BOOKED)); - //TODO: 비동기 함수로 분리 - bookingQueueRepository.remove(booking.getTime().getEvent().getId(), getCurrentSessionId()); + removeSessionIdInBookingQueue(booking.getTime().getEvent().getId()); return BookingCreateResponse.of(booking, tossPaymentConfig.getSuccessUrl(), tossPaymentConfig.getFailUrl()); } @@ -176,4 +176,9 @@ private String getCurrentSessionId() { } return null; } + + @Async + protected void removeSessionIdInBookingQueue(Long eventId) { + bookingQueueRepository.remove(eventId, getCurrentSessionId()); + } } diff --git a/api/api-booking/src/main/resources/application.yml b/api/api-booking/src/main/resources/application.yml index cae60942..8e2bb44a 100644 --- a/api/api-booking/src/main/resources/application.yml +++ b/api/api-booking/src/main/resources/application.yml @@ -14,11 +14,11 @@ spring: payment: toss: test-client-api-key: test_ck_Gv6LjeKD8aE1pdWDXXNw8wYxAdXy - test-secret-api-key: test_sk_tempSecretKey # 노출되면 안됨!! 임시값 넣어놓음 + test-secret-api-key: test_sk_eqRGgYO1r5MNel9067jarQnN2Eya # 노출되면 안됨!! 임시값 넣어놓음 success-url: https://localhost:8080/api/v1/success fail-url: https://localhost:8080/api/v1/fail -jwt: +booking-jwt: issuer: booking secret-key: EENY5W0eegTf1naQB2eDeyCLl5kRS2b8xa5c4qLdS0hmVjtbvo8tOyhPMcAmtPu expiry-seconds: 420 diff --git a/api/api-booking/src/main/resources/templates/booking_input.html b/api/api-booking/src/main/resources/templates/booking_input.html index 8cdf1dd9..d00b5cfb 100644 --- a/api/api-booking/src/main/resources/templates/booking_input.html +++ b/api/api-booking/src/main/resources/templates/booking_input.html @@ -2,148 +2,155 @@ - - - 주문 정보 입력 - - - - + + + 주문 정보 입력 + + + + - + /* Optional: Style the order result container */ + #orderResult { + margin-top: 20px; + padding: 10px; + background-color: #d4edda; + border: 1px solid #c3e6cb; + border-radius: 5px; + } +

-

주문 정보 입력

-
-
-
- - -
-
- - -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
-
+

주문 정보 입력

+
+
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
diff --git a/core/core-infra/src/main/resources/data.sql b/core/core-infra/src/main/resources/data.sql index 02854968..a438f0e6 100644 --- a/core/core-infra/src/main/resources/data.sql +++ b/core/core-infra/src/main/resources/data.sql @@ -16,23 +16,17 @@ VALUES (1, '2024-01-01T10:00:00', '2024-01-01T12:00:00', 1); -- EventSeatArea INSERT INTO event_seat_area (price, area_type, event_id) -VALUES (100000, 'S', 1); -INSERT INTO event_seat_area (price, area_type, event_id) -VALUES (80000, 'R', 1); +VALUES (100000, 'S', 1), + (80000, 'R', 1); -- EventSeat INSERT INTO event_seat (name, status, event_seat_area_id, event_time_id) -VALUES ('A1', 'BEING_BOOKED', 1, 1); -INSERT INTO event_seat (name, status, event_seat_area_id, event_time_id) -VALUES ('A2', 'BEING_BOOKED', 1, 1); -INSERT INTO event_seat (name, status, event_seat_area_id, event_time_id) -VALUES ('A3', 'BEING_BOOKED', 1, 1); -INSERT INTO event_seat (name, status, event_seat_area_id, event_time_id) -VALUES ('E1', 'BEING_BOOKED', 2, 1); -INSERT INTO event_seat (name, status, event_seat_area_id, event_time_id) -VALUES ('E2', 'BEING_BOOKED', 2, 1); -INSERT INTO event_seat (name, status, event_seat_area_id, event_time_id) -VALUES ('E3', 'BEING_BOOKED', 2, 1); +VALUES ('A1', 'BEING_BOOKED', 1, 1) + , ('A2', 'BEING_BOOKED', 1, 1) + , ('A3', 'BEING_BOOKED', 1, 1) + , ('E1', 'BEING_BOOKED', 2, 1) + , ('E2', 'BEING_BOOKED', 2, 1) + , ('E3', 'BEING_BOOKED', 2, 1); -- EventReview INSERT INTO event_review (score, content, event_id) @@ -58,3 +52,73 @@ VALUES ('슈퍼관리자', 'superadmin@example.com', '$2a$10$tfdM.PjviEH0zMEXVYj '01012345678', 'ACTIVE', 'ROLE_SUPERADMIN', '2020-01-01', NOW()); +-- Booking +INSERT INTO booking (id, + amount, + booking_name, + buyer_name, + buyer_phone_number, + status, + receipt_type, + member_id, + time_id) +VALUES ('bookingCreateTestId', + 180000, + '빙봉의 주문', + '빙봉', + '010-1234-5678', + 'WAITING_FOR_PAYMENT', + 'PICK_UP', + 1, + 1), + ('bookingCancelTestId', + 180000, + '주영의 주문', + '주영', + '010-1234-5678', + 'PAYMENT_COMPLETED', + 'PICK_UP', + 1, + 1); + + +-- Ticket +INSERT INTO ticket (booking_id, seat_id) +VALUES ('bookingCreateTestId', 1), + ('bookingCreateTestId', 2), + ('bookingCancelTestId', 3); + + +-- Payment +INSERT INTO payment (amount, + approved_at, + card_number, + installment_plan_months, + is_interest_free, + method, + payment_key, + requested_at, + status, + booking_id) +VALUES (180000, + CURRENT_TIMESTAMP, + '5555-5555-5555-5555', + 0, + false, + 'CARD', + 'paymentkey1', + CURRENT_TIMESTAMP, + 'READY', + 'bookingCreateTestId'), + (180000, + CURRENT_TIMESTAMP, + '5555-5555-5555-5555', + 0, + false, + 'CARD', + 'paymentkey2', + CURRENT_TIMESTAMP, + 'DONE', + 'bookingCancelTestId') + + From 39b064d59051a56cc18d52582df1731ba3e04f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A1=B0=EC=9D=80=EB=B9=84?= <69096886+eunbc@users.noreply.github.com> Date: Mon, 8 Jan 2024 19:58:45 +0900 Subject: [PATCH 6/6] =?UTF-8?q?refactor:=20security=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=20CustomException=20=EC=A0=95=EC=9D=98=20=EB=B0=8F=20ErrorCode?= =?UTF-8?q?=20=EC=A0=95=EB=A6=AC=20=20(#159)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: ErrorCode 정리 * refactor: HttpResponseUtil 적용 * refactor: SecurityCustomException 생성, 적용 * refactor: GlobalExceptionHandler 리팩터링 --------- Co-authored-by: Kim Dae Hwi <121790935+marooo326@users.noreply.github.com> --- .../exception/GlobalExceptionHandler.java | 20 +++++++++---- .../exception/SecurityException.java | 9 ------ .../pgms/apimember/service/AuthService.java | 6 ++-- .../domain/common/GlobalErrorCode.java | 28 +++++++++++++++++ .../domain/common/MemberErrorCode.java | 15 +--------- .../domain/common/SecurityErrorCode.java | 30 +++++++++++++++++++ .../exception/SecurityCustomException.java | 16 ++++++++++ .../security/jwt/JwtAccessDeniedHandler.java | 17 +++-------- .../jwt/JwtAuthenticationEntryPoint.java | 18 ++++------- .../CurrentAccountArgumentResolver.java | 4 ++- .../service/AdminUserDetailsService.java | 4 ++- .../service/CustomAuthenticationProvider.java | 5 +++- .../service/MemberUserDetailsService.java | 4 ++- .../security/util/HttpResponseUtil.java | 7 ++--- 14 files changed, 116 insertions(+), 67 deletions(-) delete mode 100644 api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java create mode 100644 core/core-domain/src/main/java/com/pgms/coredomain/domain/common/GlobalErrorCode.java create mode 100644 core/core-domain/src/main/java/com/pgms/coredomain/domain/common/SecurityErrorCode.java create mode 100644 core/core-security/src/main/java/com/pgms/coresecurity/security/exception/SecurityCustomException.java diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java b/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java index f22c1117..a72613de 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java +++ b/api/api-member/src/main/java/com/pgms/apimember/exception/GlobalExceptionHandler.java @@ -1,5 +1,7 @@ package com.pgms.apimember.exception; +import static com.pgms.coredomain.domain.common.GlobalErrorCode.*; + import java.util.List; import org.springframework.http.HttpStatus; @@ -11,8 +13,8 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import com.pgms.coredomain.domain.common.BaseErrorCode; -import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coredomain.response.ErrorResponse; +import com.pgms.coresecurity.security.exception.SecurityCustomException; import lombok.extern.slf4j.Slf4j; @@ -23,13 +25,19 @@ public class GlobalExceptionHandler { @ExceptionHandler(Exception.class) protected ResponseEntity handleGlobalException(Exception ex) { log.error(">>>>> Internal Server Error : {}", ex); - ErrorResponse errorResponse = new ErrorResponse("INTERNAL SERVER ERROR", ex.getMessage()); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(INTERNAL_SERVER_ERROR.getErrorResponse()); } @ExceptionHandler(CustomException.class) - protected ResponseEntity handleEventCustomException(CustomException ex) { - log.warn(">>>>> Custom Exception : {}", ex); + protected ResponseEntity handleMemberCustomException(CustomException ex) { + log.warn(">>>>> MemberCustomException : {}", ex); + BaseErrorCode errorCode = ex.getErrorCode(); + return ResponseEntity.status(errorCode.getStatus()).body(errorCode.getErrorResponse()); + } + + @ExceptionHandler(SecurityCustomException.class) + protected ResponseEntity handleSecurityCustomException(SecurityCustomException ex) { + log.warn(">>>>> SecurityCustomException : {}", ex); BaseErrorCode errorCode = ex.getErrorCode(); return ResponseEntity.status(errorCode.getStatus()).body(errorCode.getErrorResponse()); } @@ -40,7 +48,7 @@ protected ResponseEntity handleMethodArgumentNotValidException(Me BindingResult bindingResult = ex.getBindingResult(); List fieldErrors = bindingResult.getFieldErrors(); - ErrorResponse errorResponse = MemberErrorCode.VALIDATION_FAILED.getErrorResponse(); + ErrorResponse errorResponse = VALIDATION_FAILED.getErrorResponse(); fieldErrors.forEach(error -> errorResponse.addValidation(error.getField(), error.getDefaultMessage())); return ResponseEntity.status(ex.getStatusCode()).body(errorResponse); } diff --git a/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java b/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java deleted file mode 100644 index 03a6798d..00000000 --- a/api/api-member/src/main/java/com/pgms/apimember/exception/SecurityException.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.pgms.apimember.exception; - -import com.pgms.coredomain.domain.common.MemberErrorCode; - -public class SecurityException extends CustomException { - public SecurityException(MemberErrorCode errorCode) { - super(errorCode); - } -} diff --git a/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java b/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java index ed6612ae..fbfa9edb 100644 --- a/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java +++ b/api/api-member/src/main/java/com/pgms/apimember/service/AuthService.java @@ -10,10 +10,10 @@ import com.pgms.apimember.dto.request.LoginRequest; import com.pgms.apimember.dto.request.RefreshTokenRequest; import com.pgms.apimember.dto.response.AuthResponse; -import com.pgms.apimember.exception.SecurityException; +import com.pgms.apimember.exception.CustomException; import com.pgms.apimember.redis.RefreshToken; import com.pgms.apimember.redis.RefreshTokenRepository; -import com.pgms.coredomain.domain.common.MemberErrorCode; +import com.pgms.coredomain.domain.common.SecurityErrorCode; import com.pgms.coresecurity.security.jwt.JwtTokenProvider; import com.pgms.coresecurity.security.service.AdminUserDetailsService; import com.pgms.coresecurity.security.service.MemberUserDetailsService; @@ -57,7 +57,7 @@ public AuthResponse login(LoginRequest request, String accountType) { public AuthResponse refresh(RefreshTokenRequest request) { // refresh token이 만료됐는지 확인 RefreshToken refreshToken = refreshTokenRepository.findById(request.refreshToken()) - .orElseThrow(() -> new SecurityException(MemberErrorCode.REFRESH_TOKEN_EXPIRED)); + .orElseThrow(() -> new CustomException(SecurityErrorCode.REFRESH_TOKEN_EXPIRED)); // 회원 정보 로드 UserDetailsImpl userDetails = loadUserDetails(refreshToken.getAccountType(), refreshToken.getEmail()); diff --git a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/GlobalErrorCode.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/GlobalErrorCode.java new file mode 100644 index 00000000..e2401325 --- /dev/null +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/GlobalErrorCode.java @@ -0,0 +1,28 @@ +package com.pgms.coredomain.domain.common; + +import org.springframework.http.HttpStatus; + +import com.pgms.coredomain.response.ErrorResponse; + +import lombok.Getter; + +@Getter +public enum GlobalErrorCode implements BaseErrorCode { + INTERNAL_SERVER_ERROR("INTERNAL SERVER ERROR", HttpStatus.INTERNAL_SERVER_ERROR, "서버에 문제가 발생했습니다. 잠시 후 다시 시도해주세요."), + VALIDATION_FAILED("VALIDATION FAILED", HttpStatus.BAD_REQUEST, "입력값에 대한 검증에 실패했습니다."); + + private final String errorCode; + private final HttpStatus status; + private final String message; + + GlobalErrorCode(String errorCode, HttpStatus status, String message) { + this.errorCode = errorCode; + this.status = status; + this.message = message; + } + + @Override + public ErrorResponse getErrorResponse() { + return new ErrorResponse(errorCode, message); + } +} diff --git a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java index d5883e35..77bf2c54 100644 --- a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/MemberErrorCode.java @@ -11,26 +11,13 @@ public enum MemberErrorCode implements BaseErrorCode { // ADMIN ADMIN_NOT_FOUND("NOT FOUND", HttpStatus.NOT_FOUND, "존재하지 않는 관리자입니다."), DUPLICATED_ADMIN_EMAIL("DUPLICATED ADMIN EMAIL", HttpStatus.BAD_REQUEST, "이미 존재하는 관리자 이메일입니다."), - NOT_AUTHORIZED("NOT AUTHORIZED", HttpStatus.UNAUTHORIZED, "접근 권한이 없습니다."), - ADMIN_ROLE_NOT_FOUND("ADMIN ROLE NOT FOUND", HttpStatus.NOT_FOUND, "존재하지 않는 관리자 역할입니다."), - DUPLICATED_ROLE("DUPLICATED ROLE", HttpStatus.BAD_REQUEST, "이미 존재하는 관리자 역할입니다."), - ROLE_IN_USE("ROLE IN USE", HttpStatus.BAD_REQUEST, "사용중인 역할입니다."), - ADMIN_PERMISSION_NOT_FOUND("ADMIN PERMISSION NOT FOUND", HttpStatus.NOT_FOUND, "존재하지 않는 관리자 권한입니다."), - DUPLICATED_PERMISSION("DUPLICATED PERMISSION", HttpStatus.BAD_REQUEST, "이미 존재하는 권한입니다"), - PERMISSION_ASSIGNED("PERMISSION ASSIGNED", HttpStatus.BAD_REQUEST, "이미 할당된 권한은 삭제할 수 없습니다."), - ROLE_PERMISSION_NOT_FOUND("ROLE PERMISSION NOT FOUND", HttpStatus.BAD_REQUEST, "존재하지 않는 역할 권한입니다."), // MEMBER MEMBER_NOT_FOUND("NOT FOUND", HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다."), DUPLICATED_MEMBER_EMAIL("DUPLICATED MEMBER EMAIL", HttpStatus.BAD_REQUEST, "이미 존재하는 회원 이메일입니다."), MEMBER_ALREADY_DELETED("MEMBER ALREADY DELETED", HttpStatus.BAD_REQUEST, "이미 탈퇴한 회원입니다."), PASSWORD_NOT_MATCHED("PASSWORD NOT MATCHED", HttpStatus.BAD_REQUEST, "비밀번호가 일치하지 않습니다."), - PASSWORD_CONFIRM_NOT_MATCHED("PASSWORD CONFIRM NOT MATCHED", HttpStatus.BAD_REQUEST, "비밀번호 확인이 일치하지 않습니다."), - VALIDATION_FAILED("VALIDATION FAILED", HttpStatus.BAD_REQUEST, "입력값에 대한 검증에 실패했습니다."), - - // security - UNAUTHORIZED("UNAUTHORIZED", HttpStatus.UNAUTHORIZED, "로그인 해주세요."), - REFRESH_TOKEN_EXPIRED("REFRESH TOKEN EXPIRED", HttpStatus.UNAUTHORIZED, "다시 로그인 해주세요."); + PASSWORD_CONFIRM_NOT_MATCHED("PASSWORD CONFIRM NOT MATCHED", HttpStatus.BAD_REQUEST, "비밀번호 확인이 일치하지 않습니다."); private final String errorCode; private final HttpStatus status; diff --git a/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/SecurityErrorCode.java b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/SecurityErrorCode.java new file mode 100644 index 00000000..a79a294e --- /dev/null +++ b/core/core-domain/src/main/java/com/pgms/coredomain/domain/common/SecurityErrorCode.java @@ -0,0 +1,30 @@ +package com.pgms.coredomain.domain.common; + +import org.springframework.http.HttpStatus; + +import com.pgms.coredomain.response.ErrorResponse; + +import lombok.Getter; + +@Getter +public enum SecurityErrorCode implements BaseErrorCode { + UNAUTHORIZED("UNAUTHORIZED", HttpStatus.UNAUTHORIZED, "로그인 해주세요."), + ACCESS_TOKEN_EXPIRED("ACCESS TOKEN EXPIRED", HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다"), + REFRESH_TOKEN_EXPIRED("REFRESH TOKEN EXPIRED", HttpStatus.UNAUTHORIZED, "다시 로그인 해주세요."), + FORBIDDEN("FORBIDDEN", HttpStatus.FORBIDDEN, "권한이 없습니다"); + + private final String errorCode; + private final HttpStatus status; + private final String message; + + SecurityErrorCode(String errorCode, HttpStatus status, String message) { + this.errorCode = errorCode; + this.status = status; + this.message = message; + } + + @Override + public ErrorResponse getErrorResponse() { + return new ErrorResponse(errorCode, message); + } +} diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/exception/SecurityCustomException.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/exception/SecurityCustomException.java new file mode 100644 index 00000000..ad956e45 --- /dev/null +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/exception/SecurityCustomException.java @@ -0,0 +1,16 @@ +package com.pgms.coresecurity.security.exception; + +import com.pgms.coredomain.domain.common.BaseErrorCode; + +import lombok.Getter; + +@Getter +public class SecurityCustomException extends RuntimeException { + + private final BaseErrorCode errorCode; + + public SecurityCustomException(BaseErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAccessDeniedHandler.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAccessDeniedHandler.java index a1e0531e..f685acb3 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAccessDeniedHandler.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAccessDeniedHandler.java @@ -1,19 +1,18 @@ package com.pgms.coresecurity.security.jwt; +import static com.pgms.coredomain.domain.common.SecurityErrorCode.*; + import java.io.IOException; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.pgms.coredomain.response.ErrorResponse; +import com.pgms.coresecurity.security.util.HttpResponseUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; /** @@ -21,21 +20,13 @@ */ @Slf4j @Component -@RequiredArgsConstructor public class JwtAccessDeniedHandler implements AccessDeniedHandler { - private final ObjectMapper objectMapper; - @Override public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException { log.warn("Access Denied: ", accessDeniedException); - ErrorResponse errorResponse = new ErrorResponse("FORBIDDEN", "권한이 없습니다."); - - response.setContentType(MediaType.APPLICATION_JSON_VALUE); - response.setStatus(HttpStatus.FORBIDDEN.value()); - response.setCharacterEncoding("UTF-8"); - objectMapper.writeValue(response.getOutputStream(), errorResponse); + HttpResponseUtil.setErrorResponse(response, HttpStatus.FORBIDDEN, FORBIDDEN.getErrorResponse()); } } diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAuthenticationEntryPoint.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAuthenticationEntryPoint.java index 87a9a527..cecb0583 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAuthenticationEntryPoint.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/jwt/JwtAuthenticationEntryPoint.java @@ -3,17 +3,16 @@ import java.io.IOException; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.pgms.coredomain.domain.common.SecurityErrorCode; import com.pgms.coredomain.response.ErrorResponse; +import com.pgms.coresecurity.security.util.HttpResponseUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; /** @@ -21,11 +20,8 @@ */ @Slf4j @Component -@RequiredArgsConstructor public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { - private final ObjectMapper objectMapper; - @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) @@ -34,15 +30,11 @@ public void commence(HttpServletRequest request, HttpServletResponse response, ErrorResponse errorResponse; if (request.getAttribute("expired") != null) { - errorResponse = new ErrorResponse("ACCESS_TOKEN_EXPIRED", "토큰이 만료되었습니다."); + errorResponse = SecurityErrorCode.ACCESS_TOKEN_EXPIRED.getErrorResponse(); } else { - errorResponse = new ErrorResponse("UNAUTHORIZED", "로그인 해주세요."); + errorResponse = SecurityErrorCode.UNAUTHORIZED.getErrorResponse(); } - response.setContentType(MediaType.APPLICATION_JSON_VALUE); - response.setStatus(HttpStatus.UNAUTHORIZED.value()); - response.setCharacterEncoding("UTF-8"); - objectMapper.writeValue(response.getOutputStream(), errorResponse); + HttpResponseUtil.setErrorResponse(response, HttpStatus.UNAUTHORIZED, errorResponse); } - } diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/resolver/CurrentAccountArgumentResolver.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/resolver/CurrentAccountArgumentResolver.java index ca97f094..dec3243a 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/resolver/CurrentAccountArgumentResolver.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/resolver/CurrentAccountArgumentResolver.java @@ -10,6 +10,8 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +import com.pgms.coredomain.domain.common.SecurityErrorCode; +import com.pgms.coresecurity.security.exception.SecurityCustomException; import com.pgms.coresecurity.security.service.UserDetailsImpl; public class CurrentAccountArgumentResolver implements HandlerMethodArgumentResolver { @@ -32,7 +34,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m private void checkAuthenticated(Authentication authentication) { if (Objects.isNull(authentication)) { - throw new RuntimeException("인증되지 않은 요청입니다."); + throw new SecurityCustomException(SecurityErrorCode.UNAUTHORIZED); } } } diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/service/AdminUserDetailsService.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/service/AdminUserDetailsService.java index 3be31bc1..ef357f1e 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/service/AdminUserDetailsService.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/service/AdminUserDetailsService.java @@ -6,8 +6,10 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coredomain.domain.member.Admin; import com.pgms.coredomain.domain.member.repository.AdminRepository; +import com.pgms.coresecurity.security.exception.SecurityCustomException; import lombok.RequiredArgsConstructor; @@ -21,7 +23,7 @@ public class AdminUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { Admin admin = adminRepository.findByEmail(email) - .orElseThrow(() -> new RuntimeException("해당 어드민이 존재하지 않습니다.")); + .orElseThrow(() -> new SecurityCustomException(MemberErrorCode.ADMIN_NOT_FOUND)); return UserDetailsImpl.from(admin); } diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/service/CustomAuthenticationProvider.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/service/CustomAuthenticationProvider.java index 64b464d5..d843a74e 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/service/CustomAuthenticationProvider.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/service/CustomAuthenticationProvider.java @@ -9,6 +9,9 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; +import com.pgms.coredomain.domain.common.MemberErrorCode; +import com.pgms.coresecurity.security.exception.SecurityCustomException; + @Component public class CustomAuthenticationProvider implements AuthenticationProvider { @@ -39,7 +42,7 @@ public Authentication authenticate(Authentication authentication) throws Authent } if (!passwordEncoder.matches(password, userDetails.getPassword())) { - throw new RuntimeException("비밀번호가 일치하지 않습니다."); + throw new SecurityCustomException(MemberErrorCode.PASSWORD_NOT_MATCHED); } return new UsernamePasswordAuthenticationToken(userDetails, password, userDetails.getAuthorities()); diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/service/MemberUserDetailsService.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/service/MemberUserDetailsService.java index b5ddbd4b..ebf9749b 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/service/MemberUserDetailsService.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/service/MemberUserDetailsService.java @@ -6,8 +6,10 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import com.pgms.coredomain.domain.common.MemberErrorCode; import com.pgms.coredomain.domain.member.Member; import com.pgms.coredomain.domain.member.repository.MemberRepository; +import com.pgms.coresecurity.security.exception.SecurityCustomException; import lombok.RequiredArgsConstructor; @@ -21,7 +23,7 @@ public class MemberUserDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { Member member = memberRepository.findByEmail(email) - .orElseThrow(() -> new RuntimeException("해당 멤버가 존재하지 않습니다.")); + .orElseThrow(() -> new SecurityCustomException(MemberErrorCode.MEMBER_NOT_FOUND)); return UserDetailsImpl.from(member); } diff --git a/core/core-security/src/main/java/com/pgms/coresecurity/security/util/HttpResponseUtil.java b/core/core-security/src/main/java/com/pgms/coresecurity/security/util/HttpResponseUtil.java index 36ccf251..5f0bf3e5 100644 --- a/core/core-security/src/main/java/com/pgms/coresecurity/security/util/HttpResponseUtil.java +++ b/core/core-security/src/main/java/com/pgms/coresecurity/security/util/HttpResponseUtil.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.pgms.coredomain.response.ApiResponse; -import com.pgms.coredomain.response.ErrorResponse; import jakarta.servlet.http.HttpServletResponse; import lombok.NoArgsConstructor; @@ -28,13 +27,11 @@ public static void setSuccessResponse(HttpServletResponse response, HttpStatus h response.getWriter().write(responseBody); } - public static void setErrorResponse(HttpServletResponse response, HttpStatus httpStatus) + public static void setErrorResponse(HttpServletResponse response, HttpStatus httpStatus, Object body) throws IOException { - String responseBody = objectMapper.writeValueAsString( - new ErrorResponse(httpStatus.name(), httpStatus.getReasonPhrase())); response.setContentType(MediaType.APPLICATION_JSON_VALUE); response.setStatus(httpStatus.value()); response.setCharacterEncoding("UTF-8"); - response.getWriter().write(responseBody); + objectMapper.writeValue(response.getOutputStream(), body); } }