Skip to content

Commit 51b0357

Browse files
authored
Merge pull request #134 from Dugout-Developers/hotfix
[FIX] 사용자를 차단 해제했을 때, 게시글이 보이지않는 오류 수정
2 parents 95cef65 + 35f0eb5 commit 51b0357

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ public UpdateEnrollInfo acceptEnroll(Long enrollId, Long userId) throws IOExcept
188188
throw new BaseException(ErrorCode.ENROLL_ALREADY_ACCEPTED);
189189
}
190190

191+
enroll.respondToEnroll(AcceptStatus.ACCEPTED);
192+
191193
enterChatRoom(enrollApplicant, board);
192194

193195
String title = ENROLLMENT_ACCEPT_TITLE;

src/main/java/com/back/catchmate/domain/user/repository/BlockedUserRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public interface BlockedUserRepository extends JpaRepository<BlockedUser, Long>
1717

1818
Page<BlockedUser> findAllByBlockerIdAndDeletedAtIsNull(Long blockerId, Pageable pageable);
1919

20-
@Query("SELECT b.blocked.id FROM BlockedUser b WHERE b.blocker.id = :userId")
20+
@Query("SELECT b.blocked.id FROM BlockedUser b WHERE b.blocker.id = :userId AND b.deletedAt IS NULL")
2121
List<Long> findBlockedUserIdListByUserId(@Param("userId") Long userId);
2222
}

0 commit comments

Comments
 (0)