Skip to content

Commit ef294a6

Browse files
committed
fix : 메시지 요청 시 userId null입력 에러 수정
1 parent 37dca66 commit ef294a6

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

api/src/main/java/com/mbtips/message/application/manager/MessageManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public String sendMessage(User user, CreateMessageRequestDto createMessageReques
5050
// .virtualFriend(conversation.getVirtualFriend())
5151
.messageContent(createMessageRequestDto.messageContent())
5252
.build();
53-
53+
log.debug("message : {}", requestMessage.toString());
5454
messageService.saveMessage(requestMessage);
5555

5656
List<GetMessageResponseDto> messages = messageService.getRecentMessagesOfConversationId(conversation.getConversationId());

core/src/main/java/com/mbtips/domain/message/Message.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
import com.mbtips.domain.virtualfriend.VirtualFriend;
66
import lombok.Builder;
77
import lombok.Getter;
8+
import lombok.ToString;
89

910
import java.time.LocalDateTime;
1011

1112
@Getter
1213
@Builder
14+
@ToString
1315
public class Message {
1416

1517
private Long messageId;

repository/src/main/java/com/mbtips/message/entity/MessageEntity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public class MessageEntity {
4242

4343
private Boolean isRead;
4444

45-
public MessageEntity(Message message) {
45+
public MessageEntity(Message message, UserEntity userEntity, VirtualFriendEntity virtualFriend) {
4646
this.messageId = message.getMessageId();
4747
this.conversationEntity = new ConversationEntity(message.getConversation());
48-
if(message.getUser() != null ) this.user = new UserEntity(message.getUser());
49-
if(message.getVirtualFriend() != null)this.virtualFriendEntity = new VirtualFriendEntity(message.getVirtualFriend());
48+
this.user = userEntity;
49+
this.virtualFriendEntity = virtualFriend;
5050
this.messageContent = message.getMessageContent();
5151
this.sentAt = LocalDateTime.now();
5252
}

repository/src/main/java/com/mbtips/message/repository/impl/MessageRepositoryImpl.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
import com.mbtips.message.entity.MessageEntity;
66
import com.mbtips.message.interfaces.MessageRepository;
77
import com.mbtips.message.repository.jpa.MessageJpaRepository;
8+
import com.mbtips.user.entity.UserEntity;
9+
import com.mbtips.user.interfaces.UserRepository;
10+
import com.mbtips.user.repository.jpa.UserJpaRepository;
11+
import com.mbtips.virtualfriend.entity.VirtualFriendEntity;
12+
import com.mbtips.virtualfriend.interfaces.VirtualFriendRepository;
13+
import com.mbtips.virtualfriend.repository.jpa.VirtualFriendJpaRepository;
814
import lombok.RequiredArgsConstructor;
915
import org.springframework.data.domain.PageRequest;
1016
import org.springframework.data.jpa.repository.Query;
@@ -21,6 +27,8 @@
2127
public class MessageRepositoryImpl implements MessageRepository {
2228

2329
private final MessageJpaRepository messageJpaRepository;
30+
private final UserJpaRepository userJpaRepository;
31+
private final VirtualFriendJpaRepository virtualFriendJpaRepository;
2432

2533
@Override
2634
public List<GetMessageResponseDto> findByConversationId(long conversationId) {
@@ -30,7 +38,11 @@ public List<GetMessageResponseDto> findByConversationId(long conversationId) {
3038
@Override
3139
@Transactional
3240
public void createMessage(Message message) {
33-
MessageEntity messageEntity = new MessageEntity(message);
41+
UserEntity userEntity = null;
42+
VirtualFriendEntity virtualFriend = null;
43+
if(message.getUser() != null) userEntity = userJpaRepository.findById(message.getUser().getUserId()).get();
44+
if(message.getVirtualFriend() != null) virtualFriend = virtualFriendJpaRepository.findById(message.getVirtualFriend().getVirtualFriendId()).get();
45+
MessageEntity messageEntity = new MessageEntity(message, userEntity, virtualFriend);
3446
messageJpaRepository.save(messageEntity);
3547
}
3648

0 commit comments

Comments
 (0)