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 @@ -22,12 +22,14 @@ public static ChatMessage toChatMessage(Workspace workspace, WorkspaceMember sen
}

public static ChatWebSocketResponseDto.ChatResponseDto toChatMessageResponse(ChatMessage chatMessage) {
WorkspaceMember sender = chatMessage.getSender();

return ChatWebSocketResponseDto.ChatResponseDto.builder()
.id(chatMessage.getId())
.workspaceId(chatMessage.getWorkspace().getId())
.senderId(chatMessage.getSender().getId())
.senderName(chatMessage.getSender().getName())
.senderProfileImage(chatMessage.getSender().getProfileImage())
.senderId(sender != null ? sender.getId() : null)
.senderName(sender != null ? sender.getName() : "ํƒˆํ‡ดํ•œ ์‚ฌ์šฉ์ž")
.senderProfileImage(sender != null ? sender.getProfileImage() : null)
.msgId(chatMessage.getMsgId())
.seq(chatMessage.getSeq())
.content(chatMessage.getContent())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ChatMessage extends BaseCreatedEntity {
private Workspace workspace;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "sender_id", nullable = false)
@JoinColumn(name = "sender_id", nullable = true)
private WorkspaceMember sender;

@Column(name = "msg_id", nullable = false, length = 36)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.project.syncly.domain.chat.entity.ChatMessage;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
Expand Down Expand Up @@ -45,14 +46,19 @@ public interface ChatMessageRepository extends JpaRepository<ChatMessage, Long>
Long findLatestSeq(@Param("ws") Long wsId);

@Query("""
SELECT cm
SELECT cm
FROM ChatMessage cm
JOIN FETCH cm.sender ws
JOIN FETCH ws.member m
WHERE cm.id = :id
""")
Optional<ChatMessage> findByIdWithSenderAndMember(@Param("id") Long id);

// WorkspaceMember ์‚ญ์ œ ์ „์— ํ•ด๋‹น ๋ฉค๋ฒ„๊ฐ€ ๋ณด๋‚ธ ๋ชจ๋“  ๋ฉ”์‹œ์ง€์˜ sender๋ฅผ null๋กœ ์„ค์ •
@Modifying
@Query("UPDATE ChatMessage cm SET cm.sender = null WHERE cm.sender.id = :workspaceMemberId")
void nullifySenderByWorkspaceMemberId(@Param("workspaceMemberId") Long workspaceMemberId);

}


Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.project.syncly.domain.workspace.service;

import com.project.syncly.domain.chat.repository.ChatMessageRepository;
import com.project.syncly.domain.folder.service.FolderCommandService;
import com.project.syncly.domain.member.entity.Member;
import com.project.syncly.domain.member.repository.MemberRepository;
Expand Down Expand Up @@ -40,6 +41,7 @@ public class WorkspaceServiceImpl implements WorkspaceService {
private final InvitationMailServiceImpl invitationMailService;
private final SseServiceImpl sseService;
private final FolderCommandService folderCommandService;
private final ChatMessageRepository chatMessageRepository;


@Value("${spring.mail.invitation.link}")
Expand Down Expand Up @@ -322,20 +324,23 @@ public WorkspaceResponseDto.LeaveWorkspaceResponseDto leaveWorkspace(Long worksp
nextManager.setRole(Role.MANAGER);
workspaceMemberRepository.save(nextManager);

// ๋ฉค๋ฒ„ ์‚ญ์ œ
// ์ฑ„ํŒ… ๋ฉ”์‹œ์ง€์˜ sender๋ฅผ null๋กœ ์„ค์ • ํ›„ ๋ฉค๋ฒ„ ์‚ญ์ œ
chatMessageRepository.nullifySenderByWorkspaceMemberId(member.getId());
workspaceMemberRepository.delete(member);
}

//๋‚˜๊ฐ€๊ณ ์ž ํ•˜๋Š” ์‚ฌ๋žŒ์ด ๋งค๋‹ˆ์ € ์ผ ๊ฒฝ์šฐ ( && ํŒ€์›์ด ๋งค๋‹ˆ์ € ํฌํ•จ 1๋ช…์ผ ๊ฒฝ์šฐ)
else if (member.getRole() == Role.MANAGER) {
//๋ฉค๋ฒ„ ์‚ญ์ œ ํ›„ ์›Œํฌ ์ŠคํŽ˜์ด์Šค ์‚ญ์ œ
// ์ฑ„ํŒ… ๋ฉ”์‹œ์ง€์˜ sender๋ฅผ null๋กœ ์„ค์ • ํ›„ ๋ฉค๋ฒ„ ์‚ญ์ œ ๋ฐ ์›Œํฌ ์ŠคํŽ˜์ด์Šค ์‚ญ์ œ
chatMessageRepository.nullifySenderByWorkspaceMemberId(member.getId());
workspaceMemberRepository.delete(member);
workspaceRepository.delete(workspace);
}

//CREW ์ผ ๊ฒฝ์šฐ
else {
// ๋ฉค๋ฒ„ ์‚ญ์ œ
// ์ฑ„ํŒ… ๋ฉ”์‹œ์ง€์˜ sender๋ฅผ null๋กœ ์„ค์ • ํ›„ ๋ฉค๋ฒ„ ์‚ญ์ œ
chatMessageRepository.nullifySenderByWorkspaceMemberId(member.getId());
workspaceMemberRepository.delete(member);
}

Expand Down Expand Up @@ -378,7 +383,8 @@ public WorkspaceResponseDto.KickMemberResponseDto kickMember(Long workspaceId, L
throw new CustomException(WorkspaceErrorCode.NOT_WORKSPACE_CREW);
}

// ๋ฉค๋ฒ„ ์‚ญ์ œ (์ถ”๋ฐฉ)
// ์ฑ„ํŒ… ๋ฉ”์‹œ์ง€์˜ sender๋ฅผ null๋กœ ์„ค์ • ํ›„ ๋ฉค๋ฒ„ ์‚ญ์ œ (์ถ”๋ฐฉ)
chatMessageRepository.nullifySenderByWorkspaceMemberId(targetMember.getId());
workspaceMemberRepository.delete(targetMember);

//๋ฐ˜ํ™˜
Expand Down