팔로우 취소 시 알림 히스토리 삭제 (#286)

* fix: 팔로우 취소 시 알림 히스토리 삭제

* remove: .gitkeep 파일 삭제

* fix: notification 조회 시 NotificationType도 받도록 수정

src/main/java/com/depromeet/domain/follow/application/FollowService.java

@@ -11,7 +11,8 @@
 import com.depromeet.domain.mission.domain.Mission;
 import com.depromeet.domain.missionRecord.domain.ImageUploadStatus;
 import com.depromeet.domain.missionRecord.domain.MissionRecord;
-import com.depromeet.domain.notification.application.NotificationService;
+import com.depromeet.domain.notification.dao.NotificationRepository;
+import com.depromeet.domain.notification.domain.Notification;
 import com.depromeet.domain.notification.domain.NotificationType;
 import com.depromeet.global.config.fcm.FcmService;
 import com.depromeet.global.error.exception.CustomException;
@@ -27,7 +28,7 @@
 @RequiredArgsConstructor
 @Transactional
 public class FollowService {
-    private final NotificationService notificationService;
+    private final NotificationRepository notificationRepository;
     private final MemberUtil memberUtil;
     private final MemberRepository memberRepository;
     private final MemberRelationRepository memberRelationRepository;
@@ -54,9 +55,10 @@ public void createFollow(FollowCreateRequest request) {
                 targetMember.getFcmInfo().getFcmToken(),
                 PUSH_SERVICE_TITLE,
                 String.format(PUSH_SERVICE_CONTENT, currentMember.getProfile().getNickname()));
-        notificationService.createNotification(
-                NotificationType.FOLLOW, currentMember, targetMember);
-
+        Notification notification =
+                Notification.createNotification(
+                        NotificationType.FOLLOW, currentMember, targetMember);
+        notificationRepository.save(notification);
         memberRelationRepository.save(memberRelation);
     }
 
@@ -69,6 +71,13 @@ public void deleteFollow(FollowDeleteRequest request) {
                         .findBySourceIdAndTargetId(currentMember.getId(), targetMember.getId())
                         .orElseThrow(() -> new CustomException(ErrorCode.FOLLOW_NOT_EXIST));
 
+        Optional<Notification> optionalNotification =
+                notificationRepository.findBySourceMemberIdAndTargetMemberIdAndNotificationType(
+                        currentMember.getId(), targetMember.getId(), NotificationType.FOLLOW);
+        if (optionalNotification.isPresent()) {
+            Notification notification = optionalNotification.get();
+            notificationRepository.delete(notification);
+        }
         memberRelationRepository.delete(memberRelation);
     }
 

src/main/java/com/depromeet/domain/notification/dao/NotificationRepository.java

@@ -1,6 +1,11 @@
 package com.depromeet.domain.notification.dao;
 
 import com.depromeet.domain.notification.domain.Notification;
+import com.depromeet.domain.notification.domain.NotificationType;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface NotificationRepository extends JpaRepository<Notification, Long> {}
+public interface NotificationRepository extends JpaRepository<Notification, Long> {
+    Optional<Notification> findBySourceMemberIdAndTargetMemberIdAndNotificationType(
+            Long sourceId, Long targetId, NotificationType notificationType);
+}