Skip to content

Commit e12f6f8

Browse files
committed
fix: SSE 수정
- 카프카 안거치고 바로 전송
1 parent 712a3a6 commit e12f6f8

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ public ResponseResult saveRequestToRedis(Long requestUserId, Long emotionRecordI
102102
User requestUser = userRepository.findByUserIdWithCache(requestUserId)
103103
.orElseThrow(UserNotFoundException::new);
104104
AlertChatRequest alertChatRequest = new AlertChatRequest(emotionRecordId, requestUser.getNickname());
105-
Alert alert = alertService.createAlert(responseUserId, "alarm", alertChatRequest);
106-
kafkaProducer.send(TOPIC, alert);
105+
// Alert alert = alertService.createAlert(responseUserId, "alarm", alertChatRequest);
106+
// kafkaProducer.send(TOPIC, alert);
107+
alertService.send(responseUserId, "alarm", alertChatRequest);
107108

108109
return new ResponseResult(ErrorCode.SUCCESS);
109110
} catch (EmotionRecordNotFoundException e) {
@@ -128,8 +129,9 @@ public ResponseResult deleteRequestFromRedis(Long userId, Long emotionRecordId)
128129
// Redis에 Key가 존재하는 경우 삭제 (KEY가 없는 경우 400)
129130
if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
130131
redisTemplate.delete(key);
131-
Alert alert = alertService.createAlert(recordIdInUserId, "cancel", "Chat request has been canceled.");
132-
kafkaProducer.send(TOPIC, alert);
132+
// Alert alert = alertService.createAlert(recordIdInUserId, "cancel", "Chat request has been canceled.");
133+
// kafkaProducer.send(TOPIC, alert);
134+
alertService.send(recordIdInUserId, "cancel", "Chat request has been canceled.");
133135
log.info("tset");
134136
return new ResponseResult(ErrorCode.SUCCESS);
135137
} else {
@@ -164,8 +166,9 @@ public ResponseResult requestRejected(Long responseUserId, ChatRejectDto chatRej
164166
// Redis에 Key가 존재하는 경우 삭제 (KEY가 없는 경우 400)
165167
if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
166168
redisTemplate.delete(key);
167-
Alert alert = alertService.createAlert(requestUserId, "fail", "채팅 요청을 거부했습니다");
168-
kafkaProducer.send(TOPIC, alert);
169+
// Alert alert = alertService.createAlert(requestUserId, "fail", "채팅 요청을 거부했습니다");
170+
// kafkaProducer.send(TOPIC, alert);
171+
alertService.send(requestUserId, "fail", "채팅 요청을 거부했습니다");
169172
return new ResponseResult(ErrorCode.SUCCESS);
170173
} else {
171174
return new ResponseResult(400, "ChatRequest not found or expired.");
@@ -214,8 +217,9 @@ public ResponseResult createChatRoom(Long userId, Long recordId, String requestN
214217
Map<String, Object> map = new HashMap<>();
215218
map.put("chatRoomId", chatRoomId.get());
216219

217-
Alert alert = alertService.createAlert(requestUserId, "accept", map);
218-
kafkaProducer.send(TOPIC, alert);
220+
// Alert alert = alertService.createAlert(requestUserId, "accept", map);
221+
// kafkaProducer.send(TOPIC, alert);
222+
alertService.send(requestUserId, "accept", map);
219223

220224
return new ResponseResult(map);
221225
}
@@ -243,8 +247,9 @@ public ResponseResult createChatRoom(Long userId, Long recordId, String requestN
243247
map.put("chatRoomId", chatRoom.getChatRoomId());
244248

245249
// 요청자에게 방번호를 보냄
246-
Alert alert = alertService.createAlert(requestUserId, "accept", map);
247-
kafkaProducer.send(TOPIC, alert);
250+
// Alert alert = alertService.createAlert(requestUserId, "accept", map);
251+
// kafkaProducer.send(TOPIC, alert);
252+
alertService.send(requestUserId, "accept", map);
248253

249254
userStatusService.setChatting(userId, true);
250255

0 commit comments

Comments
 (0)