Merge pull request #216 from capstone-maru/feat/#193-tokenImpl

feat #193 - pre-signed 중복 이슈 해결
capstone-maru · May 29, 2024 · 50ac562 · 50ac562
2 parents 4ac6625 + 5499460
commit 50ac562
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/org/capstone/maru/service/DormitoryRoomPostService.java b/src/main/java/org/capstone/maru/service/DormitoryRoomPostService.java
@@ -1,6 +1,7 @@
 package org.capstone.maru.service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -139,6 +140,18 @@ public DormitoryRoomPostDetailDto getDormitoryRoomPostDetail(String memberId, Lo
 
         Long viewCount = viewCountService.increaseValue(SharedViewCountCacheKey.from(postId));
 
+        String publisherId = resultEntity.getPublisherAccount().getMemberId();
+
+        resultEntity
+            .getPublisherAccount()
+            .getProfileImage()
+            .updateFileName(
+                s3FileService.getMemberPreSignedUrlForLoad(
+                    resultEntity.getPublisherGender(), resultEntity.getPublisherAccount()
+                                                                   .getProfileImage().getFileName()
+                )
+            );
+
         resultEntity
             .getPublisherAccount()
             .getProfileImage()
@@ -153,6 +166,7 @@ public DormitoryRoomPostDetailDto getDormitoryRoomPostDetail(String memberId, Lo
             .getSharedRoomPostRecruits()
             .stream()
             .map(Participation::getRecruitedMemberAccount)
+            .filter(memberAccount -> !Objects.equals(memberAccount.getMemberId(), publisherId))
             .map(MemberAccount::getProfileImage)
             .forEach(
                 profileImage -> profileImage.updateFileName(

diff --git a/src/main/java/org/capstone/maru/service/StudioRoomPostService.java b/src/main/java/org/capstone/maru/service/StudioRoomPostService.java
@@ -1,6 +1,7 @@
 package org.capstone.maru.service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -196,20 +197,23 @@ public StudioRoomPostDetailDto getStudioRoomPostDetail(String memberId, Long pos
 
         log.info(gender);
 
+        String publisherId = resultEntity.getPublisherAccount().getMemberId();
+
         resultEntity
             .getPublisherAccount()
             .getProfileImage()
             .updateFileName(
                 s3FileService.getMemberPreSignedUrlForLoad(
                     resultEntity.getPublisherGender(), resultEntity.getPublisherAccount()
-                        .getProfileImage().getFileName()
+                                                                   .getProfileImage().getFileName()
                 )
             );
 
         resultEntity
             .getSharedRoomPostRecruits()
             .stream()
             .map(Participation::getRecruitedMemberAccount)
+            .filter(memberAccount -> !Objects.equals(memberAccount.getMemberId(), publisherId))
             .map(MemberAccount::getProfileImage)
             .forEach(
                 profileImage ->