[COZY-424] fix: findByRoomIdAndMateId 에러 해결

eple0329 · web-flow · commit 6d0ef73bbdd6 · 2024-12-02T15:52:04.000+09:00
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/mate/repository/MateRepository.java b/src/main/java/com/cozymate/cozymate_server/domain/mate/repository/MateRepository.java
@@ -37,8 +37,6 @@ Optional<Mate> findByRoomIdAndMemberIdAndNotEntryStatus(@Param("roomId") Long ro
     boolean existsByMemberIdAndRoomStatuses(@Param("memberId") Long memberId,
         @Param("status1") RoomStatus status1, @Param("status2") RoomStatus status2);
 
-    Optional<Mate> findByMemberIdAndRoomId(Long MemberId, Long RoomId);
-
     Optional<Mate> findByRoomIdAndMemberIdAndEntryStatus(Long roomId, Long memberId,
         EntryStatus status);
 
@@ -74,7 +72,7 @@ List<Mate> findAllByMemberBirthDayMonthAndDayAndEntryStatus(@Param("month") int
     List<Mate> findFetchMemberByRoom(@Param("room") Room room,
         @Param("entryStatus") EntryStatus entryStatus);
 
-    Optional<Mate> findByMemberAndEntryStatus(Member member,EntryStatus entryStatus);
+    Optional<Mate> findByMemberAndEntryStatus(Member member, EntryStatus entryStatus);
 
     @Query("select m from Mate m join fetch m.member")
     List<Mate> findFetchAll();
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/post/service/PostCommandService.java b/src/main/java/com/cozymate/cozymate_server/domain/post/service/PostCommandService.java
@@ -4,6 +4,7 @@
 import com.cozymate.cozymate_server.domain.feed.Feed;
 import com.cozymate.cozymate_server.domain.feed.repository.FeedRepository;
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.post.Post;
@@ -37,8 +38,8 @@ public class PostCommandService {
 
     public Long createPost(Member member, PostCreateDTO postCreateDTO) {
 
-        Mate mate = mateRepository.findByMemberIdAndRoomId(member.getId(),
-            postCreateDTO.getRoomId()).orElseThrow(
+        Mate mate = mateRepository.findByRoomIdAndMemberIdAndEntryStatus(postCreateDTO.getRoomId(),
+            member.getId(), EntryStatus.JOINED).orElseThrow(
             () -> new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND)
         );
 
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/postcomment/service/PostCommentCommandService.java b/src/main/java/com/cozymate/cozymate_server/domain/postcomment/service/PostCommentCommandService.java
@@ -1,6 +1,7 @@
 package com.cozymate.cozymate_server.domain.postcomment.service;
 
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.post.Post;
@@ -30,7 +31,8 @@ public class PostCommentCommandService {
     public Long createPostComment(Member member,
         PostCommentCreateDTO postCommentCreateDTO) {
 
-        Mate commenter = mateRepository.findByMemberIdAndRoomId(member.getId(), postCommentCreateDTO.getRoomId()).orElseThrow(
+        Mate commenter = mateRepository.findByRoomIdAndMemberIdAndEntryStatus(
+            postCommentCreateDTO.getRoomId(), member.getId(), EntryStatus.JOINED).orElseThrow(
             () -> new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND)
         );
 
@@ -47,15 +49,17 @@ public Long createPostComment(Member member,
     public Long updatePostComment(Member member,
         PostCommentUpdateDTO postCommentUpdateDTO) {
 
-        if (!mateRepository.existsByMemberIdAndRoomId(member.getId(), postCommentUpdateDTO.getRoomId())) {
+        if (!mateRepository.existsByMemberIdAndRoomId(member.getId(),
+            postCommentUpdateDTO.getRoomId())) {
             throw new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND);
         }
 
-        if(!postRepository.existsById(postCommentUpdateDTO.getPostId())){
+        if (!postRepository.existsById(postCommentUpdateDTO.getPostId())) {
             throw new GeneralException(ErrorStatus._POST_NOT_FOUND);
         }
 
-        PostComment postComment = postCommentRepository.findById(postCommentUpdateDTO.getCommentId()).orElseThrow(
+        PostComment postComment = postCommentRepository.findById(
+            postCommentUpdateDTO.getCommentId()).orElseThrow(
             () -> new GeneralException(ErrorStatus._POST_COMMENT_NOT_FOUND)
         );
 
@@ -70,7 +74,7 @@ public void deletePostComment(Member member, Long roomId, Long postId, Long comm
             throw new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND);
         }
 
-        if(!postRepository.existsById(postId)){
+        if (!postRepository.existsById(postId)) {
             throw new GeneralException(ErrorStatus._POST_NOT_FOUND);
         }
 
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/role/service/RoleCommandService.java b/src/main/java/com/cozymate/cozymate_server/domain/role/service/RoleCommandService.java
@@ -1,6 +1,7 @@
 package com.cozymate.cozymate_server.domain.role.service;
 
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.role.Role;
@@ -132,7 +133,7 @@ private int getDayBitmask(List<String> repeatDayStringList) {
      * @return Mate
      */
     private Mate getMate(Long memberId, Long roomId) {
-        return mateRepository.findByMemberIdAndRoomId(memberId, roomId)
+        return mateRepository.findByRoomIdAndMemberIdAndEntryStatus(roomId, memberId, EntryStatus.JOINED)
             .orElseThrow(() -> new GeneralException(ErrorStatus._MATE_NOT_FOUND));
     }
 
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/roomlog/service/RoomLogQueryService.java b/src/main/java/com/cozymate/cozymate_server/domain/roomlog/service/RoomLogQueryService.java
@@ -1,6 +1,7 @@
 package com.cozymate.cozymate_server.domain.roomlog.service;
 
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.roomlog.RoomLog;
@@ -34,7 +35,8 @@ public PageResponseDto<List<RoomLogDetailResponseDto>> getRoomLogList(
         int size) {
 
         // 본인 방에 속한건지 확인
-        Mate mate = mateRepository.findByMemberIdAndRoomId(member.getId(), roomId)
+        Mate mate = mateRepository.findByRoomIdAndMemberIdAndEntryStatus(roomId, member.getId(),
+                EntryStatus.JOINED)
             .orElseThrow(() -> new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND));
 
         Pageable pageable = PageRequest.of(page, size);
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/rule/service/RuleCommandService.java b/src/main/java/com/cozymate/cozymate_server/domain/rule/service/RuleCommandService.java
@@ -1,6 +1,7 @@
 package com.cozymate.cozymate_server.domain.rule.service;
 
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.rule.Rule;
@@ -106,7 +107,8 @@ private void checkMaxRuleCount(Long roomId) {
      * @return Mate
      */
     private Mate findMateByMemberIdAndRoomId(Member member, Long roomId) {
-        return mateRepository.findByMemberIdAndRoomId(member.getId(), roomId)
+        return mateRepository.findByRoomIdAndMemberIdAndEntryStatus(roomId, member.getId(),
+                EntryStatus.JOINED)
             .orElseThrow(() -> new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND));
     }
 
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/rule/service/RuleQueryService.java b/src/main/java/com/cozymate/cozymate_server/domain/rule/service/RuleQueryService.java
@@ -1,6 +1,7 @@
 package com.cozymate.cozymate_server.domain.rule.service;
 
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.rule.Rule;
@@ -48,7 +49,8 @@ public List<RuleDetailResponseDTO> getRule(Member member, Long roomId) {
      * @return Mate
      */
     private Mate findMateByMemberIdAndRoomId(Member member, Long roomId) {
-        return mateRepository.findByMemberIdAndRoomId(member.getId(), roomId)
+        return mateRepository.findByRoomIdAndMemberIdAndEntryStatus(roomId, member.getId(),
+                EntryStatus.JOINED)
             .orElseThrow(() -> new GeneralException(ErrorStatus._MATE_OR_ROOM_NOT_FOUND));
     }
 
diff --git a/src/main/java/com/cozymate/cozymate_server/domain/todo/service/TodoCommandService.java b/src/main/java/com/cozymate/cozymate_server/domain/todo/service/TodoCommandService.java
@@ -3,6 +3,7 @@
 import com.cozymate.cozymate_server.domain.fcm.dto.FcmPushTargetDto.GroupWithOutMeTargetDto;
 import com.cozymate.cozymate_server.domain.fcm.service.FcmPushService;
 import com.cozymate.cozymate_server.domain.mate.Mate;
+import com.cozymate.cozymate_server.domain.mate.enums.EntryStatus;
 import com.cozymate.cozymate_server.domain.mate.repository.MateRepository;
 import com.cozymate.cozymate_server.domain.member.Member;
 import com.cozymate.cozymate_server.domain.notificationlog.enums.NotificationType;
@@ -181,7 +182,8 @@ public void updateTodoContent(Member member, Long roomId, Long todoId,
     }
 
     private Mate getMate(Long memberId, Long roomId) {
-        return mateRepository.findByMemberIdAndRoomId(memberId, roomId)
+        return mateRepository.findByRoomIdAndMemberIdAndEntryStatus(roomId, memberId,
+                EntryStatus.JOINED)
             .orElseThrow(() -> new GeneralException(ErrorStatus._MATE_NOT_FOUND));
     }
 
@@ -238,6 +240,7 @@ private void allTodoCompleteNotification(Mate mate) {
 
     /**
      * 투두 타입 분류, GROUP, SINGLE을 분류함
+     *
      * @param todoIdList 투두 ID 리스트
      * @return TodoType
      */
@@ -252,7 +255,8 @@ private TodoType classifyTodoType(List<Long> todoIdList) {
 
     /**
      * 할당자 리스트가 모두 호출한 사람과 같은 방에 있는지 확인
-     * @param mate 호출한 사람
+     *
+     * @param mate       호출한 사람
      * @param mateIdList 할당자 리스트
      */
     private void checkMateIdListIsSameRoomWithMate(Mate mate, List<Long> mateIdList) {
@@ -265,6 +269,7 @@ private void checkMateIdListIsSameRoomWithMate(Mate mate, List<Long> mateIdList)
 
     /**
      * 최대 할당자 수 체크
+     *
      * @param mateIdList 할당자 리스트
      */
     private void checkMaxAssignee(List<Long> mateIdList) {
