diff --git a/Microservices/user-service/src/main/java/app/sportahub/userservice/dto/response/user/friend/ViewFriendResponse.java b/Microservices/user-service/src/main/java/app/sportahub/userservice/dto/response/user/friend/ViewFriendResponse.java index 9d1b509e5..41a46d9ce 100644 --- a/Microservices/user-service/src/main/java/app/sportahub/userservice/dto/response/user/friend/ViewFriendResponse.java +++ b/Microservices/user-service/src/main/java/app/sportahub/userservice/dto/response/user/friend/ViewFriendResponse.java @@ -1,4 +1,6 @@ package app.sportahub.userservice.dto.response.user.friend; -public record ViewFriendResponse(String friendUsername, String friendUserId, String FriendId) { +import app.sportahub.userservice.dto.response.user.ProfileResponse; + +public record ViewFriendResponse(String friendUsername, String friendUserId, String FriendId, ProfileResponse friendProfile) { } diff --git a/Microservices/user-service/src/main/java/app/sportahub/userservice/service/user/UserServiceImpl.java b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/user/UserServiceImpl.java index 73cb457b6..81da7a5e0 100644 --- a/Microservices/user-service/src/main/java/app/sportahub/userservice/service/user/UserServiceImpl.java +++ b/Microservices/user-service/src/main/java/app/sportahub/userservice/service/user/UserServiceImpl.java @@ -434,7 +434,7 @@ public List getFriends(String userId) { .map(friend -> { Optional friendUser = userRepository.findUserById(friend.getUserId()); return friendUser.map(value -> new ViewFriendResponse(value.getUsername(), friend.getUserId(), - friend.getId())).orElse(null); + friend.getId(), profileMapper.profileToProfileResponse(friendUser.get().getProfile()))).orElse(null); }).filter(Objects::nonNull).toList(); } diff --git a/Microservices/user-service/src/test/java/app/sportahub/userservice/service/user/UserServiceTest.java b/Microservices/user-service/src/test/java/app/sportahub/userservice/service/user/UserServiceTest.java index fdd8168f4..77b87a6fe 100644 --- a/Microservices/user-service/src/test/java/app/sportahub/userservice/service/user/UserServiceTest.java +++ b/Microservices/user-service/src/test/java/app/sportahub/userservice/service/user/UserServiceTest.java @@ -1119,6 +1119,7 @@ void deleteFriendSuccess() { requesterFriend.setId("friend1Id"); Friend friendFriend = new Friend(requester.getId(), FriendRequestStatusEnum.ACCEPTED); + friendFriend.setId("friend2Id"); List requesterFriendList = new ArrayList<>();