fix: 팀 탈퇴한 회원에게 알림 안가게 수정

Modagbul · Dec 4, 2023 · 8dc654d · 8dc654d
1 parent 8999b9e
commit 8dc654d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/...ava/com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepository.java b/...ava/com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepository.java
@@ -10,7 +10,6 @@
 public interface TeamMemberCustomRepository {
     List<Long> findMemberIdsByTeamId(Long teamId);
     Optional<List<String>> findFcmTokensByTeamIdAndMemberId(Long teamId, Long memberId);
-    Optional<List<String>> findFcmTokensByTeamId(Long teamId);
     List<TeamMemberInfo> findTeamMemberInfoByTeamId(Long teamId);
     List<TeamMember> findTeamMemberByMemberId(Long memberId);
 }
diff --git a/...com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepositoryImpl.java b/...com/moing/backend/domain/teamMember/domain/repository/TeamMemberCustomRepositoryImpl.java
@@ -37,18 +37,8 @@ public Optional<List<String>> findFcmTokensByTeamIdAndMemberId(Long teamId, Long
                 .from(teamMember)
                 .where(teamMember.team.teamId.eq(teamId)
                         .and(teamMember.member.isNewUploadPush.eq(true))
-                        .and(teamMember.member.memberId.ne(memberId)))
-                .fetch();
-
-        return result.isEmpty() ? Optional.empty() : Optional.of(result);
-    }
-
-    @Override
-    public Optional<List<String>> findFcmTokensByTeamId(Long teamId) {
-        List<String> result = queryFactory.select(teamMember.member.fcmToken)
-                .from(teamMember)
-                .where(teamMember.team.teamId.eq(teamId)
-                        .and(teamMember.member.isNewUploadPush.eq(true)))
+                        .and(teamMember.member.memberId.ne(memberId))
+                        .and(teamMember.isDeleted.eq(false)))
                 .fetch();
 
         return result.isEmpty() ? Optional.empty() : Optional.of(result);

diff --git a/src/main/java/com/moing/backend/domain/teamMember/domain/service/TeamMemberGetService.java b/src/main/java/com/moing/backend/domain/teamMember/domain/service/TeamMemberGetService.java
@@ -29,10 +29,6 @@ public Optional<List<String>> getFcmTokensExceptMe(Long teamId, Long memberId) {
         return teamMemberRepository.findFcmTokensByTeamIdAndMemberId(teamId, memberId);
     }
 
-    public Optional<List<String>> getFcmTokens(Long teamId) {
-        return teamMemberRepository.findFcmTokensByTeamId(teamId);
-    }
-
     public List<TeamMemberInfo> getTeamMemberInfo(Long teamId){
         return teamMemberRepository.findTeamMemberInfoByTeamId(teamId);
     }