fix : isNego 추가

catchroom · Jan 27, 2024 · 70fb8f0 · 70fb8f0
1 parent 145b77f
commit 70fb8f0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/main/java/com/catchroom/chat/chatroom/dto/ChatRoomListGetResponse.java b/src/main/java/com/catchroom/chat/chatroom/dto/ChatRoomListGetResponse.java
@@ -43,6 +43,8 @@ public class ChatRoomListGetResponse implements Serializable {
 
     private ChatMessageDto lastChatmessageDto;
 
+    private Boolean isNego;
+
 
     public void updateChatMessageDto(ChatMessageDto chatMessageDto) {
         this.lastChatmessageDto = chatMessageDto;
@@ -53,10 +55,31 @@ public void changePartnerInfo() {
         this.myNickName = partnerNickName;
         this.partnerNickName = tmp;
 
-        if (loginUserIdentity.equals(UserIdentity.SELLER)) {
+        if (this.loginUserIdentity.equals(UserIdentity.SELLER)) {
             this.loginUserIdentity = UserIdentity.BUYER;
-        } else if (loginUserIdentity.equals(UserIdentity.BUYER)) {
+        } else if (this.loginUserIdentity.equals(UserIdentity.BUYER)) {
             this.loginUserIdentity = UserIdentity.SELLER;
         }
     }
+
+    @Override
+    public String toString() {
+        return "ChatRoomListGetResponse{" +
+                "chatRoomNumber='" + chatRoomNumber + '\'' +
+                ", buyerId=" + buyerId +
+                ", sellerId=" + sellerId +
+                ", productId=" + productId +
+                ", accommodationName='" + accommodationName + '\'' +
+                ", sellPrice=" + sellPrice +
+                ", loginUserIdentity=" + loginUserIdentity +
+                ", accommodationUrl='" + accommodationUrl + '\'' +
+                ", myNickName='" + myNickName + '\'' +
+                ", partnerNickName='" + partnerNickName + '\'' +
+                ", dealState=" + dealState +
+                ", buyerState=" + buyerState +
+                ", sellerState=" + sellerState +
+                ", lastChatmessageDto=" + lastChatmessageDto +
+                ", isNego=" + isNego +
+                '}';
+    }
 }
diff --git a/src/main/java/com/catchroom/chat/message/service/ChatService.java b/src/main/java/com/catchroom/chat/message/service/ChatService.java
@@ -124,11 +124,12 @@ private void setNewChatRoomInfo(ChatMessageDto chatMessage, ChatRoomListGetRespo
             newChatRoomListResponse.changePartnerInfo(); //닉네임 체인지
             chatRoomRedisRepository.setChatRoom(newChatRoomListResponse.getBuyerId(), chatMessage.getRoomId(), newChatRoomListResponse);
 
-        } else {
+        } else if (newChatRoomListResponse.getLoginUserIdentity().equals(UserIdentity.BUYER)){
             if (!chatMessage.getType().equals(MessageType.DELETE)) {
                 chatRoomRedisRepository.setChatRoom(newChatRoomListResponse.getBuyerId(),
                         chatMessage.getRoomId(), newChatRoomListResponse);
             }
+
             newChatRoomListResponse.changePartnerInfo(); //닉네임 체인지
             chatRoomRedisRepository.setChatRoom(newChatRoomListResponse.getSellerId(), chatMessage.getRoomId(), newChatRoomListResponse);
         }