From b740fcc5f00e8a0560e368b511b323e8417a4fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?=
 <lkd9125@naver.com>
Date: Tue, 20 Feb 2024 10:39:45 +0900
Subject: [PATCH] =?UTF-8?q?feature:=20User=EB=AA=A8=EB=93=88=20-=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20=EC=8A=A4=EC=9B=A8?=
 =?UTF-8?q?=EA=B1=B0=20=EB=B0=8F=20=EC=BD=94=EB=93=9C=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UserAccountController.java       |  3 ++-
 .../account/service/UserAccountService.java     | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

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<Object> deleteUser(){
 
         userAccountService.deleteUser();
@@ -39,6 +39,7 @@ public class UserAccountController {
     }
 
     @GetMapping("/profile")
+    @Operation(summary = "회원정보 조회", description = "회원 정보를 조회합니다.")
     public ResponseEntity<SearchUserRS> 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<List<PtyCstmrGroup>> groupData = ptyGroupDomainService.findJoinGroupByCstmrSno(cstmrSno);
 
         if(groupData.isPresent() && !groupData.get().isEmpty()){
@@ -167,13 +169,12 @@ public class UserAccountService {
         Long cstmrSno = SessionHelper.getCstmrSno();
 
         Optional<PtyCstmrBas> userEntityData = ptyCstmrDomainService.findPtyCstmrBasById(cstmrSno);
-        Optional<PtyCstmrDtl> 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;
     }
 }