Merge pull request #24 from JunKyung-Jo/feat/user

FEAT : friend list response 구현
JunKyung-Jo · Dec 17, 2023 · 3a67f1a · 3a67f1a
2 parents aa636f5 + 47d840a
commit 3a67f1a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...in/java/com/investment/findfriend/domain/user/presentation/dto/response/UserResponse.java b/...in/java/com/investment/findfriend/domain/user/presentation/dto/response/UserResponse.java
@@ -1,11 +1,15 @@
 package com.investment.findfriend.domain.user.presentation.dto.response;
 
+import com.investment.findfriend.domain.friend.presentation.dto.response.FriendResponse;
 import lombok.Builder;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 @Builder
 public class UserResponse {
     private String name;
     private String statusMessage;
+    private List<FriendResponse> friends;
 }
diff --git a/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java b/src/main/java/com/investment/findfriend/domain/user/service/GetUserInfoService.java
@@ -1,11 +1,13 @@
 package com.investment.findfriend.domain.user.service;
 
 import com.investment.findfriend.domain.auth.exception.UserNotFoundException;
+import com.investment.findfriend.domain.friend.presentation.dto.response.FriendResponse;
 import com.investment.findfriend.domain.user.domain.User;
 import com.investment.findfriend.domain.user.presentation.dto.response.UserResponse;
 import com.investment.findfriend.domain.user.repository.UserRepository;
 import com.investment.findfriend.global.jwt.util.JwtUtil;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -17,13 +19,22 @@ public class GetUserInfoService {
     private final UserRepository userRepository;
     private final JwtUtil jwtUtil;
 
+    @Transactional
     public ResponseEntity<UserResponse> execute(HttpServletRequest httpServletRequest) {
         User user = userRepository.findByEmail(jwtUtil.extractEmail(httpServletRequest)).orElseThrow(
                 () -> UserNotFoundException.EXCEPTION
         );
         return ResponseEntity.ok(UserResponse.builder()
                 .name(user.getName())
                 .statusMessage(user.getStatusMessage())
+                .friends(user.getFriends().stream()
+                        .map(friend -> FriendResponse.builder()
+                                .id(friend.getId())
+                                .name(friend.getName())
+                                .statusMessage(friend.getStatusMessage())
+                                .authority(friend.getAuthority())
+                                .build())
+                        .toList())
                 .build());
     }
 }