Merge pull request #56 from MoneyMakersClub/develop

[Merge] develop into deploy
MoneyMakersClub · Nov 7, 2024 · e9eabf6 · e9eabf6
2 parents c20504e + 2c49dc9
commit e9eabf6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/bookduck/src/main/java/com/mmc/bookduck/domain/friend/dto/common/FriendRequestUnitDto.java b/bookduck/src/main/java/com/mmc/bookduck/domain/friend/dto/common/FriendRequestUnitDto.java
@@ -1,18 +1,20 @@
 package com.mmc.bookduck.domain.friend.dto.common;
 
 import com.mmc.bookduck.domain.friend.entity.FriendRequest;
-import com.mmc.bookduck.domain.friend.entity.FriendRequestStatus;
+import com.mmc.bookduck.domain.item.dto.common.UserItemEquippedDto;
 
 public record FriendRequestUnitDto(
         Long requestId,
-        String receiverNickname,
-        FriendRequestStatus friendRequestStatus
+        Long userId,
+        String userNickname,
+        UserItemEquippedDto userItemEquipped
 ) {
-    public static FriendRequestUnitDto from(FriendRequest friendRequest) {
+    public static FriendRequestUnitDto from(FriendRequest friendRequest, Long userId, String userNickname, UserItemEquippedDto userItemEquipped) {
         return new FriendRequestUnitDto(
                 friendRequest.getRequestId(),
-                friendRequest.getReceiver().getNickname(),
-                friendRequest.getFriendRequestStatus()
+                userId,
+                userNickname,
+                userItemEquipped
         );
     }
 }
diff --git a/...duck/src/main/java/com/mmc/bookduck/domain/friend/dto/response/FriendListResponseDto.java b/...duck/src/main/java/com/mmc/bookduck/domain/friend/dto/response/FriendListResponseDto.java
@@ -5,10 +5,9 @@
 import java.util.List;
 
 public record FriendListResponseDto(
-        List<FriendUnitDto> friendList,
-        int friendCount
+        List<FriendUnitDto> friendList
 ) {
     public static FriendListResponseDto from(List<FriendUnitDto> friendList){
-      return new FriendListResponseDto(friendList, friendList.size());
+      return new FriendListResponseDto(friendList);
     }
 }
diff --git a/bookduck/src/main/java/com/mmc/bookduck/domain/friend/service/FriendRequestService.java b/bookduck/src/main/java/com/mmc/bookduck/domain/friend/service/FriendRequestService.java
@@ -7,6 +7,7 @@
 import com.mmc.bookduck.domain.friend.entity.FriendRequestStatus;
 import com.mmc.bookduck.domain.friend.repository.FriendRepository;
 import com.mmc.bookduck.domain.friend.repository.FriendRequestRepository;
+import com.mmc.bookduck.domain.item.service.UserItemService;
 import com.mmc.bookduck.domain.user.service.UserService;
 import com.mmc.bookduck.global.exception.CustomException;
 import com.mmc.bookduck.global.exception.ErrorCode;
@@ -25,6 +26,7 @@ public class FriendRequestService {
     private final FriendRequestRepository friendRequestRepository;
     private final FriendRepository friendRepository;
     private final UserService userService;
+    private final UserItemService userItemService;
 
     // 친구 요청 전송
     public void sendFriendRequest(FriendRequestDto requestDto) {
@@ -68,7 +70,12 @@ public FriendRequestListResponseDto getReceivedFriendRequests() {
         User currentUser = userService.getCurrentUser();
         List<FriendRequestUnitDto> receivedList = friendRequestRepository.findAllByReceiverUserIdAndFriendRequestStatus(currentUser.getUserId(), FriendRequestStatus.PENDING)
                 .stream()
-                .map(FriendRequestUnitDto::from)
+                .map(friendRequest -> FriendRequestUnitDto.from(
+                        friendRequest,
+                        friendRequest.getSender().getUserId(),
+                        friendRequest.getSender().getNickname(),
+                        userItemService.getEquippedItemOrDefault(friendRequest.getSender().getUserId())
+                ))
                 .collect(Collectors.toList());
         return FriendRequestListResponseDto.from(receivedList);
     }
@@ -79,7 +86,12 @@ public FriendRequestListResponseDto getSentFriendRequests() {
         User currentUser = userService.getCurrentUser();
         List<FriendRequestUnitDto> sentList = friendRequestRepository.findAllBySenderUserIdAndFriendRequestStatus(currentUser.getUserId(), FriendRequestStatus.PENDING)
                 .stream()
-                .map(FriendRequestUnitDto::from)
+                .map(friendRequest -> FriendRequestUnitDto.from(
+                        friendRequest,
+                        friendRequest.getReceiver().getUserId(),
+                        friendRequest.getReceiver().getNickname(),
+                        userItemService.getEquippedItemOrDefault(friendRequest.getReceiver().getUserId())
+                ))
                 .collect(Collectors.toList());
         return FriendRequestListResponseDto.from(sentList);
     }