refactor: 코드 리뷰 반영

team-moabam · Nov 7, 2023 · 7e85842 · 7e85842
1 parent 5b1b6b1
commit 7e85842
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/main/java/com/moabam/api/application/NotificationService.java b/src/main/java/com/moabam/api/application/NotificationService.java
@@ -29,12 +29,15 @@
 @Transactional(readOnly = true)
 public class NotificationService {
 
+	private final RoomService roomService;
 	private final FirebaseMessaging firebaseMessaging;
 	private final NotificationRepository notificationRepository;
 	private final ParticipantSearchRepository participantSearchRepository;
 
 	@Transactional
 	public void sendKnockNotification(MemberTest member, Long targetId, Long roomId) {
+		roomService.validateRoomById(roomId);
+
 		String knockKey = generateKnockKey(member.memberId(), targetId, roomId);
 		validateConflictKnockNotification(knockKey);
 		validateFcmToken(targetId);

diff --git a/src/test/java/com/moabam/api/application/NotificationServiceTest.java b/src/test/java/com/moabam/api/application/NotificationServiceTest.java
@@ -37,13 +37,16 @@ class NotificationServiceTest {
 	private NotificationService notificationService;
 
 	@Mock
-	private NotificationRepository notificationRepository;
+	private RoomService roomService;
 
 	@Mock
-	private ParticipantSearchRepository participantSearchRepository;
+	private FirebaseMessaging firebaseMessaging;
 
 	@Mock
-	private FirebaseMessaging firebaseMessaging;
+	private NotificationRepository notificationRepository;
+
+	@Mock
+	private ParticipantSearchRepository participantSearchRepository;
 
 	private MemberTest memberTest;
 
@@ -56,6 +59,7 @@ void setUp() {
 	@Test
 	void notificationService_sendKnockNotification() {
 		// Given
+		willDoNothing().given(roomService).validateRoomById(any(Long.class));
 		given(notificationRepository.existsFcmTokenByMemberId(any(Long.class))).willReturn(true);
 		given(notificationRepository.existsByKey(any(String.class))).willReturn(false);
 		given(notificationRepository.findFcmTokenByMemberId(any(Long.class))).willReturn("FCM-TOKEN");
@@ -68,10 +72,22 @@ void notificationService_sendKnockNotification() {
 		verify(notificationRepository).saveKnockNotification(any(String.class));
 	}
 
+	@DisplayName("콕 찌를 상대의 방이 존재하지 않을 때, - NotFoundException")
+	@Test
+	void notificationService_sendKnockNotification_Room_NotFoundException() {
+		// Given
+		willThrow(NotFoundException.class).given(roomService).validateRoomById(any(Long.class));
+
+		// When & Then
+		assertThatThrownBy(() -> notificationService.sendKnockNotification(memberTest, 1L, 1L))
+			.isInstanceOf(NotFoundException.class);
+	}
+
 	@DisplayName("콕 찌를 상대의 FCM 토큰이 존재하지 않을 때, - NotFoundException")
 	@Test
-	void notificationService_sendKnockNotification_NotFoundException() {
+	void notificationService_sendKnockNotification_FcmToken_NotFoundException() {
 		// Given
+		willDoNothing().given(roomService).validateRoomById(any(Long.class));
 		given(notificationRepository.existsByKey(any(String.class))).willReturn(false);
 		given(notificationRepository.existsFcmTokenByMemberId(any(Long.class))).willReturn(false);
 
@@ -85,6 +101,7 @@ void notificationService_sendKnockNotification_NotFoundException() {
 	@Test
 	void notificationService_sendKnockNotification_ConflictException() {
 		// Given
+		willDoNothing().given(roomService).validateRoomById(any(Long.class));
 		given(notificationRepository.existsByKey(any(String.class))).willReturn(true);
 
 		// When & Then