Browse Source

feature: User모듈 - 회원정보수정 추가

pull/8/head
lkd9125(이경도) 7 months ago
parent
commit
6d5d24075d
  1. 16
      web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/controller/UserAccountController.java
  2. 1
      web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/update/UpdatePasswordRQ.java
  3. 17
      web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/update/UpdateUserRQ.java
  4. 24
      web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java

16
web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/controller/UserAccountController.java

@ -5,6 +5,7 @@ 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.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.FormRegisterRQ;
import kr.co.palnet.kac.api.v1.user.account.model.update.UpdatePasswordRQ; import kr.co.palnet.kac.api.v1.user.account.model.update.UpdatePasswordRQ;
import kr.co.palnet.kac.api.v1.user.account.model.update.UpdateUserRQ;
import kr.co.palnet.kac.api.v1.user.account.service.UserAccountService; import kr.co.palnet.kac.api.v1.user.account.service.UserAccountService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -23,7 +24,7 @@ public class UserAccountController {
@PostMapping("/register") @PostMapping("/register")
@Operation(summary = "회원가입", description = "유저의 계정을 추가합니다.") @Operation(summary = "회원가입", description = "유저의 계정을 추가합니다.")
public ResponseEntity<Object> createUser(@RequestBody FormRegisterRQ rq){ public ResponseEntity<Boolean> createUser(@RequestBody FormRegisterRQ rq){
userAccountService.createUser(rq); userAccountService.createUser(rq);
@ -32,7 +33,7 @@ public class UserAccountController {
@DeleteMapping("/delete") @DeleteMapping("/delete")
@Operation(summary = "회원탈퇴", description = "유저의 계정을 탈퇴시키며 참여한 그룹도 탈퇴시킵니다.") @Operation(summary = "회원탈퇴", description = "유저의 계정을 탈퇴시키며 참여한 그룹도 탈퇴시킵니다.")
public ResponseEntity<Object> deleteUser(){ public ResponseEntity<Boolean> deleteUser(){
userAccountService.deleteUser(); userAccountService.deleteUser();
@ -50,13 +51,22 @@ public class UserAccountController {
@PutMapping("/update/pswd") @PutMapping("/update/pswd")
@Operation(summary = "회원암호 변경", description = "회원 암호를 변경합니다.") @Operation(summary = "회원암호 변경", description = "회원 암호를 변경합니다.")
public ResponseEntity<Object> updatePassword(@RequestBody UpdatePasswordRQ rq){ public ResponseEntity<Boolean> updatePassword(@RequestBody UpdatePasswordRQ rq){
userAccountService.updatePassword(rq); userAccountService.updatePassword(rq);
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
@PutMapping("/update")
@Operation(summary = "회원정보 변경", description = "회원의 정보를 수정합니다.")
public ResponseEntity<Object> updateUser(@RequestBody UpdateUserRQ rq){
userAccountService.updateUser(rq);
return ResponseEntity.ok().build();
}

1
web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/update/UpdatePasswordRQ.java

@ -6,6 +6,7 @@ import lombok.Data;
@Data @Data
public class UpdatePasswordRQ { public class UpdatePasswordRQ {
// TODO :: 해당 컬럼은 Api실행시 로직상에서도 필요하지 않을뿐더러 클라이언트에서도 사용되지 않고있음
@Schema(description = "유저의 기존 비밀번호", example = "palnet!234") @Schema(description = "유저의 기존 비밀번호", example = "palnet!234")
private String userPswd; private String userPswd;

17
web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/model/update/UpdateUserRQ.java

@ -0,0 +1,17 @@
package kr.co.palnet.kac.api.v1.user.account.model.update;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.Instant;
@Data
public class UpdateUserRQ {
@Schema(description = "유저 이메일" , example = "updateEmail@test.co.kr")
private String email;
@Schema(description = "업데이트할 핸드폰 번호", example = "01023457777")
private String hpno;
}

24
web/api-user/src/main/java/kr/co/palnet/kac/api/v1/user/account/service/UserAccountService.java

@ -6,6 +6,7 @@ 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.FormRegisterRQ;
import kr.co.palnet.kac.api.v1.user.account.model.register.AgreeTermsModel; import kr.co.palnet.kac.api.v1.user.account.model.register.AgreeTermsModel;
import kr.co.palnet.kac.api.v1.user.account.model.update.UpdatePasswordRQ; import kr.co.palnet.kac.api.v1.user.account.model.update.UpdatePasswordRQ;
import kr.co.palnet.kac.api.v1.user.account.model.update.UpdateUserRQ;
import kr.co.palnet.kac.config.security.util.SessionHelper; import kr.co.palnet.kac.config.security.util.SessionHelper;
import kr.co.palnet.kac.core.exception.BaseErrorCode; import kr.co.palnet.kac.core.exception.BaseErrorCode;
import kr.co.palnet.kac.core.exception.BaseException; import kr.co.palnet.kac.core.exception.BaseException;
@ -17,6 +18,7 @@ import kr.co.palnet.kac.util.EncryptUtil;
import kr.co.palnet.kac.util.HttpUtils; import kr.co.palnet.kac.util.HttpUtils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cglib.core.Local;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -220,5 +222,27 @@ public class UserAccountService {
} }
@Transactional
public void updateUser(UpdateUserRQ rq) {
Long cstmrSno = SessionHelper.getCstmrSno();
String userId = SessionHelper.getUserId();
Optional<PtyCstmrBas> userEntityData = ptyCstmrDomainService.findPtyCstmrBasById(cstmrSno);
if(userEntityData.isPresent()){
PtyCstmrBas userEntity = userEntityData.get();
PtyCstmrDtl userDetailEntity = userEntity.getPtyCstmrDtl();
userDetailEntity.setUpdateDt(LocalDateTime.now());
userDetailEntity.setUpdateUserId(userId);
if(rq.getEmail() != null) userDetailEntity.setEmail(EncryptUtil.encrypt(rq.getEmail()));
if(rq.getHpno() != null) userDetailEntity.setHpno(EncryptUtil.encrypt(rq.getHpno()));
userEntity.setPtyCstmrDtl(userDetailEntity);
} else {
throw new BaseException(BaseErrorCode.DATA_EMPTY);
}
}
} }

Loading…
Cancel
Save