Skip to content

Commit

Permalink
Merge pull request #68 from kookmin-sw/refactor/chatsub
Browse files Browse the repository at this point in the history 
Refactor/chatsub
  • Loading branch information
@imjanghyeok
imjanghyeok authored May 12, 2024
2 parents 3c6a257 + 77d80de commit fdfcc29
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 137 deletions.
18 changes: 0 additions & 18 deletions src/main/java/capstone/facefriend/chat/controller/MessageController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,6 @@ public class MessageController {
private final MessageService messageService;
private final JwtProvider jwtProvider;

@MessageMapping("/stomp/connect")
public void enterApp(
StompHeaderAccessor headerAccessor
){
String authorizationHeader = headerAccessor.getFirstNativeHeader("Authorization");
String token = authorizationHeader.substring(BEARER_PREFIX.length());
Long memberId = jwtProvider.extractId(token);
messageService.enterApplication(memberId);
}

@PostMapping("/stomp/disconnect")
public String exitApp(
@AuthMember Long memberId
){
String msg = messageService.exitApplication(memberId);
return msg;
}

@GetMapping("/chat/{roomId}/messages")
public ResponseEntity<List<MessageListResponse>> getMessagesPage(
@PathVariable("roomId") Long roomId,
Expand Down
71 changes: 0 additions & 71 deletions src/main/java/capstone/facefriend/chat/service/MessageService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,32 +227,6 @@ public void heartReply(HeartReplyRequest heartReplyRequest, Long receiveId) {
simpMessagingTemplate.convertAndSend(destination, heartReplyResponse);
}


@Transactional
public void enterApplication(Long memberId) {
String exceptionDestination = "/sub/chat/" + memberId;
SocketInfo socketInfo = new SocketInfo();
socketInfo.setMemberId(memberId);
socketInfo.setConnectTime(LocalDateTime.now());
socketInfoRedisRepository.save(socketInfo);
if (isExistUnReadMessage(memberId)) {
sendSentMessage(memberId);
}

if(isExistUnSendHeart(memberId)) {
sendSentHeart(memberId);
}

simpMessagingTemplate.convertAndSend(exceptionDestination, "저장 성공");
}

@Transactional
public String exitApplication(Long memberId) {
SocketInfo socketInfo = findSocketInfo(memberId);
socketInfoRedisRepository.delete(socketInfo);
return "성공";
}

public List<MessageListResponse> getMessagePage(Long roomId, Long memberId, int pageNo) {
pageNo = pageNo - 1;
int pageSize = 40;
Expand All @@ -269,49 +243,4 @@ public List<MessageListResponse> getMessagePage(Long roomId, Long memberId, int
}
return messageListResponses;
}

private Boolean isExistUnReadMessage(Long memberId) {
Boolean isUnRead = redisTemplate.hasKey("/sub/chat/" + memberId + "message");
log.info(isUnRead.toString());
return !isUnRead;
}

private Boolean isExistUnSendHeart(Long memberId) {
Boolean isUnRead = redisTemplate.hasKey("/sub/chat/" + memberId + "SendHeart");
log.info(isUnRead.toString());
return !isUnRead;
}

private void sendSentMessage(Long receiveId) {
String topic = channelTopic.getTopic();
String destination = "/sub/chat" + receiveId + "message";
Long messagesListSize = redisTemplate.opsForList().size(destination);
log.info(messagesListSize.toString());
log.info("messageList: {}", redisTemplate.opsForList().range(destination, 0, -1));

if (messagesListSize > 0) {
for (Long i = messagesListSize; i > 0; i--) {
// 맵으로 받음
LinkedHashMap<String, Object> map = (LinkedHashMap<String, Object>) redisTemplate.opsForList().rightPop(destination);
MessageResponse messageResponse = (MessageResponse) map.get(destination);
log.info("messageResponse: {}", messageResponse.toString());
redisTemplate.convertAndSend(topic, messageResponse);
}
}
}

private void sendSentHeart(Long receiveId) {
String topic = channelTopic.getTopic();
String destination = "/sub/chat" + receiveId + "heart";
Long messagesListSize = redisTemplate.opsForList().size(destination);
log.info("SendHeartListSize: {}", messagesListSize.toString());
if (messagesListSize > 0) {
for (Long i = messagesListSize; i > 0; i--) {
LinkedHashMap<String, Object> map = (LinkedHashMap<String, Object>) redisTemplate.opsForList().rightPop(destination);
SendHeartResponse sendHeartResponse = (SendHeartResponse) map.get(destination);
log.info("messageResponse: {}", sendHeartResponse.toString());
redisTemplate.convertAndSend(topic, sendHeartResponse);
}
}
}
}
50 changes: 2 additions & 48 deletions src/main/java/capstone/facefriend/chat/service/RedisSubscriber.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,66 +31,20 @@ public class RedisSubscriber implements MessageListener {
@Override
public void onMessage(Message message, byte[] pattern) {
try {

// redis에서 발행된 데이터를 받아 역직렬화
String publishMessage = (String) redisTemplate.getStringSerializer().deserialize(message.getBody());

if (publishMessage.contains("message")) {
log.info(publishMessage);
MessageResponse messageResponse = objectMapper.readValue(publishMessage, MessageResponse.class);
log.info(messageResponse.toString());
GetMessageResponse chatMessageResponse = new GetMessageResponse(messageResponse);
log.info(chatMessageResponse.toString());
if (isExistSubscriber(messageResponse.getReceiveId())) {
messagingTemplate.convertAndSend("/sub/chat/" + messageResponse.getReceiveId(), chatMessageResponse);
} else {
saveUnReadMessage("/sub/chat" + messageResponse.getReceiveId() + "message", messageResponse);
}


messagingTemplate.convertAndSend("/sub/chat/" + messageResponse.getReceiveId(), chatMessageResponse);
} else if (publishMessage.contains("Heart")) {
SendHeartResponse sendHeartResponse = objectMapper.readValue(publishMessage, SendHeartResponse.class);

GetSendHeartResponse chatSendHeartResponse = new GetSendHeartResponse(sendHeartResponse);
if (isExistSubscriber(chatSendHeartResponse.getReceiveId())) {
messagingTemplate.convertAndSend("/sub/chat/" + sendHeartResponse.getReceiveId(), chatSendHeartResponse);
} else {
saveUnReadHeart("/sub/chat" + sendHeartResponse.getReceiveId() + "heart", sendHeartResponse);
}

messagingTemplate.convertAndSend("/sub/chat/" + sendHeartResponse.getReceiveId(), chatSendHeartResponse);
}
} catch (IOException e) {
throw new RuntimeException("Failed to process message", e);
}
}

private Boolean isExistSubscriber(Long memberId) {
log.info("isExistSubscriber 호출");
Boolean isMember = redisTemplate.opsForSet().isMember("SocketInfo", memberId);
log.info("Socket: " + memberId);
log.info("SocketInfo: " + isMember);

return isMember;
}



private void saveUnReadMessage(String destination, MessageResponse messageResponse) {
Boolean isUnRead = redisTemplate.hasKey(destination);
log.info(isUnRead.toString());
if (isUnRead) {
redisTemplate.opsForList().rightPush(destination, messageResponse);
} else {
redisTemplate.opsForList().rightPush(destination, messageResponse);
}
}

private void saveUnReadHeart(String destination, SendHeartResponse sendHeartResponse) {
Boolean isUnRead = redisTemplate.hasKey(destination);
if (isUnRead) {
redisTemplate.opsForList().rightPush(destination, sendHeartResponse);
} else {
redisTemplate.opsForList().rightPush(destination, sendHeartResponse);
}
}
}

0 comments on commit fdfcc29

Please sign in to comment.