Skip to content

Fix/#58/친구 이름 타입 추가 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jinsung0927 merged 1 commit into from
Dec 5, 2025
Merged

Fix/#58/친구 이름 타입 추가 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/java/plango/friend/application/dto/response/FriendListItemResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
public record FriendListItemResponse(
Long friendId,
Long memberId,
String name,
String nickname,
String profileImageUrl,
String loginType
Expand Down
39 changes: 26 additions & 13 deletions src/main/java/plango/friend/application/mapper/FriendMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,27 @@ public class FriendMapper {
public FriendResponse toFriendResponse(Friend friend) {
return new FriendResponse(
friend.getId(),
friend.getRequester().getId(),
friend.getReceiver().getId(),
friend.getReceiver().getNickname(),
friend.getStatus().name()
friend.getRequester()
.getId(),
friend.getReceiver()
.getId(),
friend.getReceiver()
.getNickname(),
friend.getStatus()
.name()
);
}

public FriendListItemResponse toFriendListItemResponse(Friend friend, Long currentMemberId) {
Member opponent = friend.getRequester()
.getId()
.equals(currentMemberId)
? friend.getReceiver()
: friend.getRequester();
Member targetMember = getTargetMember(friend, currentMemberId);

return new FriendListItemResponse(
friend.getId(),
opponent.getId(),
opponent.getNickname(),
opponent.getProfileImageUrl(),
opponent.getLoginType()
targetMember.getId(),
targetMember.getName(),
targetMember.getNickname(),
targetMember.getProfileImageUrl(),
targetMember.getLoginType()
.name()
);
}
Expand Down Expand Up @@ -60,4 +61,16 @@ public FriendRequestListItemResponse toSentFriendRequestListItemResponse(Friend
friend.getCreatedAt()
);
}

private Member getTargetMember(Friend friend, Long currentMemberId) {
Member requester = friend.getRequester();
Member receiver = friend.getReceiver();

if (requester.getId()
.equals(currentMemberId)) {
return receiver;
}

return requester;
}
}