Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public List<ViewFriendResponse> getFriends(String userId) {
.map(friend -> {
Optional<User> 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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1119,6 +1119,7 @@ void deleteFriendSuccess() {
requesterFriend.setId("friend1Id");

Friend friendFriend = new Friend(requester.getId(), FriendRequestStatusEnum.ACCEPTED);

friendFriend.setId("friend2Id");

List<Friend> requesterFriendList = new ArrayList<>();
Expand Down
Loading