Merge pull request #208 from Dugout-Developers/fix/#207

[FIX] 직관신청 수락 & 거절시 발생하는 오류 수정

Author: jjeongdong

src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java

@@ -198,7 +198,7 @@ public UpdateEnrollInfo acceptEnroll(Long enrollId, Long userId) throws IOExcept
         enroll.respondToEnroll(AcceptStatus.ACCEPTED);
         enterChatRoom(enrollApplicant, board);
 
-        Notification notification = notificationRepository.findByUserIdAndBoardIdAndAcceptStatusAndDeletedAtIsNull(enroll.getBoard().getUser().getId(), enroll.getBoard().getId(), AcceptStatus.PENDING)
+        Notification notification = notificationRepository.findByUserIdAndBoardIdAndSenderIdAndAcceptStatusAndDeletedAtIsNull(enroll.getBoard().getUser().getId(), enroll.getBoard().getId(), enrollApplicant.getId(), AcceptStatus.PENDING)
                 .orElseThrow(() -> new BaseException(ErrorCode.NOTIFICATION_NOT_FOUND));
         notification.updateAcceptStatus(AcceptStatus.ALREADY_ACCEPTED);
 
@@ -243,7 +243,7 @@ public UpdateEnrollInfo rejectEnroll(Long enrollId, Long userId) throws IOExcept
             throw new BaseException(ErrorCode.ENROLL_REJECT_INVALID);
         }
 
-        Notification notification = notificationRepository.findByUserIdAndBoardIdAndAcceptStatusAndDeletedAtIsNull(enroll.getBoard().getUser().getId(), enroll.getBoard().getId(), AcceptStatus.PENDING)
+        Notification notification = notificationRepository.findByUserIdAndBoardIdAndSenderIdAndAcceptStatusAndDeletedAtIsNull(enroll.getBoard().getUser().getId(), enroll.getBoard().getId(), enrollApplicant.getId(), AcceptStatus.PENDING)
                 .orElseThrow(() -> new BaseException(ErrorCode.NOTIFICATION_NOT_FOUND));
         notification.updateAcceptStatus(AcceptStatus.ALREADY_REJECTED);
 

src/main/java/com/back/catchmate/domain/notification/repository/NotificationRepository.java

@@ -15,7 +15,7 @@ public interface NotificationRepository extends JpaRepository<Notification, Long
 
     Optional<Notification> findByBoardIdAndUserIdAndSenderIdAndDeletedAtIsNull(Long boardId, Long userId, Long senderId);
 
-    Optional<Notification> findByUserIdAndBoardIdAndAcceptStatusAndDeletedAtIsNull(Long userId, Long boardId, AcceptStatus acceptStatus);
+    Optional<Notification> findByUserIdAndBoardIdAndSenderIdAndAcceptStatusAndDeletedAtIsNull(Long userId, Long boardId, Long senderId, AcceptStatus acceptStatus);
 
     Boolean existsByUserIdAndIsReadFalseAndDeletedAtIsNull(Long userId);
 }