Merge pull request #93 from SWEET-DEVELOPERS/feature/#92-member

[fix] 진행중인 선물방 조회 API response에 해당 멤버의 토너먼트 참여 여부 추가
SWEET-DEVELOPERS · Jan 18, 2024 · fd7b5b2 · fd7b5b2
2 parents 2b1386d + eef4af7
commit fd7b5b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/sopt/sweet/domain/member/dto/response/ActiveRoomResponseDto.java b/src/main/java/org/sopt/sweet/domain/member/dto/response/ActiveRoomResponseDto.java
@@ -8,7 +8,8 @@ public record ActiveRoomResponseDto(
         String gifteeName,
         int gifterNumber,
         LocalDateTime tournamentStartDate,
-        Boolean isOwner
+        Boolean isOwner,
+        boolean tournamentParticipation
 
 ) {
 }
diff --git a/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java b/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java
@@ -86,10 +86,17 @@ private ActiveRoomResponseDto mapToActiveRoomResponseDto(Room room, Long memberI
                 room.getGifteeName(),
                 room.getGifterNumber(),
                 room.getTournamentStartDate(),
-                isOwner(memberId, room.getId())
+                isOwner(memberId, room.getId()),
+                getRoomMemberParticipation(room, memberId)
+
         );
     }
 
+    private boolean getRoomMemberParticipation(Room room, Long memberId) {
+        Optional<RoomMember> roomMember = roomMemberRepository.findByMemberIdAndRoom(memberId, room);
+        return roomMember.map(RoomMember::isTournamentParticipation).orElse(false);
+    }
+
     private LocalDateTime getRoomMemberCreationTime(Room room, Long memberId) {
         Optional<RoomMember> roomMember = roomMemberRepository.findByMemberIdAndRoom(memberId, room);
         return roomMember.map(RoomMember::getCreateDate).orElse(LocalDateTime.MIN);