From ce1a44de0b464b791f8882201250193a7723584f Mon Sep 17 00:00:00 2001 From: Jin Hyuk Date: Mon, 20 Jan 2025 00:41:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=B1=84=ED=8C=85=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20otherPeople=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dangu/chatRoom/domain/ChatRoomRepository.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hyunsolution/dangu/chatRoom/domain/ChatRoomRepository.java b/src/main/java/com/hyunsolution/dangu/chatRoom/domain/ChatRoomRepository.java index 0dc8460..23fd472 100644 --- a/src/main/java/com/hyunsolution/dangu/chatRoom/domain/ChatRoomRepository.java +++ b/src/main/java/com/hyunsolution/dangu/chatRoom/domain/ChatRoomRepository.java @@ -1,12 +1,14 @@ package com.hyunsolution.dangu.chatRoom.domain; import java.util.List; +import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; public interface ChatRoomRepository extends JpaRepository { + @EntityGraph(attributePaths = {"participants.user"}) @Query( - "select c from ChatRoom c join fetch c.participants p join fetch p.user u where u.id = :userId") + "select c from ChatRoom c where exists (select 1 from Participant p where p.chatRoom = c and p.user.id = :userId)") List findByParticipantUserIdWithEntityGraph(Long userId); @Query( From af7ec59a2d456e70e16ab8aae719ca0d5d0fc0c5 Mon Sep 17 00:00:00 2001 From: Jin Hyuk Date: Mon, 20 Jan 2025 00:41:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hyunsolution/dangu/user/service/UserService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hyunsolution/dangu/user/service/UserService.java b/src/main/java/com/hyunsolution/dangu/user/service/UserService.java index 34f97b6..f36acf3 100644 --- a/src/main/java/com/hyunsolution/dangu/user/service/UserService.java +++ b/src/main/java/com/hyunsolution/dangu/user/service/UserService.java @@ -26,7 +26,7 @@ public LoginResponse login(String uid, String password) { return new LoginResponse(newUser.getId()); } // 비밀번호 일치 확인 - if (isMatchPassword(loginUser.get(), password)) { + if (isMatchPassword(password, loginUser.get())) { return new LoginResponse(loginUser.get().getId()); } else { throw UserWrongPasswordException.USER_WRONG_PASSWORD_EXCEPTION; @@ -38,7 +38,7 @@ public User registerUser(String uid, String password) { User.builder().uid(uid).password(passwordEncoder.encode(password)).build()); } - private boolean isMatchPassword(User loginUser, String encodedPassword) { - return passwordEncoder.matches(loginUser.getPassword(), encodedPassword); + private boolean isMatchPassword(String rawPwd, User loginUser) { + return passwordEncoder.matches(rawPwd, loginUser.getPassword()); } }