From 8830bdb56c3d890b58d597248508b4a6af16e2a2 Mon Sep 17 00:00:00 2001 From: Hong0329 Date: Tue, 13 Aug 2024 19:40:31 +0900 Subject: [PATCH 1/2] add noti image logic --- .../api/notification/service/NotificationQueryService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java b/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java index 1465650..1dc7921 100644 --- a/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java +++ b/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java @@ -29,6 +29,9 @@ public class NotificationQueryService { @Value("${aws-property.s3-system-image-url}") private String SYSTEM_IMAGE_S3; + + @Value("${s3-popular-image-url}") + private String POPULAR_IMAGE_S3; private final int NOTIFICATION_DEFAULT_PAGE_SIZE = 15; public NotificaitonCountResponseDto countUnreadNotification(Long memberId) { @@ -127,6 +130,9 @@ private String profileUrl(Long notificationId, String triggerType){ Notification notification = notificationRepository.findNotificationById(notificationId); Member triggerMember = memberRepository.findMemberByIdOrThrow(notification.getNotificationTriggerMemberId()); return triggerMember.getProfileUrl(); + } + if(triggerType.equals("popularWriter")||triggerType.equals("popularContent")) { + return POPULAR_IMAGE_S3; }else{ return SYSTEM_IMAGE_S3; } From 5782f118696257ec9b740da4fe40f68a985f0562 Mon Sep 17 00:00:00 2001 From: Hong0329 Date: Wed, 14 Aug 2024 19:53:22 +0900 Subject: [PATCH 2/2] feat default profile image, noti image logic --- .../api/auth/service/Impl/AuthServiceImpl.java | 6 +++--- .../dto/request/ProfilePatchRequestDto.java | 3 ++- .../member/service/MemberCommandService.java | 17 +++++++++-------- .../service/NotificationQueryService.java | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/WableServer/src/main/java/com/wable/www/WableServer/api/auth/service/Impl/AuthServiceImpl.java b/WableServer/src/main/java/com/wable/www/WableServer/api/auth/service/Impl/AuthServiceImpl.java index 81918d5..3945123 100644 --- a/WableServer/src/main/java/com/wable/www/WableServer/api/auth/service/Impl/AuthServiceImpl.java +++ b/WableServer/src/main/java/com/wable/www/WableServer/api/auth/service/Impl/AuthServiceImpl.java @@ -30,8 +30,8 @@ @RequiredArgsConstructor public class AuthServiceImpl implements AuthService { - @Value("${aws-property.s3-default-image-url}") - private String GHOST_IMAGE_S3; +// @Value("${aws-property.s3-default-image-url}") +// private String GHOST_IMAGE_S3; private final static String DEFAULT_NICKNAME=""; private final JwtTokenProvider jwtTokenProvider; @@ -57,7 +57,7 @@ public AuthResponseDto socialLogin(String socialAccessToken, AuthRequestDto auth .nickname(DEFAULT_NICKNAME)//.nickname(socialData.getNickname()) .socialPlatform(socialPlatform) .socialId(socialData.getId()) - .profileUrl(GHOST_IMAGE_S3) + .profileUrl("") .memberEmail(socialData.getEmail()) .socialNickname(socialData.getNickname()) .build(); diff --git a/WableServer/src/main/java/com/wable/www/WableServer/api/member/dto/request/ProfilePatchRequestDto.java b/WableServer/src/main/java/com/wable/www/WableServer/api/member/dto/request/ProfilePatchRequestDto.java index b94649e..32369cb 100644 --- a/WableServer/src/main/java/com/wable/www/WableServer/api/member/dto/request/ProfilePatchRequestDto.java +++ b/WableServer/src/main/java/com/wable/www/WableServer/api/member/dto/request/ProfilePatchRequestDto.java @@ -9,6 +9,7 @@ public record ProfilePatchRequestDto ( Boolean isPushAlarmAllowed, String fcmToken, String memberFanTeam, - Integer memberLckYears + Integer memberLckYears, + String memberDefaultProfileImage ){ } diff --git a/WableServer/src/main/java/com/wable/www/WableServer/api/member/service/MemberCommandService.java b/WableServer/src/main/java/com/wable/www/WableServer/api/member/service/MemberCommandService.java index 8e87c9b..f21269e 100644 --- a/WableServer/src/main/java/com/wable/www/WableServer/api/member/service/MemberCommandService.java +++ b/WableServer/src/main/java/com/wable/www/WableServer/api/member/service/MemberCommandService.java @@ -40,10 +40,9 @@ public class MemberCommandService { private final CommentLikedRepository commentLikedRepository; private final ContentLikedRepository contentLikedRepository; private final S3Service s3Service; - private final static String GHOST_IMAGE = "https://github.com/TeamDon-tBe/SERVER/assets/97835512/fb3ea04c-661e-4221-a837-854d66cdb77e"; - @Value("${aws-property.s3-default-image-url}") - private String GHOST_IMAGE_S3; + @Value("${aws-property.s3-system-image-url}") + private String SYSTEM_IMAGE_S3; @Value("${aws-property.s3-domain}") private String S3_URL; @@ -53,7 +52,7 @@ public void withdrawalMember(Long memberId, MemberWithdrawalPatchRequestDto memb List ghosts = ghostRepository.findByGhostTargetMember(member); member.updateNickname("탈퇴한 회원"); - member.updateProfileUrl(GHOST_IMAGE_S3); + member.updateProfileUrl(SYSTEM_IMAGE_S3); member.updateDeletedReason(memberWithdrawalPatchRequestDto.deleted_reason()); // notificationRepository.deleteBynotificationTargetMember(member); @@ -163,10 +162,9 @@ public void updateMemberProfile2(Long memberId, MultipartFile multipartFile, Pro try { String s3ImageUrl = s3Service.uploadImage(memberId.toString(), multipartFile); - if(!existedImage.equals(GHOST_IMAGE)&&!existedImage.equals(GHOST_IMAGE_S3)) { - String existedKey = removeBaseUrl(existedImage, S3_URL); - s3Service.deleteImage(existedKey); - } + String existedKey = removeBaseUrl(existedImage, S3_URL); + + s3Service.deleteImage(existedKey); existingMember.updateProfileUrl(s3ImageUrl); } catch (IOException e) { @@ -188,6 +186,9 @@ public void updateMemberProfile2(Long memberId, MultipartFile multipartFile, Pro if (profilePatchRequestDto.memberLckYears() != null) { existingMember.updateMemberLckYears(profilePatchRequestDto.memberLckYears()); } + if (profilePatchRequestDto.memberDefaultProfileImage() != null) { + existingMember.updateProfileUrl(profilePatchRequestDto.memberDefaultProfileImage()); + } memberRepository.save(existingMember); } diff --git a/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java b/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java index 1dc7921..0f80c13 100644 --- a/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java +++ b/WableServer/src/main/java/com/wable/www/WableServer/api/notification/service/NotificationQueryService.java @@ -30,7 +30,7 @@ public class NotificationQueryService { @Value("${aws-property.s3-system-image-url}") private String SYSTEM_IMAGE_S3; - @Value("${s3-popular-image-url}") + @Value("${aws-property.s3-popular-image-url}") private String POPULAR_IMAGE_S3; private final int NOTIFICATION_DEFAULT_PAGE_SIZE = 15;