Merge pull request #70 from SWEET-DEVELOPERS/feature/#69-gift

[fix] 친구들이 등록한 선물 조회 API response 수정
SWEET-DEVELOPERS · Jan 15, 2024 · 0d1f888 · 0d1f888
2 parents 5f250d6 + ca4cb3f
commit 0d1f888
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/org/sopt/sweet/domain/gift/dto/response/FriendGiftDto.java b/src/main/java/org/sopt/sweet/domain/gift/dto/response/FriendGiftDto.java
@@ -12,18 +12,18 @@ public record FriendGiftDto(
         String name,
         int cost,
         String url,
-        LocalDateTime createDate
+        String giftOwner
 ) {
 
-    public static FriendGiftDto of(Gift gift) {
-        return new FriendGiftDto(
-                gift.getId(),
-                gift.getImageUrl(),
-                gift.getName(),
-                gift.getCost(),
-                gift.getUrl(),
-                gift.getCreateDate()
-        );
+    public static FriendGiftDto of(Gift gift, String giftOwner) {
+        return FriendGiftDto.builder()
+                .giftId(gift.getId())
+                .imageUrl(gift.getImageUrl())
+                .name(gift.getName())
+                .cost(gift.getCost())
+                .url(gift.getUrl())
+                .giftOwner(giftOwner)
+                .build();
     }
 
 }
diff --git a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java b/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java
@@ -27,6 +27,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static org.codehaus.groovy.runtime.DefaultGroovyMethods.collect;
 import static org.sopt.sweet.global.error.ErrorCode.*;
 
 @RequiredArgsConstructor
@@ -224,13 +225,15 @@ public List<FriendGiftDto> getFriendGift(Long memberId, Long roomId) {
         checkRoomMemberNotExists(room, member);
         List<Gift> gifts = giftRepository.findByRoomAndMemberNot(room, member);
         return mapGiftsToFriendGiftDtoList(gifts);
+
     }
 
 
     private List<FriendGiftDto> mapGiftsToFriendGiftDtoList(List<Gift> gifts) {
+
         return gifts.stream()
                 .sorted(Comparator.comparing(Gift::getCreateDate).reversed())
-                .map(gift -> FriendGiftDto.of(gift))
+                .map(gift -> FriendGiftDto.of(gift, gift.getMember().getNickName()))
                 .collect(Collectors.toList());
     }