Skip to content

[BE] 검색 서버 메인으로 병합 #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dh1010a merged 6 commits into from
Feb 22, 2025
Merged

[BE] 검색 서버 메인으로 병합 #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
827cbd9
fix: 채널 메시지 캐싱시 null이 들어가지 않도록 수정
dh1010a Feb 22, 2025
ec6af56
fix: 채널 메시지 캐싱시 null이면 캐시하지 않도록 수정
dh1010a Feb 22, 2025
47ba2d7
fix: isDeleted 필드 수정
dh1010a Feb 22, 2025
0af4434
fix: isDeleted 필드 이름을 deleted로 변경
dh1010a Feb 22, 2025
64f5fb5
fix: 기본 생성자 설정 추가
dh1010a Feb 22, 2025
2debcad
fix: 기존에 메시지 없으면 다시 캐싱하도록 로직 수정
dh1010a Feb 22, 2025
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
11 changes: 8 additions & 3 deletions ...erver/src/main/java/com/bbebig/searchserver/domain/history/domain/ChannelChatMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import com.bbebig.commonmodule.kafka.dto.*;
import jakarta.persistence.Id;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.mongodb.core.mapping.Document;

import java.time.LocalDateTime;
Expand All @@ -14,6 +16,8 @@
@Data
@Document(collection = "channel_chat_messages")
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ChannelChatMessage {

@Id
Expand All @@ -37,20 +41,21 @@ public class ChannelChatMessage {

private MessageType messageType;

private Boolean isDeleted;
@Builder.Default
private Boolean deleted = false;

public void updateContent(String content) {
this.content = content;
this.updatedAt = LocalDateTime.now();
}

public void delete() {
this.isDeleted = true;
this.deleted = true;
this.updatedAt = LocalDateTime.now();
}

public boolean isDeleted() {
return this.isDeleted;
return deleted != null ? deleted : false; // null이면 기본값 false 반환
}
}

Expand Down
11 changes: 8 additions & 3 deletions ...rch-server/src/main/java/com/bbebig/searchserver/domain/history/domain/DmChatMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import com.bbebig.commonmodule.kafka.dto.ChatFileDto;
import jakarta.persistence.Id;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.mongodb.core.mapping.Document;

import java.time.LocalDateTime;
Expand All @@ -14,6 +16,8 @@
@Data
@Document(collection = "dm_chat_messages")
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class DmChatMessage {

@Id
Expand All @@ -37,19 +41,20 @@ public class DmChatMessage {

private MessageType messageType;

private Boolean isDeleted;
@Builder.Default
private Boolean deleted = false;

public void updateContent(String content) {
this.content = content;
this.updatedAt = LocalDateTime.now();
}

public void delete() {
this.isDeleted = true;
this.deleted = true;
this.updatedAt = LocalDateTime.now();
}

public boolean isDeleted() {
return this.isDeleted;
return this.deleted;
}
}
2 changes: 2 additions & 0 deletions ...-server/src/main/java/com/bbebig/searchserver/domain/history/dto/HistoryDtoConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public static ChannelChatMessage convertDtoToChannelChatMessage(ChatMessageDto m
.createdAt(messageDto.getCreatedAt() != null ? messageDto.getCreatedAt() : null)
.updatedAt(messageDto.getType() == MessageEventType.MESSAGE_UPDATE ? messageDto.getUpdatedAt() : null)
.messageType(messageDto.getMessageType())
.deleted(messageDto.getType() == MessageEventType.MESSAGE_DELETE)
.build();
}

Expand All @@ -38,6 +39,7 @@ public static DmChatMessage convertDtoToDmChatMessage(ChatMessageDto messageDto)
.createdAt(messageDto.getCreatedAt() != null ? messageDto.getCreatedAt() : null)
.updatedAt(messageDto.getType() == MessageEventType.MESSAGE_UPDATE ? messageDto.getUpdatedAt() : null)
.messageType(messageDto.getMessageType())
.deleted(messageDto.getType() == MessageEventType.MESSAGE_DELETE)
.build();
}

Expand Down
10 changes: 7 additions & 3 deletions ...h-server/src/main/java/com/bbebig/searchserver/domain/history/service/HistoryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ public void saveChannelMessage(ChatMessageDto messageDto) {

if (ChatType.CHANNEL.equals(messageDto.getChatType())) {
Long channelId = messageDto.getChannelId();
if (serverRedisRepository.existsChannelMessageList(channelId)) {
if (!serverRedisRepository.existsChannelMessageList(channelId) ||
serverRedisRepository.getChannelMessageList(channelId).isEmpty()) {
cacheChannelMessage(channelId);
} else {
serverRedisRepository.saveChannelMessage(channelId, message);
}
serverRedisRepository.saveChannelMessage(channelId, message);
}
}

Expand Down Expand Up @@ -278,7 +280,9 @@ public List<ChannelChatMessage> getCachedChannelMessages(Long channelId) {
private void cacheChannelMessage(Long channelId) {
List<ChannelChatMessage> messages = channelChatMessageRepository.findByChannelId(channelId,
PageRequest.of(0, 300, Sort.by(Sort.Order.desc("id"))));
serverRedisRepository.saveChannelMessages(channelId, messages);
if (messages != null && !messages.isEmpty()) {
serverRedisRepository.saveChannelMessages(channelId, messages);
}
}

private ServerLastInfoResponseDto getServerLastInfo(Long memberId, Long serverId) {
Expand Down