Merge pull request #128 from Kusitms-28th-MeetUp-C/feature/127-chat

[fix]:Socket 채팅방 생성관련 오류 수정
Kusitms-28th-MeetUp-C · Nov 18, 2023 · 5a11d27 · 5a11d27
2 parents 9516ef5 + 81a0766
commit 5a11d27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/domain/ChatUser.java b/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/domain/ChatUser.java
@@ -12,7 +12,6 @@ public class ChatUser {
     private UserType type;
 
     public static ChatUser createChatUser(User user){
-        System.out.println(user.getUserType());
         return ChatUser.builder()
                 .sessionId(user.getId())
                 .name(user.getName())

diff --git a/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/service/ChatService.java b/SocketService/src/main/java/com/kusitms/socketservice/domain/chat/service/ChatService.java
@@ -117,13 +117,13 @@ private String getReceivedUserName(Chat chat, String user) {
 
     private Chat findFirstChatBySessions(Long firstSessionId, Long secondSessionId) {
         Query query = new Query();
-        query.addCriteria(Criteria.where("sessionList").all(firstSessionId, secondSessionId));
+        query.addCriteria(Criteria.where("chatUserList.sessionId").all(firstSessionId, secondSessionId));
         return mongoTemplate.findOne(query, Chat.class);
     }
 
     private List<Chat> findChatListBySession(Long sessionId) {
         Query query = new Query();
-        query.addCriteria(Criteria.where("sessionList").all(sessionId));
+        query.addCriteria(Criteria.where("chatUserList.sessionId").all(sessionId));
         return mongoTemplate.find(query, Chat.class);
     }