From 2a94f03241f10d949c25c64201082e52dcc5fdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Mon, 19 Feb 2024 19:06:48 +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=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-db.yml | 2 +- .../pty/repository/PtyCstmrDtlRepository.java | 2 +- .../pty/service/PtyCstmrDomainService.java | 6 ++- .../controller/UserAccountController.java | 14 ++++++- .../account/model/detail/SearchUserRS.java | 40 +++++++++++++++++++ .../account/service/UserAccountService.java | 34 +++++++++++++++- 6 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/detail/SearchUserRS.java diff --git a/common/config-db/src/main/resources/application-db.yml b/common/config-db/src/main/resources/application-db.yml index 19dd34c..e8153f2 100644 --- a/common/config-db/src/main/resources/application-db.yml +++ b/common/config-db/src/main/resources/application-db.yml @@ -1,7 +1,7 @@ spring: jpa: hibernate: - ddl-auto: create + ddl-auto: none` naming: physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl datasource: diff --git a/data/pty/src/main/java/kr/co/palnet/kac/data/pty/repository/PtyCstmrDtlRepository.java b/data/pty/src/main/java/kr/co/palnet/kac/data/pty/repository/PtyCstmrDtlRepository.java index 820c96a..d532daf 100644 --- a/data/pty/src/main/java/kr/co/palnet/kac/data/pty/repository/PtyCstmrDtlRepository.java +++ b/data/pty/src/main/java/kr/co/palnet/kac/data/pty/repository/PtyCstmrDtlRepository.java @@ -3,6 +3,6 @@ package kr.co.palnet.kac.data.pty.repository; import kr.co.palnet.kac.data.pty.model.PtyCstmrDtl; import org.springframework.data.jpa.repository.JpaRepository; -public interface PtyCstmrDtlRepository extends JpaRepository { +public interface PtyCstmrDtlRepository extends JpaRepository { } diff --git a/data/pty/src/main/java/kr/co/palnet/kac/data/pty/service/PtyCstmrDomainService.java b/data/pty/src/main/java/kr/co/palnet/kac/data/pty/service/PtyCstmrDomainService.java index f63bfce..2f54c45 100644 --- a/data/pty/src/main/java/kr/co/palnet/kac/data/pty/service/PtyCstmrDomainService.java +++ b/data/pty/src/main/java/kr/co/palnet/kac/data/pty/service/PtyCstmrDomainService.java @@ -24,7 +24,7 @@ public class PtyCstmrDomainService { return ptyCstmrBasRepository.findByUserId(userId); } - public Optional findById(Long cstmrSno){ + public Optional findPtyCstmrBasById(Long cstmrSno){ return ptyCstmrBasRepository.findById(cstmrSno); } @@ -32,6 +32,10 @@ public class PtyCstmrDomainService { return ptyCstmrBasRepository.save(entity); } + public Optional findPtyCstmrDtlById(Long cstmrSno){ + return ptyCstmrDtlRepository.findById(cstmrSno); + } + public PtyCstmrDtl savePtyCstmrDtl(PtyCstmrDtl entity){ return ptyCstmrDtlRepository.save(entity); } 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 023f84e..6b4b5b2 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 @@ -2,6 +2,7 @@ package kr.co.palnet.kac.api.v1.user.account.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import kr.co.palnet.kac.api.v1.user.account.model.detail.SearchUserRS; import kr.co.palnet.kac.api.v1.user.account.model.register.FormRegisterRQ; import kr.co.palnet.kac.api.v1.user.account.service.UserAccountService; import lombok.RequiredArgsConstructor; @@ -34,8 +35,19 @@ public class UserAccountController { userAccountService.deleteUser(); - return ResponseEntity.status(HttpStatus.OK).build(); + return ResponseEntity.ok().build(); } + @GetMapping("/profile") + public ResponseEntity profile(){ + + SearchUserRS result = userAccountService.profile(); + + return ResponseEntity.status(HttpStatus.OK).body(result); + } + + + + } diff --git a/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/detail/SearchUserRS.java b/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/detail/SearchUserRS.java new file mode 100644 index 0000000..595256d --- /dev/null +++ b/web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/detail/SearchUserRS.java @@ -0,0 +1,40 @@ +package kr.co.palnet.kac.api.v1.user.account.model.detail; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Data +public class SearchUserRS { + + @Schema(description = "이름" , example = "이경도") + private String memberName; + + @Schema(description = "생년월일" , example = "1999-09-07") + private LocalDate brthdyDate; + + @Schema(description = "국적코드" , example = "KOR") + private String cntryCd; + + @Schema(description = "이메일" , example = "lkd9125@naver.com") + private String email; + + @Schema(description = "휴대폰번호" , example = "01083703435") + private String hpno; + + @Schema(description = "ID" , example = "lkd9125") + private String userId; + + @Schema(description = "최종 업데이트 일시" , example = "2024-02-19T16:40:33.000") + private LocalDateTime updateDt; + + @Schema(description = "최종 업데이트 유저" , example = "lkd9125") + private String updateuserId; + + @Schema(description = "유저 청 구분코드" , example = "KAC") + private String cptAuthCode; +} 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 1b547af..47ad191 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 @@ -2,6 +2,7 @@ package kr.co.palnet.kac.api.v1.user.account.service; import kr.co.palnet.kac.api.v1.user.account.model.PtyCstmrDTO; import kr.co.palnet.kac.api.v1.user.account.model.PtyCstmrDtlDTO; +import kr.co.palnet.kac.api.v1.user.account.model.detail.SearchUserRS; import kr.co.palnet.kac.api.v1.user.account.model.register.FormRegisterRQ; import kr.co.palnet.kac.api.v1.user.account.model.register.AgreeTermsModel; import kr.co.palnet.kac.config.security.util.SessionHelper; @@ -148,7 +149,7 @@ public class UserAccountService { } } - Optional userEntityData = ptyCstmrDomainService.findById(cstmrSno); + Optional userEntityData = ptyCstmrDomainService.findPtyCstmrBasById(cstmrSno); if(userEntityData.isPresent()){ PtyCstmrBas userEntity = userEntityData.get(); @@ -157,7 +158,36 @@ public class UserAccountService { ptyCstmrDomainService.savePtyCstmrBas(userEntity); } else { - throw new BaseException(BaseErrorCode.DATA_EMPTY, "토큰값 에러"); + throw new BaseException(BaseErrorCode.DATA_EMPTY); } } + + public SearchUserRS profile() { + + Long cstmrSno = SessionHelper.getCstmrSno(); + + Optional userEntityData = ptyCstmrDomainService.findPtyCstmrBasById(cstmrSno); + Optional userDetailEntityData = ptyCstmrDomainService.findPtyCstmrDtlById(cstmrSno); + + SearchUserRS result = new SearchUserRS(); + + if(userEntityData.isPresent() && userDetailEntityData.isPresent()){ + PtyCstmrBas userEntity = userEntityData.get(); + PtyCstmrDtl userDetailEntity = userDetailEntityData.get(); + + result.setMemberName(userDetailEntity.getMemberName()); + result.setUserId(userEntity.getUserId()); + result.setBrthdyDate(userDetailEntity.getBrthdyDate()); + result.setCntryCd(userDetailEntity.getCntryCd()); + result.setEmail(userDetailEntity.getEmail()); + result.setHpno(userDetailEntity.getHpno()); + result.setUpdateDt(userDetailEntity.getUpdateDt()); + result.setUpdateuserId(userDetailEntity.getUpdateUserId()); + result.setCptAuthCode(userDetailEntity.getUpdateUserId()); + } else { + throw new BaseException(BaseErrorCode.DATA_EMPTY); + } + + return result; + } }