Skip to content

[RELEASE] 초기 프로필 사진 수정시 오류 해결 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leesewon00 merged 1 commit into from
Aug 27, 2024
Merged

[RELEASE] 초기 프로필 사진 수정시 오류 해결 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/com/example/solidconnection/siteuser/service/SiteUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ public ProfileImageUpdateResponse updateProfileImage(String email, MultipartFile
SiteUser siteUser = siteUserRepository.getByEmail(email);
validateProfileImage(imageFile);

s3Service.deleteExProfile(email);
// 프로필 이미지를 처음 수정하는 경우에는 deleteExProfile 수행하지 않음
if(!isDefaultProfileImage(siteUser.getProfileImageUrl())){
s3Service.deleteExProfile(email);
}
UploadedFileUrlResponse uploadedFileUrlResponse = s3Service.uploadFile(imageFile, ImgType.PROFILE);
siteUser.setProfileImageUrl(uploadedFileUrlResponse.fileUrl());
siteUserRepository.save(siteUser);
Expand All @@ -102,6 +105,11 @@ private void validateProfileImage(MultipartFile imageFile) {
}
}

private boolean isDefaultProfileImage(String profileImageUrl) {
String prefix = "https://solid-connection-uploaded.s3.ap-northeast-2.amazonaws.com/profile/";
return profileImageUrl == null || !profileImageUrl.startsWith(prefix);
}

/*
* 닉네임을 수정한다.
* */
Expand Down
37 changes: 36 additions & 1 deletion src/test/java/com/example/solidconnection/unit/service/SiteUserServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public class SiteUserServiceTest {
private SiteUser siteUser;
private MultipartFile imageFile;
private UploadedFileUrlResponse uploadedFileUrlResponse;
private final String defaultProfileImageUrl = "http://k.kakaocdn.net/dn/o2c5A/btsASaNh2Lr/Xum5kRyuErD8LIuLQEWfC0/img_640x640.jpg";

@BeforeEach
void setUp() {
Expand All @@ -62,7 +63,7 @@ private SiteUser createSiteUser() {
return new SiteUser(
"test@example.com",
"nickname",
"http://example.com/profile.jpg",
"https://solid-connection-uploaded.s3.ap-northeast-2.amazonaws.com/profile/abcd",
"1999-01-01",
PreparationStatus.CONSIDERING,
Role.MENTEE,
Expand All @@ -80,6 +81,40 @@ private UploadedFileUrlResponse createUploadedFileUrlResponse() {
return new UploadedFileUrlResponse("https://s3.example.com/test1.png");
}

@Test
void 초기_프로필_이미지를_수정한다_kakao() {
siteUser.setProfileImageUrl(defaultProfileImageUrl);
when(siteUserRepository.getByEmail(siteUser.getEmail())).thenReturn(siteUser);
when(s3Service.uploadFile(imageFile, ImgType.PROFILE)).thenReturn(uploadedFileUrlResponse);

// When
ProfileImageUpdateResponse profileImageUpdateResponse =
siteUserService.updateProfileImage(siteUser.getEmail(), imageFile);
// Then
assertEquals(profileImageUpdateResponse, ProfileImageUpdateResponse.from(siteUser));
verify(siteUserRepository, times(1)).getByEmail(siteUser.getEmail());
verify(s3Service, times(0)).deleteExProfile(siteUser.getEmail());
verify(s3Service, times(1)).uploadFile(imageFile, ImgType.PROFILE);
verify(siteUserRepository, times(1)).save(any(SiteUser.class));
}

@Test
void 초기_프로필_이미지를_수정한다_null() {
siteUser.setProfileImageUrl(null);
when(siteUserRepository.getByEmail(siteUser.getEmail())).thenReturn(siteUser);
when(s3Service.uploadFile(imageFile, ImgType.PROFILE)).thenReturn(uploadedFileUrlResponse);

// When
ProfileImageUpdateResponse profileImageUpdateResponse =
siteUserService.updateProfileImage(siteUser.getEmail(), imageFile);
// Then
assertEquals(profileImageUpdateResponse, ProfileImageUpdateResponse.from(siteUser));
verify(siteUserRepository, times(1)).getByEmail(siteUser.getEmail());
verify(s3Service, times(0)).deleteExProfile(siteUser.getEmail());
verify(s3Service, times(1)).uploadFile(imageFile, ImgType.PROFILE);
verify(siteUserRepository, times(1)).save(any(SiteUser.class));
}

@Test
void 프로필_이미지를_수정한다() {
// Given
Expand Down