Feat/회원가입 거절사유 메모 유저아이디 암호화 #162

wingle/src/main/java/kr/co/wingle/member/dto/MemoRequestDto.java

@@ -7,7 +7,7 @@
 @Getter
 public class MemoRequestDto {
 	@NotNull(message = "사용자 id가 없습니다.")
-	private Long userId;
+	private String userId;
 	@NotNull(message = "메모가 없습니다.")
 	private String memo;
 }

wingle/src/main/java/kr/co/wingle/member/dto/RejectionRequestDto.java

@@ -10,7 +10,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class RejectionRequestDto {
 	@NotNull(message = "사용자 id가 없습니다.")
-	private Long userId;
+	private String userId;
 	@NotNull(message = "거절 사유가 없습니다.")
 	private String reason;
 }

wingle/src/main/java/kr/co/wingle/member/dto/SignupResponseDto.java

@@ -7,11 +7,11 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class SignupResponseDto {
-	private Long id;
+	private String id;
 	private String name;
 	private String nickname;
 
-	public static SignupResponseDto of(Long id, String name, String nickname) {
+	public static SignupResponseDto of(String id, String name, String nickname) {
 		SignupResponseDto responseDto = new SignupResponseDto();
 		responseDto.id = id;
 		responseDto.name = name;

wingle/src/main/java/kr/co/wingle/member/service/AuthService.java

@@ -18,6 +18,7 @@
 import kr.co.wingle.common.exception.NotFoundException;
 import kr.co.wingle.common.jwt.TokenInfo;
 import kr.co.wingle.common.jwt.TokenProvider;
+import kr.co.wingle.common.util.AES256Util;
 import kr.co.wingle.common.util.RedisUtil;
 import kr.co.wingle.common.util.S3Util;
 import kr.co.wingle.common.util.SecurityUtil;
@@ -50,6 +51,7 @@
 import kr.co.wingle.member.mailVo.CodeMail;
 import kr.co.wingle.member.mailVo.RejectionMail;
 import kr.co.wingle.profile.ProfileRepository;
+import kr.co.wingle.profile.ProfileUtil;
 import kr.co.wingle.profile.entity.Profile;
 import lombok.RequiredArgsConstructor;
 
@@ -67,6 +69,8 @@ public class AuthService {
 	private final RedisUtil redisUtil;
 	private final MailService mailService;
 	private final MemberService memberService;
+	private final ProfileUtil profileUtil;
+	private final AES256Util aes;
 
 	@Transactional
 	public SignupResponseDto signup(SignupRequestDto request) {
@@ -87,10 +91,16 @@ public SignupResponseDto signup(SignupRequestDto request) {
 		getTermAndSaveTermMember(member, TermCode.TERMS_OF_PROMOTION, request.isTermsOfPromotion());
 
 		// save profile
-		Profile profile = Profile.createProfile(member, request.getNickname(), request.isGender(), request.getNation());
+		if (profileUtil.isDuplicatedNickname(request.getNickname())) {
+			throw new DuplicateException(ErrorCode.DUPLICATE_NICKNAME);
+		}
+
+		Profile profile = Profile.createProfile(member, request.getNickname(), request.isGender(),
+			request.getNation());
 		profileRepository.save(profile);
 
-		return SignupResponseDto.of(member.getId(), member.getName(), profile.getNickname());
+		// encrypt and return
+		return SignupResponseDto.of(aes.encrypt(member.getId().toString()), member.getName(), profile.getNickname());
 	}
 
 	@Transactional
@@ -182,7 +192,7 @@ public PermissionResponseDto sendAcceptanceMail(AcceptanceRequestDto acceptanceR
 
 	@Transactional
 	public PermissionResponseDto sendRejectionMail(RejectionRequestDto rejectionRequestDto) {
-		Long userId = rejectionRequestDto.getUserId();
+		Long userId = Long.parseLong(aes.decrypt(rejectionRequestDto.getUserId()));
 		Member member = memberService.findMemberByMemberId(userId);
 		if (member.getPermission() == Permission.DENY.getStatus())
 			throw new CustomException(ErrorCode.ALREADY_DENY);

wingle/src/main/java/kr/co/wingle/member/service/MemberService.java

@@ -10,6 +10,7 @@
 import kr.co.wingle.common.constants.ErrorCode;
 import kr.co.wingle.common.exception.ForbiddenException;
 import kr.co.wingle.common.exception.NotFoundException;
+import kr.co.wingle.common.util.AES256Util;
 import kr.co.wingle.member.MemberRepository;
 import kr.co.wingle.member.dto.MemoRequestDto;
 import kr.co.wingle.member.dto.MemoResponseDto;
@@ -27,6 +28,7 @@
 public class MemberService {
 	private final MemberRepository memberRepository;
 	private final ProfileRepository profileRepository;
+	private final AES256Util aes;
 	private final int pageSize = 10;
 
 	@Transactional(readOnly = true)
@@ -71,14 +73,15 @@ public WaitingUserResponseDto getWaitingUserInfo(Long userId) {
 
 	@Transactional
 	public MemoResponseDto saveMemo(MemoRequestDto memoRequestDto) {
-		Member member = findMemberByMemberId(memoRequestDto.getUserId());
+
+		Member member = findMemberByMemberId(Long.parseLong(aes.decrypt(memoRequestDto.getUserId())));
 		member.setMemo(memoRequestDto.getMemo());
 		return MemoResponseDto.from(memoRequestDto.getMemo());
 	}
 
 	@Transactional
 	public RejectionResponseDto saveRejectionReason(RejectionRequestDto request) {
-		Member member = findMemberByMemberId(request.getUserId());
+		Member member = findMemberByMemberId(Long.parseLong(aes.decrypt(request.getUserId())));
 		member.setRejectionReason(request.getReason());
 		return RejectionResponseDto.from(request.getReason());
 	}

wingle/src/main/java/kr/co/wingle/profile/ProfileService.java

@@ -13,7 +13,6 @@
 import kr.co.wingle.common.constants.ErrorCode;
 import kr.co.wingle.common.exception.DuplicateException;
 import kr.co.wingle.common.exception.NotFoundException;
-import kr.co.wingle.common.util.AES256Util;
 import kr.co.wingle.common.util.S3Util;
 import kr.co.wingle.member.entity.Member;
 import kr.co.wingle.member.service.AuthService;
@@ -46,7 +45,7 @@ public class ProfileService {
 	private final InterestRepository interestRepository;
 	private final SnsRepository snsRepository;
 	private final S3Util s3Util;
-	private final AES256Util aes;
+	private final ProfileUtil profileUtil;
 
 	@Transactional
 	public ProfileResponseDto saveProfile(ProfileRequestDto request) {
@@ -57,7 +56,7 @@ public ProfileResponseDto saveProfile(ProfileRequestDto request) {
 		Profile profile = getProfile(member);
 
 		if (!profile.getNickname().equals(request.getNickname()) &&
-			profileRepository.existsByNickname(request.getNickname())) {
+			profileUtil.isDuplicatedNickname(request.getNickname())) {
 			throw new DuplicateException(ErrorCode.DUPLICATE_NICKNAME);
 		}
 

wingle/src/main/java/kr/co/wingle/profile/ProfileUtil.java

@@ -0,0 +1,23 @@
+package kr.co.wingle.profile;
+
+import org.springframework.stereotype.Component;
+
+import kr.co.wingle.common.constants.ErrorCode;
+import kr.co.wingle.common.exception.DuplicateException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class ProfileUtil {
+	private final ProfileRepository profileRepository;
+
+	public boolean isDuplicatedNickname(String newNickname) {
+		if (profileRepository.existsByNickname(newNickname)) {
+			throw new DuplicateException(ErrorCode.DUPLICATE_NICKNAME);
+		}
+
+		return false;
+	}
+}