diff --git a/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/controller/UserAccountController.java b/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/controller/UserAccountController.java index 6b4b5b2..52650e1 100644 --- a/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/controller/UserAccountController.java +++ b/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/controller/UserAccountController.java @@ -30,7 +30,7 @@ public class UserAccountController { } @DeleteMapping("/delete") - @Operation(summary = "회원탈퇴", description = "유저의 계정을 탈퇴시키며 그룹의 참여여부도 모두 탈퇴시킵니다.") + @Operation(summary = "회원탈퇴", description = "유저의 계정을 탈퇴시키며 참여한 그룹도 탈퇴시킵니다.") public ResponseEntity deleteUser(){ userAccountService.deleteUser(); @@ -39,6 +39,7 @@ public class UserAccountController { } @GetMapping("/profile") + @Operation(summary = "회원정보 조회", description = "회원 정보를 조회합니다.") public ResponseEntity profile(){ SearchUserRS result = userAccountService.profile(); diff --git a/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java b/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java index 47ad191..48b61a5 100644 --- a/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java +++ b/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java @@ -90,6 +90,8 @@ public class UserAccountService { public void deleteUser() { Long cstmrSno = SessionHelper.getCstmrSno(); + if(cstmrSno == null) return; + Optional> groupData = ptyGroupDomainService.findJoinGroupByCstmrSno(cstmrSno); if(groupData.isPresent() && !groupData.get().isEmpty()){ @@ -167,13 +169,12 @@ public class UserAccountService { Long cstmrSno = SessionHelper.getCstmrSno(); Optional userEntityData = ptyCstmrDomainService.findPtyCstmrBasById(cstmrSno); - Optional userDetailEntityData = ptyCstmrDomainService.findPtyCstmrDtlById(cstmrSno); - - SearchUserRS result = new SearchUserRS(); - if(userEntityData.isPresent() && userDetailEntityData.isPresent()){ + if(userEntityData.isPresent()){ PtyCstmrBas userEntity = userEntityData.get(); - PtyCstmrDtl userDetailEntity = userDetailEntityData.get(); + PtyCstmrDtl userDetailEntity = userEntity.getPtyCstmrDtl(); + + SearchUserRS result = new SearchUserRS(); result.setMemberName(userDetailEntity.getMemberName()); result.setUserId(userEntity.getUserId()); @@ -183,11 +184,11 @@ public class UserAccountService { result.setHpno(userDetailEntity.getHpno()); result.setUpdateDt(userDetailEntity.getUpdateDt()); result.setUpdateuserId(userDetailEntity.getUpdateUserId()); - result.setCptAuthCode(userDetailEntity.getUpdateUserId()); + result.setCptAuthCode(userEntity.getCptAuthCode()); + + return result; } else { throw new BaseException(BaseErrorCode.DATA_EMPTY); } - - return result; } }