Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class Paper extends BaseEntity {
@Column(name = "open_date", nullable = false)
private LocalDate openDate;

@Column(name = "invitation_code", nullable = false)
@Column(name = "invitation_code", unique = true, nullable = false)
private String invitationCode;

@Column(name = "participants_count")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ public class MessageRepositoryCustomImpl implements MessageRepositoryCustom {
public MessageResponse getMessage(Long messageId, Long userId) {
QMessage message = QMessage.message;
QUser fromUser = new QUser("fromUser");
QUser toUser = new QUser("toUser");

Message result = queryFactory
.selectFrom(message)
.join(message.from, fromUser)
.join(message.from, fromUser).fetchJoin()
.join(message.to, toUser).fetchJoin()
.where(
message.id.eq(messageId),
message.from.id.eq(userId),
Expand All @@ -38,7 +40,7 @@ public MessageResponse getMessage(Long messageId, Long userId) {

MessageType messageType = MessageType.SEND;

return MessageResponse.of(result, result.getName(), result.getTo().getName(), messageType);
return MessageResponse.of(result, result.getFrom().getName(), result.getTo().getName(), messageType);
}

@Override
Expand Down Expand Up @@ -117,6 +119,7 @@ public List<MessageResponse> getSentMessages(Long paperId, Long userId, CursorPa
List<Message> messages = queryFactory
.selectFrom(message)
.join(message.from).fetchJoin()
.join(message.to).fetchJoin()
.where(
message.paper.id.eq(paperId),
message.from.id.eq(userId),
Expand Down
Loading