Merge pull request #68 from Journey-Together/feat/#67

[Feat/#67] nickname 및 이미지 url 수정
Journey-Together · Jun 10, 2024 · bfb04bf · bfb04bf
2 parents bf2ea8c + fcfe425
commit bfb04bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/Journey/Together/domain/bookbark/entity/PlanBookmarkRes.java b/src/main/java/Journey/Together/domain/bookbark/entity/PlanBookmarkRes.java
@@ -2,6 +2,7 @@
 
 import Journey.Together.domain.bookbark.dto.PlaceBookmarkRes;
 import Journey.Together.domain.dairy.entity.Plan;
+import Journey.Together.global.util.S3Client;
 import jakarta.annotation.Nullable;
 
 public record PlanBookmarkRes(
@@ -12,7 +13,8 @@ public record PlanBookmarkRes(
         @Nullable
         String image
 ) {
-    public static PlanBookmarkRes of(Plan plan, String image){
-        return new PlanBookmarkRes(plan.getPlanId(), plan.getMember().getName(), plan.getMember().getProfileUuid(), plan.getTitle(), image);
+
+    public static PlanBookmarkRes of(Plan plan, String profileImg, String image){
+        return new PlanBookmarkRes(plan.getPlanId(), plan.getMember().getNickname(), profileImg, plan.getTitle(), image);
     }
 }
diff --git a/src/main/java/Journey/Together/domain/bookbark/service/BookmarkService.java b/src/main/java/Journey/Together/domain/bookbark/service/BookmarkService.java
@@ -20,6 +20,7 @@
 import Journey.Together.domain.place.repository.PlaceRepository;
 import Journey.Together.global.exception.ApplicationException;
 import Journey.Together.global.exception.ErrorCode;
+import Journey.Together.global.util.S3Client;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +41,9 @@ public class BookmarkService {
     private final PlanRepository planRepository;
 
 
+    private final S3Client s3Client;
+
+
     //북마크한 여행지 이름만 가져오기
     public List<PlaceBookmarkDto> getBookmarkPlaceNames(Member member){
         List<PlaceBookmark> placeBookmarkList = placeBookmarkRepository.findAllByMemberOrderByPlaceNameAsc(member);
@@ -111,7 +115,7 @@ public List<PlanBookmarkRes> getPlanBookmarks(Member member) {
 
         List<PlanBookmark> planBookmarkList = planBookmarkRepository.findAllByMemberOrderByCreatedAtDesc(member);
         planBookmarkList.forEach( planBookmark -> {
-            list.add(PlanBookmarkRes.of(planBookmark.getPlan(),getPlanImageUrl(member, planBookmark.getPlan())));
+            list.add(PlanBookmarkRes.of(planBookmark.getPlan(),s3Client.getUrl()+planBookmark.getMember().getProfileUuid()+"/profile",getPlanImageUrl(member, planBookmark.getPlan())));
         });
 
         return list;