[fix] tournament-info API 1등 상품 null일 때 예외 추가

SWEET-DEVELOPERS · Feb 29, 2024 · f5b7930 · f5b7930
1 parent 4730752
commit f5b7930
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java b/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java
@@ -202,19 +202,25 @@ private Gift updateScore(Long giftId, int score) {
     public TournamentInfoDto getTournamentInfo(Long memberId, Long roomId) {
         Room room = findRoomByIdOrThrow(roomId);
         RoomMember roomMember = roomMemberRepository.findByRoomIdAndMemberId(roomId, memberId);
-        Gift firstPlaceGift = giftRepository.findById(roomMember.getFirstplaceGiftId())
-                .orElseThrow(() -> new EntityNotFoundException(GIFT_NOT_FOUND));
 
         LocalDateTime tournamentStartDate = room.getTournamentStartDate();
         TournamentDuration tournamentDuration = room.getTournamentDuration();
 
         int totalParticipantsCount = room.getGifterNumber();
-
         int participatingMembersCount = roomMemberRepository.countByRoomIdAndTournamentParticipationIsTrue(roomId);
 
         LocalDateTime tournamentEndTime = getTournamentEndDate(tournamentStartDate, tournamentDuration);
         LocalDateTime remainingTime =getTournamentRemainingTime(tournamentEndTime);
 
+
+        if(roomMember.getFirstplaceGiftId() == null){
+            return new TournamentInfoDto(
+                    null, null, 0,
+                    remainingTime, totalParticipantsCount, participatingMembersCount);
+        }
+
+        Gift firstPlaceGift = giftRepository.findById(roomMember.getFirstplaceGiftId())
+                .orElseThrow(() -> new EntityNotFoundException(GIFT_NOT_FOUND));
         return new TournamentInfoDto(
                 firstPlaceGift.getName(), firstPlaceGift.getImageUrl(), firstPlaceGift.getCost(),
                 remainingTime, totalParticipantsCount, participatingMembersCount);