2121
2222import static com .example .solidconnection .custom .exception .ErrorCode .CAN_NOT_CHANGE_NICKNAME_YET ;
2323import static com .example .solidconnection .custom .exception .ErrorCode .NICKNAME_ALREADY_EXISTED ;
24- import static com .example .solidconnection .custom .exception .ErrorCode .PROFILE_IMAGE_NEEDED ;
2524
2625@ RequiredArgsConstructor
2726@ Service
@@ -48,19 +47,21 @@ public MyPageResponse getMyPageInfo(SiteUser siteUser) {
4847 * */
4948 @ Transactional
5049 public void updateMyPageInfo (SiteUser siteUser , MultipartFile imageFile , String nickname ) {
51- validateNicknameUnique (nickname );
52- validateNicknameNotChangedRecently (siteUser .getNicknameModifiedAt ());
53- validateProfileImageNotEmpty (imageFile );
54-
55- if (!isDefaultProfileImage (siteUser .getProfileImageUrl ())) {
56- s3Service .deleteExProfile (siteUser );
50+ if (nickname != null ) {
51+ validateNicknameUnique (nickname );
52+ validateNicknameNotChangedRecently (siteUser .getNicknameModifiedAt ());
53+ siteUser .setNickname (nickname );
54+ siteUser .setNicknameModifiedAt (LocalDateTime .now ());
5755 }
58- UploadedFileUrlResponse uploadedFile = s3Service .uploadFile (imageFile , ImgType .PROFILE );
59- String profileImageUrl = uploadedFile .fileUrl ();
6056
61- siteUser .setProfileImageUrl (profileImageUrl );
62- siteUser .setNickname (nickname );
63- siteUser .setNicknameModifiedAt (LocalDateTime .now ());
57+ if (imageFile != null && !imageFile .isEmpty ()) {
58+ UploadedFileUrlResponse uploadedFile = s3Service .uploadFile (imageFile , ImgType .PROFILE );
59+ if (!isDefaultProfileImage (siteUser .getProfileImageUrl ())) {
60+ s3Service .deleteExProfile (siteUser );
61+ }
62+ String profileImageUrl = uploadedFile .fileUrl ();
63+ siteUser .setProfileImageUrl (profileImageUrl );
64+ }
6465 siteUserRepository .save (siteUser );
6566 }
6667
@@ -81,12 +82,6 @@ private void validateNicknameNotChangedRecently(LocalDateTime lastModifiedAt) {
8182 }
8283 }
8384
84- private void validateProfileImageNotEmpty (MultipartFile imageFile ) {
85- if (imageFile == null || imageFile .isEmpty ()) {
86- throw new CustomException (PROFILE_IMAGE_NEEDED );
87- }
88- }
89-
9085 private boolean isDefaultProfileImage (String profileImageUrl ) {
9186 String prefix = "profile/" ;
9287 return profileImageUrl == null || !profileImageUrl .startsWith (prefix );
0 commit comments