Signup profile policy refresh + admin login response update #33
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.comatching.user.domain.auth.dto; | ||
|
|
||
| public record NicknameAvailabilityResponse( | ||
| boolean available | ||
| ) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| package com.comatching.user.domain.member.service; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
@@ -15,8 +17,8 @@ | |
| import com.comatching.common.dto.member.ProfileResponse; | ||
| import com.comatching.common.dto.member.ProfileTagDto; | ||
| import com.comatching.common.exception.BusinessException; | ||
| import com.comatching.common.service.S3Service; | ||
| import com.comatching.user.domain.event.UserEventPublisher; | ||
| import com.comatching.user.domain.member.dto.ProfileUpdateRequest; | ||
| import com.comatching.user.domain.member.entity.Member; | ||
| import com.comatching.user.domain.member.entity.Profile; | ||
|
|
@@ -34,11 +36,18 @@ | |
| @Transactional | ||
| public class ProfileServiceImpl implements ProfileCreateService, ProfileManageService { | ||
|
|
||
| private static final String DEFAULT_IMAGE_VALUE = "default"; | ||
| private static final String DEFAULT_IMAGE_PREFIX = "default_"; | ||
| private static final String DEFAULT_IMAGE_EXTENSION = ".png"; | ||
| private static final Set<String> DEFAULT_IMAGE_ANIMALS = Set.of( | ||
| "dog", "cat", "dinosaur", "otter", "bear", "fox", "penguin", "wolf", "rabbit", "snake", "horse", "frog" | ||
| ); | ||
|
|
||
| private final MemberRepository memberRepository; | ||
| private final ProfileRepository profileRepository; | ||
| private final UserEventPublisher eventPublisher; | ||
| private final ProfileImageProperties profileImageProperties; | ||
| private final S3Service s3Service; | ||
|
|
||
| @Override | ||
| public ProfileResponse createProfile(Long memberId, ProfileCreateRequest request) { | ||
|
|
@@ -70,6 +79,13 @@ public ProfileResponse getProfile(Long memberId) { | |
| return toProfileResponse(profile); | ||
| } | ||
|
|
||
| @Override | ||
| @Transactional(readOnly = true) | ||
| public boolean isNicknameAvailable(String nickname) { | ||
| String normalizedNickname = normalizeNickname(nickname); | ||
| return !profileRepository.existsByNickname(normalizedNickname); | ||
| } | ||
|
|
||
| @Override | ||
| @Transactional(readOnly = true) | ||
| public List<ProfileResponse> getProfilesByIds(List<Long> memberIds) { | ||
|
|
@@ -87,11 +103,14 @@ public ProfileResponse updateProfile(Long memberId, ProfileUpdateRequest request | |
| Profile profile = profileRepository.findByMemberId(memberId) | ||
| .orElseThrow(() -> new BusinessException(UserErrorCode.PROFILE_NOT_EXISTS)); | ||
|
|
||
| String normalizedNickname = normalizeNicknameForUpdate(request.nickname(), profile.getNickname(), memberId); | ||
| String profileImageUrl = resolveProfileImageUrlForUpdate(request.profileImageUrl()); | ||
|
|
||
| profile.update( | ||
| normalizedNickname, | ||
| request.intro(), | ||
| request.mbti(), | ||
| profileImageUrl, | ||
| request.gender(), | ||
| request.birthDate(), | ||
| request.socialType(), | ||
|
|
@@ -139,13 +158,10 @@ private void publishMatchingEvent(Profile profile) { | |
|
|
||
| private Profile saveProfile(ProfileCreateRequest request, Member member) { | ||
|
|
||
| String finalNickname = normalizeNickname(request.nickname()); | ||
| validateNicknameDuplicateOnCreate(finalNickname); | ||
| String finalProfileImageUrl = resolveProfileImageUrl(request.profileImageKey()); | ||
|
|
||
| Profile profile = Profile.builder() | ||
| .member(member) | ||
| .nickname(finalNickname) | ||
|
|
@@ -167,20 +183,72 @@ private Profile saveProfile(ProfileCreateRequest request, Member member) { | |
| return profileRepository.save(profile); | ||
| } | ||
|
|
||
| private String normalizeNickname(String nickname) { | ||
| if (!StringUtils.hasText(nickname)) { | ||
| throw new BusinessException(UserErrorCode.INVALID_NICKNAME); | ||
| } | ||
|
|
||
| return nickname.trim(); | ||
| } | ||
|
|
||
| private String normalizeNicknameForUpdate(String nickname, String currentNickname, Long memberId) { | ||
| if (nickname == null) { | ||
| return null; | ||
| } | ||
|
|
||
| String normalizedNickname = normalizeNickname(nickname); | ||
| if (!Objects.equals(normalizedNickname, currentNickname) | ||
| && profileRepository.existsByNicknameAndMemberIdNot(normalizedNickname, memberId)) { | ||
| throw new BusinessException(UserErrorCode.DUPLICATE_NICKNAME); | ||
| } | ||
|
|
||
| return normalizedNickname; | ||
| } | ||
|
|
||
| private void validateNicknameDuplicateOnCreate(String nickname) { | ||
| if (profileRepository.existsByNickname(nickname)) { | ||
| throw new BusinessException(UserErrorCode.DUPLICATE_NICKNAME); | ||
| } | ||
| } | ||
|
|
||
| private String resolveProfileImageUrlForUpdate(String profileImageValue) { | ||
| if (profileImageValue == null) { | ||
| return null; | ||
| } | ||
| return resolveProfileImageUrl(profileImageValue); | ||
| } | ||
|
|
||
| private String resolveProfileImageUrl(String profileImageValue) { | ||
| if (!StringUtils.hasText(profileImageValue)) { | ||
| return buildDefaultProfileImageUrl(DEFAULT_IMAGE_VALUE + DEFAULT_IMAGE_EXTENSION); | ||
| } | ||
|
|
||
| String normalizedValue = profileImageValue.trim(); | ||
| String loweredValue = normalizedValue.toLowerCase(Locale.ROOT); | ||
|
|
||
| if (DEFAULT_IMAGE_VALUE.equals(loweredValue)) { | ||
| return buildDefaultProfileImageUrl(DEFAULT_IMAGE_VALUE + DEFAULT_IMAGE_EXTENSION); | ||
| } | ||
|
|
||
| if (loweredValue.startsWith(DEFAULT_IMAGE_PREFIX)) { | ||
| String animalName = loweredValue.substring(DEFAULT_IMAGE_PREFIX.length()); | ||
| if (DEFAULT_IMAGE_ANIMALS.contains(animalName)) { | ||
| return buildDefaultProfileImageUrl(animalName + DEFAULT_IMAGE_EXTENSION); | ||
| } | ||
| } | ||
|
Comment on lines
+233
to
+238
There was a problem hiding this comment.
if (loweredValue.startsWith(DEFAULT_IMAGE_PREFIX)) {
String animalName = loweredValue.substring(DEFAULT_IMAGE_PREFIX.length());
if (DEFAULT_IMAGE_ANIMALS.contains(animalName)) {
return buildDefaultProfileImageUrl(animalName + DEFAULT_IMAGE_EXTENSION);
} else {
// 정의되지 않은 동물 이름이 입력된 경우, 기본 이미지로 fallback 합니다.
return buildDefaultProfileImageUrl(DEFAULT_IMAGE_VALUE + DEFAULT_IMAGE_EXTENSION);
}
}References
|
||
|
|
||
| if (normalizedValue.startsWith("http://") || normalizedValue.startsWith("https://")) { | ||
| return normalizedValue; | ||
| } | ||
|
|
||
| return s3Service.getFileUrl(normalizedValue); | ||
| } | ||
|
|
||
| private String buildDefaultProfileImageUrl(String filename) { | ||
| if (!StringUtils.hasText(profileImageProperties.baseUrl())) { | ||
| return null; | ||
| } | ||
| return profileImageProperties.baseUrl() + filename; | ||
| } | ||
|
|
||
| private static List<ProfileHobby> getProfileHobbies(List<HobbyDto> hobbies) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
accessToken쿠키의domain설정을 주석 처리한 것은 로컬 개발 환경을 지원하기 위한 좋은 변경입니다. 하지만refreshToken쿠키(32행)에는 여전히.domain("comatching.site")설정이 남아있어 설정이 일관되지 않습니다. 이로 인해 로컬 환경에서refreshToken쿠키가 정상적으로 설정되지 않을 수 있습니다. 두 쿠키의domain설정을 일관되게 관리하는 것을 권장합니다.