Merge pull request #284 from team9502/dev

배포
team9502 · Jul 2, 2024 · fab8896 · fab8896
2 parents 3e0eb47 + 0943606
commit fab8896
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/team9502/sinchulgwinong/domain/chat/dto/response/ChatMessageResponseDTO.java b/src/main/java/team9502/sinchulgwinong/domain/chat/dto/response/ChatMessageResponseDTO.java
@@ -18,13 +18,16 @@ public class ChatMessageResponseDTO {
 
     private String content;
 
+    private String sendUserType;
+
     private LocalDateTime createAt;
 
     public ChatMessageResponseDTO(ChatMessage chatMessage) {
         this.chatMessageId = chatMessage.getChatMessageId();
         this.chatRoomId = chatMessage.getChatRoom().getChatRoomId();
         this.content = chatMessage.getContent();
         this.createAt = chatMessage.getCreatedAt();
+        this.sendUserType = chatMessage.getSendUserType();
 
         if (chatMessage.getCompanyUser() != null) {
             this.cpUserId = chatMessage.getCompanyUser().getCpUserId();

diff --git a/src/main/java/team9502/sinchulgwinong/domain/chat/entity/ChatMessage.java b/src/main/java/team9502/sinchulgwinong/domain/chat/entity/ChatMessage.java
@@ -33,4 +33,7 @@ public class ChatMessage extends BaseTimeEntity {
     @Setter
     @Column(nullable = false, length = 400)
     private String content;
+
+    @Setter
+    private String sendUserType;
 }
diff --git a/src/main/java/team9502/sinchulgwinong/domain/chat/service/ChatService.java b/src/main/java/team9502/sinchulgwinong/domain/chat/service/ChatService.java
@@ -134,6 +134,7 @@ public ChatMessage saveMessage(Long cpUserId, Long userId, Long chatRoomId, Stri
 
             chatMessage.setUser(user);
             chatMessage.setCompanyUser(null);
+            chatMessage.setSendUserType("USER");
 
             chatRoom.setCompanyUserRead(true); // 유저가 메시지를 보낸 경우 읽음으로 설정
             chatRoom.setUserRead(false); // 유저가 메시지를 보낸 경우 유저는 읽음으로 설정
@@ -144,6 +145,7 @@ public ChatMessage saveMessage(Long cpUserId, Long userId, Long chatRoomId, Stri
 
             chatMessage.setCompanyUser(companyUser);
             chatMessage.setUser(null);
+            chatMessage.setSendUserType("COMPANY");
 
             chatRoom.setUserRead(true); // 기업 유저가 메시지를 보낸 경우 읽음으로 설정
             chatRoom.setCompanyUserRead(false); // 기업 유저가 메시지를 보낸 경우 기업 유저는 읽음으로 설정